Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7151-dms_refactor_methods

.eslintrc.yml

@@ -36,7 +36,3 @@ rules:
     jasmine/no-focused-tests: 0
     jasmine/prefer-toHaveBeenCalledWith: 0
     arrow-spacing: ["error", { "before": true, "after": true }]
-    no-restricted-syntax:
-    - "error"
-    - selector: "NewExpression[callee.name='Date']"
-      message: "Use Date.vnNew() instead of new Date()."

back/methods/collection/getSales.js

@@ -29,8 +29,10 @@ module.exports = Self => {
     });
 
     Self.getSales = async(ctx, collectionOrTicketFk, print, source, options) => {
+        const models = Self.app.models;
         const userId = ctx.req.accessToken.userId;
         const myOptions = {userId};
+        const $t = ctx.req.__;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -57,6 +59,22 @@ module.exports = Self => {
 
         if (print) await Self.rawSql('CALL vn.collection_printSticker(?,NULL)', [id], myOptions);
 
+        for (let ticket of tickets) {
+            if (ticket.observaciones) {
+                let observations = ticket.observaciones.split(' ');
+
+                for (let observation of observations) {
+                    const salesPerson = ticket.salesPersonFk;
+                    if (observation.startsWith('#') || observation.startsWith('@')) {
+                        await models.Chat.send(ctx,
+                            observation,
+                            $t('ticketCommercial', {ticket: ticket.ticketFk, salesPerson})
+                        );
+                    }
+                }
+            }
+        }
+
         return getCollection(id, tickets, sales, placements, myOptions);
     };
 

back/methods/collection/getTickets.js

@@ -57,10 +57,10 @@ module.exports = Self => {
                     ROW_NUMBER () OVER (PARTITION BY s.id ORDER BY pickingOrder) currentItemShelving,
                     COUNT(*) OVER (PARTITION BY s.id ORDER BY s.id) totalItemShelving,
                     sh.code,
-                    p2.code parkingCodePrevia,
+                    p2.code parkingCode,
-                    p2.pickingOrder pickingOrderPrevia,
+                    p2.pickingOrder pickingOrder,
-                    p.code parkingCode,
+                    p.code parkingCodePrevia,
-                    p.pickingOrder pickingOrder,
+                    p.pickingOrder pickingOrderPrevia,
                     iss.id itemShelvingSaleFk,
                     iss.isPicked,
                     iss.itemShelvingFk

back/methods/collection/spec/assign.spec.js

@@ -28,10 +28,9 @@ describe('ticket assign()', () => {
         await tx.rollback();
     });
 
-    it('should throw an error when there are no picking tickets', async() => {
+    it('should throw an error when  there is not picking tickets', async() => {
         try {
             await models.Collection.assign(ctx, options);
-            fail('Expected an error to be thrown, but none was thrown.');
         } catch (e) {
             expect(e.message).toEqual('There are not picking tickets');
         }

back/methods/workerActivity/add.js

@@ -31,7 +31,7 @@ module.exports = Self => {
         return await Self.rawSql(`
             INSERT INTO workerActivity (workerFk, workerActivityTypeFk, model)
                 SELECT ?, ?, ?
-                    FROM workerTimeControlConfig wtcc
+                    FROM workerTimeControlParams wtcp
                         LEFT JOIN (
                             SELECT wa.workerFk,
                                 wa.created,
@@ -44,7 +44,7 @@ module.exports = Self => {
                         ) sub ON TRUE
                     WHERE sub.workerFk IS NULL
                         OR sub.code <> ? 
-                        OR TIMESTAMPDIFF(SECOND, sub.created, util.VN_NOW()) > wtcc.dayBreak;`
+                        OR TIMESTAMPDIFF(SECOND, sub.created, util.VN_NOW()) > wtcp.dayBreak;`
         , [userId, code, model, userId, code], myOptions);
     };
 };

back/model-config.json

@@ -79,9 +79,6 @@
     "ImageCollectionSize": {
         "dataSource": "vn"
     },
-    "ImageConfig": {
-        "dataSource": "vn"
-    },
     "ImageContainer": {
         "dataSource": "imageStorage"
     },

back/models/dms.js

@@ -65,4 +65,89 @@ module.exports = Self => {
         await stream.pipe(writeStream);
         return dms;
     };
+
+    Self.uploadFileTemplate = async(ctx, id, model, foreignKey, options) => {
+        const {Dms, [model]: modelDms} = Self.app.models;
+        const myOptions = {};
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            const uploadedFiles = await Dms.uploadFile(ctx, myOptions);
+            const promises = uploadedFiles.map(dms =>
+                modelDms.create({
+                    [foreignKey]: id,
+                    dmsFk: dms.id
+                }, myOptions)
+
+            );
+            await Promise.all(promises);
+
+            if (tx) await tx.commit();
+
+            return uploadedFiles;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+
+    Self.removeFileTemplate = async(ctx, id, currentSelf, options) => {
+        const myOptions = {};
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await currentSelf.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            const targetModelDms = await currentSelf.findById(id, null, myOptions);
+            const targetDms = await Self.removeFile(ctx, targetModelDms.dmsFk, myOptions);
+
+            if (!targetDms || !targetModelDms)
+                throw new UserError('Try again');
+
+            const modelDmsDestroyed = await targetModelDms.destroy(myOptions);
+
+            if (tx) await tx.commit();
+
+            return modelDmsDestroyed;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+
+    Self.downloadFileTemplate = async(id, container) => {
+        const models = Self.app.models;
+        const Container = models[container];
+        const dms = await models.Dms.findById(id);
+        const pathHash = Container.getHash(dms.id);
+        try {
+            await Container.getFile(pathHash, dms.file);
+        } catch (e) {
+            if (e.code != 'ENOENT')
+                throw e;
+
+            const error = new UserError(`File doesn't exists`);
+            error.statusCode = 404;
+
+            throw error;
+        }
+
+        const stream = Container.downloadStream(pathHash, dms.file);
+
+        return [stream, dms.contentType, `filename="${dms.file}"`];
+    };
 };

back/models/expedition_PrintOut.json

@@ -14,6 +14,9 @@
         },
         "itemFk": {
             "type": "number"
+        },
+        "isChecked": {
+            "type": "boolean"
         }
     }
 }

back/models/image-config.json

@@ -1,22 +0,0 @@
-{
-    "name": "ImageConfig",
-    "base": "VnModel",
-    "options": {
-        "mysql": {
-            "table": "hedera.imageConfig"
-        }
-    },
-    "properties": {
-        "url": {
-            "type": "string"
-        }
-    },
-    "acls": [
-        {
-            "accessType": "READ",
-            "principalType": "ROLE",
-            "principalId": "$authenticated",
-            "permission": "ALLOW"
-        }
-    ]
-}

db/dump/fixtures.before.sql

@@ -1505,32 +1505,32 @@ INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk
         (9,     '99610289193', 302, 2972,   util.VN_CURDATE(),  3871, 442, 1),
         (10,    '07546500856', 185, 2364,   util.VN_CURDATE(),  5321, 442, 1);
 
-INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyModeFk`, `m3`, `kg`,`ref`, `totalEntries`, `cargoSupplierFk`, `awbFK`, `isRaid`, `daysInForward`)
+INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyModeFk`, `m3`, `kg`,`ref`, `totalEntries`, `cargoSupplierFk`, `awbFK`, `daysInForward`)
-    VALUES (1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000, 'first travel',   1, 1, 1, FALSE, NULL),
+    VALUES (1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000, 'first travel',   1, 1, 1, NULL),
-        (2,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 150.00, 2000, 'second travel',  2, 2, 2, FALSE, NULL),
+        (2,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 150.00, 2000, 'second travel',  2, 2, 2, NULL),
-        (3,  util.VN_CURDATE(),                              util.VN_CURDATE(),                              1, 2, 1, 0.00,   0.00, 'third travel',   1, 1, 3, FALSE, NULL),
+        (3,  util.VN_CURDATE(),                              util.VN_CURDATE(),                              1, 2, 1, 0.00,   0.00, 'third travel',   1, 1, 3, NULL),
-        (4,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 3, 1, 50.00,  500,  'fourth travel',  0, 2, 4, FALSE, NULL),
+        (4,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 3, 1, 50.00,  500,  'fourth travel',  0, 2, 4, NULL),
-        (5,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 3, 1, 50.00,  500,  'fifth travel',   1, 1, 5, FALSE, NULL),
+        (5,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 3, 1, 50.00,  500,  'fifth travel',   1, 1, 5, NULL),
-        (6,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00,  500,  'sixth travel',   1, 2, 6, FALSE,NULL),
+        (6,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00,  500,  'sixth travel',   1, 2, 6, NULL),
-        (7,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00,  500,  'seventh travel', 2, 1, 7, TRUE, 2),
+        (7,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00,  500,  'seventh travel', 2, 1, 7, 2),
-        (8,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,  'eight travel',   1, 2, 10, FALSE, NULL),
+        (8,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,  'eight travel',   1, 2, 10, NULL),
-        (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),
+        (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, 2),
-        (11, util.VN_CURDATE() - INTERVAL 1 DAY          ,                              util.VN_CURDATE(),   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL),
+        (11, util.VN_CURDATE() - INTERVAL 1 DAY          ,                              util.VN_CURDATE(),   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, NULL),
-        (12, util.VN_CURDATE()                           ,             util.VN_CURDATE() + INTERVAL 1 DAY,   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, NULL);
 
-INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `evaNotes`, `typeFk`)
+INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `evaNotes`)
-	VALUES
+    VALUES
-		(1,		1,	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 	1, 442, 'IN2001', 'Movement 1', 0, '', 'packaging'),
+        (1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1, 442, 'IN2001', 'Movement 1', 0, ''),
-		(2,		2,	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 	0, 442, 'IN2002', 'Movement 2', 0, 'observation two', 'product'),
+        (2, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 442, 'IN2002', 'Movement 2', 0, 'observation two'),
-		(3,		1, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 	0, 442, 'IN2003', 'Movement 3', 0, 'observation three', 'product'),
+        (3, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 0, 442, 'IN2003', 'Movement 3', 0, 'observation three'),
-		(4,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 	0, 69,	'IN2004', 'Movement 4', 0, 'observation four', 'product'),
+        (4, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 69,  'IN2004', 'Movement 4', 0, 'observation four'),
-		(5,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 	0, 442, 'IN2005', 'Movement 5', 0, 'observation five', 'product'),
+        (5, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 0, 442, 'IN2005', 'Movement 5', 0, 'observation five'),
-		(6,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 	0, 442, 'IN2006', 'Movement 6', 0, 'observation six', 'product'),
+        (6, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 0, 442, 'IN2006', 'Movement 6', 0, 'observation six'),
-		(7,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 	0, 442, 'IN2007', 'Movement 7', 0, 'observation seven', 'product'),
+        (7, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2007', 'Movement 7', 0, 'observation seven'),
-		(8,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 	0, 442, 'IN2008', 'Movement 8', 1, '', 'product'),
+        (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2008', 'Movement 8', 1,''),
-		(9,		2, 	DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 	10, 0, 442, 'IN2009', 'Movement 9', 1, '', 'product'),
+        (9, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 9', 1, ''),
-		(10,	2,	DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 	10, 0, 442, 'IN2009', 'Movement 10', 1, '', 'product'),
+        (10, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 10', 1, ''),
-		(99,	69, util.VN_CURDATE() - INTERVAL 1 MONTH, 			11, 0, 442, 'IN2009', 'Movement 99', 0, '', 'product');
+        (99, 69,                   '2000-12-01 00:00:00.000', 11, 0, 442, 'IN2009', 'Movement 99', 0, '');
 
 INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `defaultSupplierFk`)
 	VALUES (2, 4, 1);
@@ -2521,6 +2521,10 @@ INSERT INTO `vn`.`queuePriority`(`id`, `priority`, `code`)
         (2, 'Normal', 'normal'),
         (3, 'Baja', 'low');
 
+INSERT INTO `vn`.`workerTimeControlParams` (`id`, `dayBreak`, `weekBreak`, `weekScope`, `dayWorkMax`, `dayStayMax`, `weekMaxBreak`, `weekMaxScope`, `askInOut`)
+    VALUES
+        (1, 43200, 129600, 734400, 43200, 50400, 259200, 1296000, 36000);
+
 INSERT IGNORE INTO `vn`.`greugeConfig` (`id`, `freightPickUpPrice`) VALUES ('1', '11');
 
 INSERT INTO `vn`.`thermograph`(`id`, `model`)
@@ -4004,13 +4008,6 @@ INSERT IGNORE INTO pbx.queueMember
 UPDATE vn.department SET pbxQueue = '1000' WHERE name = "CAMARA";
 UPDATE vn.department SET pbxQueue = '2000' WHERE name = "VENTAS";
 
-INSERT INTO vn.workerRelatives (workerFk, isDescendant, disabilityGradeFk, birthed, adoptionYear, isDependend, isJointCustody, updated)
-	VALUES
-		(1106, 1, NULL, 0, NULL, 0, 0, '2024-10-29 08:42:44.000');
-INSERT INTO vn.routeAction (id, name, price, isMainlineDelivered) VALUES(1, 'Pintar traje', 50.00, 0);
-INSERT INTO vn.routeComplement (id, dated, workerFk, price, routeActionFk) VALUES(1, util.VN_CURDATE(), 9, 50.00, 1);
-
-
 INSERT INTO srt.buffer (id, x, y, `size`, `length`, stateFk, typeFk, isActive, code, stratus, hasWorkerWaiting, reserve, routeFk, dayMinute, lastUnloaded, hasStrapper, typeDefaultFk, motors, editorFk) 
     VALUES  (0, 0, 0, 0, NULL, 3, 1, 0, 'ENT', 0, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
             (1, 0, 9900, 0, NULL, 1, 0, 0, 'NOK', 0, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
@@ -4024,12 +4021,10 @@ INSERT INTO srt.buffer (id, x, y, `size`, `length`, stateFk, typeFk, isActive, c
             (9, 1400, 1500, 500, 13000, 1, 1, 1, '04B', 4, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
             (10, 0, 2000, 500, 13000, 1, 1, 1, '05A', 5, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL);
 
+
 INSERT IGNORE INTO vn.saySimpleCountry (countryFk, channel) 
 	VALUES (19, '1169'),
 			(8, '1183');
 
 INSERT IGNORE INTO vn.saySimpleConfig (url, defaultChannel) 
 	VALUES ('saysimle-url-mock', 1320);
-
-INSERT INTO vn.workerIrpf (workerFk,spouseNif, geographicMobilityDate)
-	VALUES (1106,'26493101E','2019-09-20');

db/routines/cache/procedures/availableNoRaids_refresh.sql

@@ -53,7 +53,7 @@ proc: BEGIN
 					WHERE t.landed BETWEEN vInventoryDate AND vStartDate
 						AND t.warehouseInFk = vWarehouse
 						AND s.name != 'INVENTARIO'
-						AND NOT t.isRaid
+						AND NOT t.daysInForward
 					GROUP BY b.itemFk
 			) c
 				JOIN vn.item i ON i.id = c.itemFk

db/routines/edi/triggers/supplyResponse_afterUpdate.sql

@@ -14,7 +14,7 @@ BEGIN
 			b.stickers = NEW.NumberOfUnits
 		WHERE i.supplyResponseFk = NEW.ID
 			AND am.name = 'LOGIFLORA'
-			AND tr.isRaid
+			AND tr.daysInForward
 			AND tr.landed >= util.VN_CURDATE();
 
 END$$

db/routines/hedera/procedures/item_getVisible.sql

@@ -59,7 +59,7 @@ BEGIN
 						JOIN vn.travel t ON t.id = e.travelFk
 					WHERE t.landed BETWEEN vDateInv AND vDate
 						AND t.warehouseInFk = vWarehouse
-						AND NOT t.isRaid
+						AND NOT t.daysInForward
 				UNION ALL
 				SELECT b.itemFk, -b.quantity
 					FROM vn.buy b
@@ -67,7 +67,7 @@ BEGIN
 						JOIN vn.travel t ON t.id = e.travelFk
 					WHERE t.shipped BETWEEN vDateInv AND util.VN_CURDATE()
 						AND t.warehouseOutFk = vWarehouse
-						AND NOT t.isRaid
+						AND NOT t.daysInForward
 						AND t.isDelivered
 				UNION ALL
 				SELECT m.itemFk, -m.quantity

db/routines/sage/procedures/invoiceIn_add.sql

@@ -26,7 +26,7 @@ BEGIN
 
 	DECLARE vCursor CURSOR FOR
 		SELECT it.taxableBase,
-				CAST(SUM((( it.taxableBase / 100) * t.PorcentajeIva)) AS DECIMAL (10,2)),
+				CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)),
 				t.PorcentajeIva,
 				it.transactionTypeSageFk,
 				it.taxTypeSageFk,
@@ -39,8 +39,7 @@ BEGIN
 				JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
 				LEFT JOIN vn.dua d ON d.id = vInvoiceInFk
 			WHERE i.id = vInvoiceInFk
-				AND d.id IS NULL
+				AND d.id IS NULL;
-			GROUP BY it.taxTypeSageFk;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 

db/routines/stock/procedures/log_refreshBuy.sql

@@ -6,11 +6,12 @@ BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tValues;
 	CREATE TEMPORARY TABLE tValues
 		ENGINE = MEMORY
-		SELECT b.id buyFk,
+		SELECT
+				b.id buyFk,
 				e.id entryFk,
 				t.id travelFk,
 				b.itemFk,
-				t.isRaid,
+				t.daysInForward,
 				ADDTIME(t.shipped,
 					IFNULL(t.shipmentHour, '00:00:00')) shipped,
 				t.warehouseOutFk,
@@ -49,7 +50,7 @@ BEGIN
 				itemFk,
 				TIMESTAMPADD(DAY, life, @dated),
 				quantity,
-				IF(isIn, isReceived, isDelivered) AND NOT isRaid
+				IF(isIn, isReceived, isDelivered) AND NOT daysInForward
 			FROM tValues
 			WHERE isIn OR !lessThanInventory;
 
@@ -64,7 +65,7 @@ BEGIN
 				itemFk,
 				created,
 				quantity,
-				IF(isIn, isDelivered, isReceived) AND NOT isRaid
+				IF(isIn, isDelivered, isReceived) AND NOT daysInForward
 			FROM tValues
 			WHERE !isIn OR !lessThanInventory;
 

db/routines/vn/functions/address_getGeo.sql

@@ -14,12 +14,9 @@ BEGIN
 	SELECT p.geoFk INTO vGeoFk
 		FROM address a 
 			JOIN town t ON t.provinceFk = a.provinceFk
-			JOIN postCode p ON p.townFk = t.id
+			JOIN postCode p ON p.townFk = t.id AND p.`code` = a.postalCode
-				AND (p.code = a.postalCode OR a.postalCode IS NULL)
-			JOIN zoneGeo zg ON zg.id = p.geoFk
 		WHERE a.id = vSelf
-		ORDER BY (a.city SOUNDS LIKE t.name) DESC,
+		ORDER BY (a.city SOUNDS LIKE t.`name`) DESC
-			(p.code = a.postalCode) DESC
 		LIMIT 1;
 
 	RETURN vGeoFk;

db/routines/vn/functions/client_getGeo.sql

@@ -1,27 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`client_getGeo`(vSelf INT)
-	RETURNS int(11)
-	DETERMINISTIC
-BEGIN
-/**
- * Returns the geo for the passed client.
- *
- * @param vSelf The address id
- * @return The geo id
- */
- 	DECLARE vGeoFk INT;
-
-	SELECT p.geoFk INTO vGeoFk
-		FROM client c
-			JOIN town t ON t.provinceFk = c.provinceFk
-			JOIN postCode p ON p.townFk = t.id
-				AND (p.code = c.postcode OR c.postcode IS NULL)
-			JOIN zoneGeo zg ON zg.id = p.geoFk
-		WHERE c.id = vSelf
-		ORDER BY (c.city SOUNDS LIKE t.name) DESC,
-			(p.code = c.postcode) DESC
-		LIMIT 1;
-
-	RETURN vGeoFk;
-END$$
-DELIMITER ;

db/routines/vn/functions/entry_getCommission.sql

@@ -1,22 +1,48 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`entry_getCommission`(vTravelFk INT,
-	vCurrencyFk INT,
+    vCurrencyFk INT,
-	vSupplierFk INT
+    vSupplierFk INT
 )
 	RETURNS int(11)
 	NOT DETERMINISTIC
 	READS SQL DATA
 BEGIN
-	DECLARE vCommission INT;
+    DECLARE vCommission INT;
-	DECLARE vCurrentCommission INT;
+    DECLARE vCurrentCommission INT;
-	DECLARE vIsNotEUR INT;
+    DECLARE vIsCurrencyUsd INT;
-	DECLARE vLastEntryFk INT;
+    DECLARE vLastEntryFk INT;
     
-	SELECT count(*) INTO vIsNotEUR
+    SELECT count(*) INTO vIsCurrencyUsd
-			FROM currency c
+            FROM currency c
-			WHERE c.code <> 'EUR' AND id = vCurrencyFk;
+            WHERE c.code = 'USD' AND id = vCurrencyFk;
+    
+    IF NOT vIsCurrencyUsd THEN
+    
+		SELECT e.id INTO vLastEntryFk
+			FROM vn.entry e
+				JOIN vn.travel tr ON tr.id = e.travelFk
+                WHERE e.supplierFk = vSupplierFk
+                ORDER BY tr.landed DESC
+                LIMIT 1;
+        
+        IF vLastEntryFk THEN
+        
+			SELECT commission INTO vCurrentCommission
+				FROM vn.entry
+                WHERE id = vLastEntryFk;
+        
+        ELSE
+        
+			SELECT commission INTO vCurrentCommission
+				FROM supplier s
+				WHERE s.id = vSupplierFk;
+        
+		END IF;
+        
+        RETURN vCurrentCommission;
+        
+    ELSE
 
-	IF vIsNotEUR THEN
 		SELECT ROUND(-100 * (1 - (1 / r.value))) INTO vCommission
 			FROM travel t
 				LEFT JOIN referenceCurrent r ON r.currencyFk = vCurrencyFk AND r.`dated` <= t.shipped
@@ -25,27 +51,8 @@ BEGIN
 			LIMIT 1;
         
 		RETURN IFNULL(vCommission, 0);
-	ELSE
-		SELECT e.id INTO vLastEntryFk
-			FROM `entry` e
-				JOIN travel tr ON tr.id = e.travelFk
-				WHERE e.supplierFk = vSupplierFk
-				ORDER BY tr.landed DESC
-				LIMIT 1;
     
-		IF vLastEntryFk THEN
+    END IF;
-			SELECT commission INTO vCurrentCommission
-				FROM `entry`
-				WHERE id = vLastEntryFk;
     
-		ELSE
-			SELECT commission INTO vCurrentCommission
-				FROM supplier s
-				WHERE s.id = vSupplierFk;
-
-		END IF;
-
-		RETURN vCurrentCommission;
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/functions/supplier_getGeo.sql

@@ -1,29 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`supplier_getGeo`(vSelf INT)
-	RETURNS int(11)
-	DETERMINISTIC
-BEGIN
-/**
- * Returns the geo for the passed supplier.
- *
- * @param vSelf The address id
- * @return The geo id
- */
- 	DECLARE vGeoFk INT;
-
-	SELECT p.geoFk INTO vGeoFk
-		FROM supplier s
-			JOIN town t ON t.provinceFk = s.provinceFk
-			JOIN postCode p ON p.townFk = t.id
-				AND (p.code = s.postCode OR s.postCode IS NULL)
-			LEFT JOIN supplierAddress sad ON sad.supplierFk = s.id
-			JOIN zoneGeo zg ON zg.id = p.geoFk
-		WHERE s.id = vSelf
-		ORDER BY (s.city SOUNDS LIKE t.name) DESC,
-			(p.code = s.postCode) DESC,
-			(p.code = sad.postalCode) DESC
-		LIMIT 1;
-
-	RETURN vGeoFk;
-END$$
-DELIMITER ;

db/routines/vn/functions/timeWorkerControl_getDirection.sql

@@ -0,0 +1,65 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`timeWorkerControl_getDirection`(vUserFk INT, vTimed DATETIME)
+	RETURNS varchar(6) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci
+	NOT DETERMINISTIC
+	READS SQL DATA
+BEGIN
+/**
+ * Verifica la dirección de la fichada 
+ * @param vUserFk Identificador del trabajador
+ * @param vTimed Hora de la fichada
+ * @return Retorna sentido de la fichada 'in, out, middle'
+ */
+
+	DECLARE vPrevious DATETIME ;
+    DECLARE vNext DATETIME ;
+    DECLARE vPreviousDirection VARCHAR(3) ;
+    DECLARE vNextDirection VARCHAR(3) ;
+    DECLARE vDayStayMax INT;
+    DECLARE vTimedSeconds INT;
+    DECLARE vLastTimeIn INT;
+	
+    SELECT UNIX_TIMESTAMP(vTimed) INTO vTimedSeconds;
+    
+    SELECT dayStayMax INTO vDayStayMax
+		FROM vn.workerTimeControlParams;
+
+    SELECT timed, direction INTO vNext,vNextDirection
+		FROM vn.workerTimeControl 
+        WHERE userFk = vUserFk 
+			AND direction IN ('in','out')
+            AND timed > vTimed
+		ORDER BY timed ASC
+        LIMIT 1;
+        
+    SELECT timed, direction INTO vPrevious, vPreviousDirection
+		FROM vn.workerTimeControl 
+        WHERE userFk = vUserFk 
+			AND direction IN ('in','out')
+            AND timed < vTimed
+		ORDER BY timed DESC
+        LIMIT 1;   
+	
+    IF (vTimedSeconds - UNIX_TIMESTAMP(vPrevious) + UNIX_TIMESTAMP(vNext) - vTimedSeconds)<= vDayStayMax AND vPreviousDirection = 'in'  AND vNextDirection = 'out' THEN 
+		RETURN 'middle';
+	END IF;
+    
+    
+    IF (vTimedSeconds> UNIX_TIMESTAMP(vPrevious)) THEN
+		IF vPreviousDirection = 'in' THEN 
+			RETURN 'out';
+		ELSE
+			SELECT UNIX_TIMESTAMP(MAX(timed)) INTO vLastTimeIn
+				FROM vn.workerTimeControl 
+				WHERE userFk = vUserFk 
+					AND direction ='in'
+					AND timed < vPrevious;
+			IF vTimedSeconds - vLastTimeIn <= vDayStayMax THEN
+				RETURN 'out';
+            END IF;
+		END IF;
+	END IF;
+
+	RETURN 'in';
+END$$
+DELIMITER ;

db/routines/vn/procedures/absoluteInventoryHistory.sql

@@ -39,7 +39,7 @@ BEGIN
 						AND vWarehouseFk IN (tr.warehouseInFk, 0)
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
-						AND NOT tr.isRaid
+						AND NOT tr.daysInForward
 				UNION ALL
 				SELECT tr.shipped,
 						NULL,
@@ -58,7 +58,7 @@ BEGIN
 						AND s.id <> (SELECT supplierFk FROM inventoryConfig)
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
-						AND NOT tr.isRaid
+						AND NOT tr.daysInForward
 				UNION ALL
 				SELECT t.shipped,
 						NULL,

db/routines/vn/procedures/available_traslate.sql

@@ -42,7 +42,7 @@ proc: BEGIN
 			WHERE t.landed BETWEEN vDatedInventory AND vDatedFrom
 				AND t.warehouseInFk = vWarehouseLanding
 				AND NOT e.isExcludedFromAvailable
-				AND NOT t.isRaid
+				AND NOT t.daysInForward
 			GROUP BY c.itemFk;
 
 	-- Tabla con el ultimo dia de last_buy para cada producto
@@ -57,7 +57,7 @@ proc: BEGIN
 				JOIN travel tr ON tr.id = e.travelFk
 				LEFT JOIN tItemRange i ON t.itemFk = i.itemFk
 			WHERE t.warehouseFk = vWarehouseShipment
-				AND NOT tr.isRaid
+				AND NOT tr.daysInForward
 	ON DUPLICATE KEY UPDATE tItemRange.dated = GREATEST(tItemRange.dated,
 	tr.landed);
 
@@ -94,7 +94,7 @@ proc: BEGIN
 				JOIN tItemRangeLive ir ON ir.itemFk = b.itemFk
 			WHERE NOT e.isExcludedFromAvailable
 				AND b.quantity <> 0
-				AND NOT t.isRaid
+				AND NOT t.daysInForward
 				AND t.warehouseInFk = vWarehouseLanding
 				AND t.landed >= vDatedFrom
 				AND (ir.dated IS NULL OR t.landed <= ir.dated)

db/routines/vn/procedures/entry_getTransfer.sql

@@ -166,7 +166,7 @@ BEGIN
 				LEFT JOIN tmp.buyUltimateFromInterval bufi ON bufi.itemFk = i.id
 				LEFT JOIN buy b3 ON b3.id = bufi.buyFk
 		WHERE ic.display
-			AND NOT tr.isRaid
+			AND NOT tr.daysInForward
 			AND (ti.visible OR ti.available)
 			ORDER BY i.typeFk, i.name, i.id, i.size, i.category, o.name;
 

db/routines/vn/procedures/entry_isEditable.sql

@@ -9,18 +9,16 @@ BEGIN
  *
  * @param vSelf Id de entrada
  */
-	DECLARE vIsNotEditable BOOL DEFAULT FALSE;
+	DECLARE vIsEditable BOOL;
 
-	SELECT TRUE INTO vIsNotEditable
+	SELECT e.isBooked INTO vIsEditable
 		FROM `entry` e
-			LEFT JOIN entryType et ON et.code = e.typeFk
+			JOIN entryType et ON et.code = e.typeFk 
-		WHERE e.id = vSelf
+		WHERE NOT et.isInformal
-			AND e.isBooked
+			AND e.id = vSelf;
-			AND (e.typeFk IS NULL OR NOT et.isInformal);
 
-	IF vIsNotEditable AND NOT IFNULL(@isModeInventory, FALSE) THEN
+	IF vIsEditable AND NOT IFNULL(@isModeInventory, FALSE) THEN
 		CALL util.throw(CONCAT('Entry ', vSelf, ' is not editable'));
 	END IF;
-
 END$$
 DELIMITER ;

db/routines/vn/procedures/entry_updateComission.sql

@@ -22,7 +22,7 @@ BEGIN
 			FROM vn.entry e
 				JOIN vn.travel t ON t.id = e.travelFk
 				JOIN vn.warehouse w ON w.id = t.warehouseInFk 
-			WHERE t.landed >= util.VN_CURDATE()
+			WHERE t.shipped >= util.VN_CURDATE()
 				AND e.currencyFk = vCurrency
 				AND NOT e.isBooked;
 

db/routines/vn/procedures/expeditionScan_Put.sql

@@ -4,12 +4,12 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`expeditionScan_Put`(
 	vExpeditionFk INT
 )
 BEGIN
-	IF NOT EXISTS (SELECT id FROM expeditionPallet WHERE id = vPalletFk) THEN
+	IF NOT (SELECT TRUE FROM expedition WHERE id = vExpeditionFk LIMIT 1) THEN
-		CALL util.throw('Pallet not exists');
+		CALL util.throw('Expedition not exists');
 	END IF;
 
-	IF NOT EXISTS (SELECT id FROM expedition WHERE id = vExpeditionFk) THEN
+	IF NOT (SELECT TRUE FROM expeditionPallet WHERE id = vPalletFk LIMIT 1) THEN
-		CALL util.throw('Expedition not exists');
+		CALL util.throw('Pallet not exists');
 	END IF;
 
 	REPLACE expeditionScan(expeditionFk, palletFk)

db/routines/vn/procedures/inventoryMake.sql

@@ -137,7 +137,7 @@ BEGIN
 					JOIN travel tr ON tr.id = e.travelFk
 				WHERE tr.warehouseInFk = vWarehouseFk
 					AND tr.landed BETWEEN vDateLastInventory AND vDateYesterday
-					AND NOT tr.isRaid
+					AND NOT tr.daysInForward
 				GROUP BY b.itemFk;
 
 		-- Transfers
@@ -150,7 +150,7 @@ BEGIN
 							JOIN travel tr ON tr.id = e.travelFk
 						WHERE tr.warehouseOutFk = vWarehouseFk
 							AND tr.shipped BETWEEN vDateLastInventory AND vDateYesterday
-							AND NOT tr.isRaid
+							AND NOT tr.daysInForward
 						GROUP BY b.itemFk
 				) sub
 			ON DUPLICATE KEY UPDATE quantity = IFNULL(quantity, 0) + sub.quantityOut;

db/routines/vn/procedures/invoiceIn_booking.sql

@@ -219,7 +219,7 @@ BEGIN
 						) eWithheld ON TRUE 
 			WHERE tii.taxTypeSageFk IS NOT NULL 
 				AND (tii.taxCode IS NULL OR tii.taxCode NOT IN ('import10', 'import21')) 
-			GROUP BY tii.CuentaIvaRepercutido;
+			GROUP BY tii.PorcentajeIva, tii.expenseFk;
 
 	-- Línea iva inversor sujeto pasivo
  	INSERT INTO XDiario( 
@@ -284,7 +284,7 @@ BEGIN
 				AND NOT(tii.isVies 
 					AND c.nontaxableTransactionTypeFk = tii.transactionTypeSageFk 
 					AND tii.taxCode = 'nonTaxable')
-			GROUP BY tii.CuentaIvaRepercutido;
+			GROUP BY tii.PorcentajeIva, tii.expenseFk;
 		
 	-- Actualización del registro original		
 	UPDATE invoiceIn ii

db/routines/vn/procedures/itemShelvingSale_setQuantity.sql

@@ -3,8 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingSale_setQ
 	vItemShelvingSaleFk INT(10),
 	vQuantity DECIMAL(10,0),
 	vIsItemShelvingSaleEmpty BOOLEAN,
-	vSectorFk INT,
+	vSectorFk INT
-	vShelvingFk VARCHAR(10)
 )
 BEGIN
 /**
@@ -25,7 +24,6 @@ BEGIN
 	DECLARE vItemFk INT;
 	DECLARE vTotalQuantity INT;
 	DECLARE vStateCode VARCHAR(45);
-	DECLARE vCurrentShelvingFk VARCHAR(10);
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 		BEGIN
@@ -47,26 +45,18 @@ BEGIN
 			iss.saleFk, 
 			iss.itemShelvingFk, 
 			SUM(IFNULL(iss.quantity,0)), 
-			IF(sgd.id, 'PREVIOUS_PREPARATION', 'PREPARED'),
+			IF(sgd.id, 'PREVIOUS_PREPARATION', 'PREPARED')
-			sh.code
 		INTO vItemFk, 
 			vSaleFk, 
 			vItemShelvingFk, 
 			vReservedQuantity, 
-			vStateCode,
+			vStateCode
-			vCurrentShelvingFk
 		FROM itemShelvingSale iss
 			JOIN sale s ON s.id = iss.saleFk
-			JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+			LEFT JOIN vn.saleGroupDetail sgd ON sgd.saleFk = iss.saleFk
-			LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = iss.saleFk
-			LEFT JOIN shelving sh ON sh.id = ish.shelvingFk
 		WHERE iss.id = vItemShelvingSaleFk
 			AND NOT iss.isPicked;
 
-	IF NOT (vCurrentShelvingFk <=> vShelvingFk) THEN
-		CALL util.throw('The shelving can not be different from the shelving reserved');
-	END IF;
-
 	IF vQuantity > vReservedQuantity 
 		OR (vQuantity < vReservedQuantity AND NOT vIsItemShelvingSaleEmpty)
 		OR (vQuantity = vReservedQuantity AND vIsItemShelvingSaleEmpty) THEN

db/routines/vn/procedures/itemShelving_get.sql

@@ -21,8 +21,7 @@ BEGIN
 			ish.isChecked,
 			ic.url,
 			ish.available,
-			ish.buyFk,
+			ish.buyFk
-			ish.shelvingFk
 		FROM itemShelving ish
 			JOIN item i ON i.id = ish.itemFk
 			JOIN shelving s ON s.id = ish.shelvingFk

db/routines/vn/procedures/item_getBalance.sql

@@ -59,7 +59,7 @@ BEGIN
 					AND (s.id <> vSupplierInventoryFk OR vDated IS NULL)
 					AND b.itemFk = vItemFk
 					AND NOT e.isExcludedFromAvailable
-					AND NOT tr.isRaid
+					AND NOT tr.daysInForward
 		),
 		entriesOut AS (
 			SELECT 'entry',
@@ -95,7 +95,7 @@ BEGIN
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
 						AND NOT w.isFeedStock
-						AND NOT tr.isRaid
+						AND NOT tr.daysInForward
 		),
 		sales AS (
 			WITH itemSales AS (

db/routines/vn/procedures/item_getMinacum.sql

@@ -63,7 +63,7 @@ BEGIN
 						AND NOT e.isExcludedFromAvailable
 						AND b.quantity <> 0
 						AND (vItemFk IS NULL OR b.itemFk = vItemFk)
-						AND NOT t.isRaid
+						AND NOT t.daysInForward
 				UNION ALL
 				SELECT r.itemFk,
 						r.shipment,

db/routines/vn/procedures/item_multipleBuyByDate.sql

@@ -30,7 +30,7 @@ BEGIN
 			AND NOT s.name = 'INVENTARIO'
 			AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
 			AND w.isComparative
-			AND NOT t.isRaid
+			AND NOT t.daysInForward
 		GROUP BY i.id;
 
 	UPDATE tmp.itemInventory y

db/routines/vn/procedures/item_valuateInventory.sql

@@ -109,7 +109,7 @@ BEGIN
 				JOIN warehouse w ON w.id = tr.warehouseInFk
 			WHERE tr.landed BETWEEN vInventoried AND vDateDayEnd
 				AND IF(tr.landed = util.VN_CURDATE(), tr.isReceived, TRUE)
-				AND NOT tr.isRaid
+				AND NOT tr.daysInForward
 				AND w.valuatedInventory
 				AND t.isInventory
 				AND e.supplierFk <> vInventorySupplierFk
@@ -131,7 +131,7 @@ BEGIN
 				JOIN itemCategory ic ON ic.id = t.categoryFk
 				JOIN warehouse w ON w.id = tr.warehouseOutFk
 			WHERE tr.shipped BETWEEN vInventoried AND vDateDayEnd
-				AND NOT tr.isRaid
+				AND NOT tr.daysInForward
 				AND w.valuatedInventory
 				AND t.isInventory
 				AND (t.id = vItemTypeFk OR vItemTypeFk IS NULL)
@@ -196,7 +196,7 @@ BEGIN
 				JOIN warehouse wIn ON wIn.id = tr.warehouseInFk
 				JOIN warehouse wOut ON wOut.id = tr.warehouseOutFk
 			WHERE vDated >= tr.shipped AND vDated < tr.landed
-				AND NOT tr.isRaid
+				AND NOT tr.daysInForward
 				AND wIn.valuatedInventory
 				AND t.isInventory
 				AND e.isConfirmed

db/routines/vn/procedures/multipleInventory.sql

@@ -60,7 +60,7 @@ proc: BEGIN
 						AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
-						AND NOT t.isRaid
+						AND NOT t.daysInForward
 				UNION ALL
 				SELECT b.itemFk, - b.quantity
 					FROM buy b
@@ -71,7 +71,7 @@ proc: BEGIN
 						AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
-						AND NOT t.isRaid
+						AND NOT t.daysInForward
 			) sub
 			GROUP BY itemFk;
 
@@ -121,7 +121,7 @@ proc: BEGIN
 						AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
-						AND NOT t.isRaid
+						AND NOT t.daysInForward
 				UNION ALL
 				SELECT b.itemFk, t.shipped, - b.quantity
 					FROM buy b
@@ -132,7 +132,7 @@ proc: BEGIN
 						AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
-						AND NOT t.isRaid
+						AND NOT t.daysInForward
 			) sub
 			GROUP BY sub.itemFk, sub.dated;
 

db/routines/vn/procedures/route_calcCommission.sql

@@ -11,8 +11,6 @@ BEGIN
  */
 	DECLARE vIsUpdatable, vIsFreelance BOOL DEFAULT 0;
 	DECLARE vAgencyModePricePercentage DOUBLE;
-	DECLARE vIsKmTruckRate BOOL;
-	DECLARE vCountryFk INT;
 
 	SELECT r.created >= rc.cutoffDated INTO vIsUpdatable
 		FROM route r
@@ -23,16 +21,10 @@ BEGIN
 		DELETE FROM routeCommission
 			WHERE routeFk = vSelf;
 
-		SELECT w.isFreelance, v.isKmTruckRate, c.countryFk INTO vIsFreelance, vIsKmTruckRate, vCountryFk
+		SELECT w.isFreelance INTO vIsFreelance
 			FROM route r
 				JOIN worker w ON w.id = r.workerFk
-				JOIN vehicle v ON v.id = r.vehicleFk
+			WHERE r.id = vSelf;
-				LEFT JOIN ticket t ON t.routeFk = r.id
-				LEFT JOIN client c ON c.id = t.clientFk
-			WHERE r.id = vSelf
-			GROUP BY c.countryFk
-			ORDER BY COUNT(*) DESC
-			LIMIT 1;
 
 		SELECT ampp.percentage INTO vAgencyModePricePercentage
 			FROM route r
@@ -47,9 +39,7 @@ BEGIN
 					workCenterFk,
 					freelanceYearlyM3,
 					cat4m3,
-					cat5m3,
+					cat5m3
-					isKmTruckRate,
-					countryFk
 				)
 				SELECT vSelf,
 						r.commissionWorkCenterFk,
@@ -61,14 +51,11 @@ BEGIN
 							IFNULL(r.m3, 0),
 							0
 						),
-						IFNULL(wc.distributionCat4M3, rc.distributionCat4M3) * IFNULL(r.m3, 0),
+						rc.distributionCat4M3 * IFNULL(r.m3, 0),
-						IFNULL(wc.distributionCat5M3, rc.distributionCat5M3) * IFNULL(r.m3, 0),
+						rc.distributionCat5M3 * IFNULL(r.m3, 0)
-						vIsKmTruckRate,
-						vCountryFk
 					FROM route r
 						JOIN vehicle v ON v.id = r.vehicleFk
 						JOIN routeConfig rc
-						LEFT JOIN workCenterCommission wc ON wc.workCenter = r.workCenterFk
 					WHERE r.id = vSelf
 						AND r.workerFk
 						AND r.commissionWorkCenterFk;
@@ -81,9 +68,7 @@ BEGIN
 					yearlyKm,
 					yearlyM3,
 					cat4m3,
-					cat5m3,
+					cat5m3
-					isKmTruckRate,
-					countryFk
 				)
 				SELECT vSelf,
 						r.commissionWorkCenterFk,
@@ -93,14 +78,11 @@ BEGIN
 							IF(v.isKmTruckRate, rc.deliveryM3Cat5, rc.deliveryM3Cat4),
 						(r.kmEnd - r.kmStart) * rc.kmYearly,
 						IFNULL(r.m3, 0) * rc.m3Yearly,
-						IFNULL(wc.distributionCat4M3, rc.distributionCat4M3) * IFNULL(r.m3, 0),
+						rc.distributionCat4M3 * IFNULL(r.m3, 0),
-						IFNULL(wc.distributionCat5M3, rc.distributionCat5M3) * IFNULL(r.m3, 0),
+						rc.distributionCat5M3 * IFNULL(r.m3, 0)
-						vIsKmTruckRate,
-						vCountryFk
 					FROM route r
 						JOIN vehicle v ON v.id = r.vehicleFk
 						JOIN routeConfig rc
-						LEFT JOIN workCenterCommission wc ON wc.workCenter = r.workCenterFk
 					WHERE r.id = vSelf
 						AND r.kmStart
 						AND r.kmEnd

db/routines/vn/procedures/stockBought_calculate.sql

@@ -80,7 +80,7 @@ proc: BEGIN
 
 	UPDATE stockBought s
 			JOIN tStockSold ts ON ts.workerFk = s.workerFk
-				SET s.bought = IF(s.bought < ABS(ts.sold), 0, ROUND(s.bought - ABS(ts.sold), 1))
+				SET s.bought = IF(s.bought < ts.sold, ROUND(s.bought - ts.sold, 1), 0)
 		WHERE s.dated = vDated;
 
 	DROP TEMPORARY TABLE tCurrentData, tmp.item, tmp.buyUltimate, tStockSold;

db/routines/vn/procedures/ticket_splitItemPackingType.sql

@@ -5,122 +5,122 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_splitItemPacki
 )
 BEGIN
 /**
- * Separa en diferentes tickets según el tipo de empaquetado
+ * Clona y reparte las ventas de un ticket en funcion del tipo de empaquetado.
- * El ticket original conserva las líneas del tipo de empaquetado especificado
+ * Respeta el id inicial para el tipo propuesto.
- * Las líneas sin tipo de empaquetado se asignan al ticket del tipo por defecto.
  *
- * @param vSelf Id del ticket original
+ * @param vSelf Id ticket
- * @param vOriginalItemPackingTypeFk Tipo de empaquetado a mantener en el ticket original
+ * @param vOriginalItemPackingTypeFk Tipo para el que se reserva el número de ticket original
  * @return table tmp.ticketIPT(ticketFk, itemPackingTypeFk)
  */
-	DECLARE vIsDone BOOLEAN DEFAULT FALSE;
+	DECLARE vItemPackingTypeFk VARCHAR(1) DEFAULT 'H';
-	DECLARE vCurrentPackingType VARCHAR(1);
-	DECLARE vDefaultPackingType VARCHAR(1);
-	DECLARE vHasOriginalPackingType BOOLEAN;
 	DECLARE vNewTicketFk INT;
-	DECLARE vTicketFk INT;
+	DECLARE vPackingTypesToSplit INT;
+	DECLARE vDone INT DEFAULT FALSE;
 
-	DECLARE vItemPackingTypes CURSOR FOR
+	DECLARE vSaleGroup CURSOR FOR
-		SELECT DISTINCT itemPackingTypeFk FROM tSalesToMove;
+		SELECT itemPackingTypeFk
+			FROM tSaleGroup
+			WHERE itemPackingTypeFk IS NOT NULL
+			ORDER BY (itemPackingTypeFk = vOriginalItemPackingTypeFk) DESC;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
-
-	CREATE OR REPLACE TEMPORARY TABLE tSalesToMove (
-		ticketFk INT,
-		saleFk INT,
-		itemPackingTypeFk VARCHAR(1)
-	) ENGINE=MEMORY;
-
-	SELECT COALESCE(MAX(ic.defaultPackingTypeFk), MAX(i.itemPackingTypeFk)) INTO vDefaultPackingType
-		FROM vn.sale s
-			JOIN item i ON i.id = s.itemFk
-			LEFT JOIN itemConfig ic ON ic.defaultPackingTypeFk = i.itemPackingTypeFk
-		WHERE s.ticketFk = vSelf
-		GROUP BY s.ticketFk;
-
-	SELECT EXISTS (
-		SELECT TRUE
-			FROM sale s
-				JOIN item i ON i.id = s.itemFk
-			WHERE s.ticketFk = vSelf
-				AND i.itemPackingTypeFk = vOriginalItemPackingTypeFk
-	) INTO vHasOriginalPackingType;
-
-	IF vOriginalItemPackingTypeFk IS NULL OR NOT vHasOriginalPackingType THEN
-		SET vOriginalItemPackingTypeFk = vDefaultPackingType;
-	END IF;
 
 	START TRANSACTION;
 
-	SELECT t.id INTO vTicketFk
+	SELECT id
-		FROM ticket t
+		FROM sale
-			JOIN sale s ON s.id = t.id
+		WHERE ticketFk = vSelf
-		WHERE t.id = vSelf
+			AND NOT quantity
 		FOR UPDATE;
 
-	INSERT INTO tSalesToMove (saleFk, itemPackingTypeFk)
+	DELETE FROM sale
-		SELECT s.id, i.itemPackingTypeFk
+		WHERE NOT quantity
+		AND ticketFk = vSelf;
+
+	CREATE OR REPLACE TEMPORARY TABLE tSale
+		(PRIMARY KEY (id))
+		ENGINE = MEMORY
+		SELECT s.id, i.itemPackingTypeFk, IFNULL(sv.litros, 0) litros
 			FROM sale s
 				JOIN item i ON i.id = s.itemFk
-			WHERE s.ticketFk = vSelf
+				LEFT JOIN saleVolume sv ON sv.saleFk = s.id
-				AND i.itemPackingTypeFk <> vOriginalItemPackingTypeFk;
+			WHERE s.ticketFk = vSelf;
 
-	OPEN vItemPackingTypes;
+	CREATE OR REPLACE TEMPORARY TABLE tSaleGroup
-	l: LOOP
+		ENGINE = MEMORY
-		SET vIsDone = FALSE;
+		SELECT itemPackingTypeFk, SUM(litros) totalLitros
-		FETCH vItemPackingTypes INTO vCurrentPackingType;
+			FROM tSale
+			GROUP BY itemPackingTypeFk;
 
-		IF vIsDone THEN
+	SELECT COUNT(*) INTO vPackingTypesToSplit
-			LEAVE l;
+		FROM tSaleGroup
-		END IF;
+		WHERE itemPackingTypeFk IS NOT NULL;
 
-		CALL ticket_Clone(vSelf, vNewTicketFk);
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT(
+		ticketFk INT,
+		itemPackingTypeFk VARCHAR(1)
+	) ENGINE = MEMORY;
 
-		SELECT id INTO vTicketFk
+	CASE vPackingTypesToSplit
-			FROM ticket t
+		WHEN 0 THEN
-			WHERE t.id = vNewTicketFk
+			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-			FOR UPDATE;
+				VALUES(vSelf, vItemPackingTypeFk);
+		WHEN 1 THEN
+			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
+				SELECT vSelf, itemPackingTypeFk
+					FROM tSaleGroup
+					WHERE itemPackingTypeFk IS NOT NULL;
+		ELSE
+			OPEN vSaleGroup;
+			FETCH vSaleGroup INTO vItemPackingTypeFk;
 
-		UPDATE tSalesToMove
+			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-			SET ticketFk = vNewTicketFk
+				VALUES(vSelf, vItemPackingTypeFk);
-			WHERE itemPackingTypeFk = vCurrentPackingType;
 
-		IF vCurrentPackingType = vDefaultPackingType THEN
+			l: LOOP
-			INSERT INTO tSalesToMove (ticketFk, saleFk, itemPackingTypeFk)
+				SET vDone = FALSE;
-				SELECT vNewTicketFk, s.id, i.itemPackingTypeFk
+				FETCH vSaleGroup INTO vItemPackingTypeFk;
-					FROM sale s
-						JOIN item i ON i.id = s.itemFk
-				WHERE s.ticketFk = vSelf
-					AND i.itemPackingTypeFk IS NULL;
-		END IF;
 
-	END LOOP;
+				IF vDone THEN
-	CLOSE vItemPackingTypes;
+					LEAVE l;
+				END IF;
 
-	UPDATE sale s
+				CALL ticket_Clone(vSelf, vNewTicketFk);
-			JOIN tSalesToMove t ON t.saleFk = s.id
-		SET s.ticketFk = t.ticketFk;
 
-	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT
+				INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-			ENGINE=MEMORY
+					VALUES(vNewTicketFk, vItemPackingTypeFk);
-		SELECT s.ticketFk, MAX(i.itemPackingTypeFk) itemPackingTypeFk
+			END LOOP;
-			FROM sale s
+
-				JOIN item i ON i.id = s.itemFk
+			CLOSE vSaleGroup;
-			WHERE s.ticketFk = vSelf
+
-			GROUP BY s.ticketFk
+			SELECT s.id
-		UNION
+				FROM sale s
-		SELECT ticketFk, MAX(itemPackingTypeFk)
+					JOIN tSale ts ON ts.id = s.id
-			FROM tSalesToMove
+					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = ts.itemPackingTypeFk
-			GROUP BY ticketFk;
+				FOR UPDATE;
+
+			UPDATE sale s
+					JOIN tSale ts ON ts.id = s.id
+					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = ts.itemPackingTypeFk
+				SET s.ticketFk = t.ticketFk;
+
+			SELECT itemPackingTypeFk INTO vItemPackingTypeFk
+				FROM tSaleGroup sg
+				WHERE sg.itemPackingTypeFk IS NOT NULL
+				ORDER BY sg.itemPackingTypeFk
+				LIMIT 1;
+
+			UPDATE sale s
+					JOIN tSale ts ON ts.id = s.id
+					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = vItemPackingTypeFk
+				SET s.ticketFk = t.ticketFk
+				WHERE ts.itemPackingTypeFk IS NULL;
+	END CASE;
 
 	COMMIT;
 
-	DROP TEMPORARY TABLE tSalesToMove;
+	DROP TEMPORARY TABLE
+		tSale,
+		tSaleGroup;
 END$$
 DELIMITER ;

db/routines/vn/procedures/travelVolume_get.sql

@@ -10,7 +10,7 @@ BEGIN
 			JOIN vn.entry e ON e.travelFk = tr.id
 			JOIN vn.buy b ON b.entryFk = e.id
 		WHERE tr.landed BETWEEN vFromDated AND vToDated
-			AND NOT tr.isRaid
+			AND NOT tr.daysInForward
 			AND tr.warehouseInFk = vWarehouseFk
 		GROUP BY tr.landed , a.name ;
 END$$

db/routines/vn/procedures/travel_checkRaid.sql

@@ -1,17 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`travel_checkRaid`(
-	vIsRaid BOOL,
-	vDaysInForward INT
-)
-BEGIN
-/**
- * Check if the values of isRaid and daysInforward are correct
- *
- * @param vIsRaid idRaid value
- * @param vDaysInForward daysInForward value
- */
-	IF (NOT vIsRaid AND vDaysInForward IS NOT NULL) OR (vIsRaid AND vDaysInForward IS NULL) THEN
-		CALL util.throw('The raid information is not correct');
-	END IF;
-END$$
-DELIMITER ;

db/routines/vn/procedures/travel_moveRaids.sql

@@ -37,8 +37,7 @@ BEGIN
 		SELECT id travelFk, 
 				util.VN_CURDATE() + INTERVAL daysInForward  DAY newLanded
 			FROM travel
-			WHERE isRaid
+			WHERE daysInForward;
-				AND daysInForward;
 
 	START TRANSACTION;
 

db/routines/vn/procedures/workerTimeControl_check.sql

@@ -0,0 +1,168 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`workerTimeControl_check`(vUserFk INT, vDated DATE,vTabletFk VARCHAR(100))
+proc: BEGIN
+/**
+ * Verifica si el empleado puede fichar en el momento actual, si puede fichar llama a workerTimeControlAdd
+ *
+ * @param vUserFk Identificador del trabajador
+ * @return Retorna si encuentra un problema 'odd','maxTimeWork','breakDay','breakWeek' ;
+ *	En caso de tener algun problema retorna el primero que encuentra
+ */
+	DECLARE vLastIn DATETIME ;
+	DECLARE vLastOut DATETIME ;
+	DECLARE vDayWorkMax INT;
+	DECLARE vDayBreak INT;
+	DECLARE vWeekBreak INT ;
+	DECLARE vWeekScope INT;
+	DECLARE vDayStayMax INT;
+	DECLARE vProblem VARCHAR(20) DEFAULT NULL;
+	DECLARE vTimedWorked INT;
+	DECLARE vCalendarStateType VARCHAR(20) DEFAULT NULL;
+	DECLARE vDepartmentFk INT;
+	DECLARE vTo VARCHAR(50) DEFAULT NULL;
+	DECLARE vUserName VARCHAR(50) DEFAULT NULL;
+	DECLARE vBody VARCHAR(255) DEFAULT NULL;
+		
+	SELECT dayBreak, weekBreak, weekScope, dayWorkMax, dayStayMax 
+		INTO vDayBreak, vWeekBreak, vWeekScope, vDayWorkMax, vDayStayMax
+		FROM workerTimeControlParams;
+
+	SELECT MAX(timed) INTO vLastIn
+		FROM workerTimeControl 
+		WHERE userFk = vUserFk 
+			AND direction = 'in';
+		
+	SELECT MAX(timed) INTO vLastOut
+		FROM workerTimeControl 
+		WHERE userFk = vUserFk 
+			AND direction = 'out'; 
+
+	SELECT CONCAT(u.name,'@verdnatura.es') INTO vTo
+		FROM account.user u
+		WHERE u.id = (SELECT bossFk FROM worker WHERE id = vUserFk);   
+		
+	SELECT CONCAT(firstName,' ',lastName) INTO vUserName
+		FROM worker w
+		WHERE w.id = vUserFk;
+
+
+	IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastIn) > vDayStayMax THEN -- NUEVA JORNADA
+		
+		-- VERIFICAR DESCANSO DIARIO 
+		IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vDayBreak THEN 
+			SELECT "Descansos 12 h" AS problem;
+			-- ENVIAMOS CORREO AL BOSSFK
+				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 12 h") INTO vBody;
+				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
+			LEAVE proc;
+		END IF;   
+		
+		-- VERIFICAR FICHADAS IMPARES DEL ÚLTIMO DÍA QUE SE FICHÓ
+		IF (SELECT MOD(COUNT(*),2) -- <>0 							
+				FROM workerTimeControl 
+				WHERE userFk = vUserFk
+					AND timed >= vLastIn
+			) THEN				
+			SELECT "Dias con fichadas impares" AS problem;
+			-- ENVIAMOS CORREO AL BOSSFK
+				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Dias con fichadas impares") INTO vBody;
+				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
+			LEAVE proc;	  
+		END IF;
+		
+		-- VERIFICAR VACACIONES
+		SELECT at2.name INTO vCalendarStateType
+			FROM calendar c 
+				JOIN business b ON b.id = c.businessFk
+				JOIN absenceType at2 ON at2.id = c.dayOffTypeFk
+			WHERE c.dated = util.VN_CURDATE()
+				AND at2.isAllowedToWork = FALSE
+				AND b.workerFk = vUserFk
+			LIMIT 1;
+		
+			IF(LENGTH(vCalendarStateType)) THEN
+			SELECT vCalendarStateType AS problem;
+			-- ENVIAMOS CORREO AL BOSSFK
+				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Vacaciones") INTO vBody;
+				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
+			LEAVE proc;	
+				
+			END IF;
+		
+		-- VERIFICAR CONTRATO EN VIGOR
+			IF (SELECT COUNT(*)
+					FROM business b
+					WHERE b.workerFk = vUserFk
+						AND b.started <= vDated
+						AND IFNULL(b.ended, vDated) >= vDated
+				) = 0 THEN
+				SELECT "No hay un contrato en vigor" AS problem;
+				-- ENVIAMOS CORREO AL BOSSFK
+				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"No hay un contrato en vigor") INTO vBody;
+				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
+				LEAVE proc;	
+					
+			END IF;
+
+		-- VERIFICAR DESCANSO SEMANAL
+		SET @vHasBreakWeek:= FALSE;
+		SET @vLastTimed:= UNIX_TIMESTAMP((util.VN_NOW() - INTERVAL vWeekScope SECOND)); 
+		
+		DROP TEMPORARY TABLE IF EXISTS tmp.trash;
+		CREATE TEMPORARY TABLE tmp.trash
+		SELECT  IF(vWeekBreak-(UNIX_TIMESTAMP(timed)-@vLastTimed) <= 0, @vHasBreakWeek:=TRUE, TRUE) alias,
+				@vLastTimed:= UNIX_TIMESTAMP(timed)
+			FROM workerTimeControl 
+			WHERE timed>= (util.VN_NOW() - INTERVAL vWeekScope SECOND)
+				AND userFk= vUserFk
+				AND direction IN ('in','out')
+			ORDER BY timed ASC;   
+			
+		IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vWeekBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA     
+			SELECT "Descansos 36 h" AS problem;
+			-- ENVIAMOS CORREO AL BOSSFK
+				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 36 h") INTO vBody;
+				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
+			LEAVE proc;
+		END IF;
+		
+		DROP TEMPORARY TABLE tmp.trash;    
+
+	ELSE  -- DIA ACTUAL   
+		
+		-- VERIFICA QUE EL TIEMPO EFECTIVO NO SUPERE EL MÁXIMO
+		SELECT IFNULL(SUM(if( mod(wtc.order,2)=1, -UNIX_TIMESTAMP(timed), UNIX_TIMESTAMP(timed))),0) -  IF( MOD(COUNT(*),2), UNIX_TIMESTAMP(util.VN_NOW()), 0) INTO vTimedWorked 
+			FROM workerTimeControl wtc
+			WHERE userFk = vUserFk 
+				AND timed >= vLastIn
+			ORDER BY timed;
+
+		IF  vTimedWorked > vDayWorkMax THEN 
+			SELECT "Jornadas" AS problem;
+			-- ENVIAMOS CORREO AL BOSSFK
+				SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Jornadas") INTO vBody;
+				CALL mail_insert(vTo,vTo,'error al fichar',vBody);
+			LEAVE proc;
+		END IF;
+
+	END IF;
+
+		-- VERIFICAR DEPARTAMENTO
+	/*	IF vTabletFk IS NOT NULL  THEN
+			SELECT wtcu.departmentFk INTO vDepartmentFk
+				FROM workerTimeControlUserInfo wtcu
+				WHERE wtcu.userFk = vUserFk;
+			IF (SELECT COUNT(td.tabletFk)
+						FROM tabletDepartment td
+						WHERE td.tabletFk = vTabletFk AND td.departmentFk = vDepartmentFk
+					) = 0 THEN
+					SELECT "No perteneces a este departamento." AS problem;
+					-- ENVIAMOS CORREO AL BOSSFK
+					SELECT CONCAT(vUserName,' No a podido fichar por el siguiente problema: ',"No perteneces a este departamento.") INTO vBody;
+					CALL mail_insert(vTo,vTo,'error al fichar',vBody);
+					LEAVE proc;	
+			END IF;
+		END IF;*/
+	
+END$$
+DELIMITER ;

db/routines/vn/triggers/address_beforeInsert.sql

@@ -6,7 +6,6 @@ BEGIN
 	DECLARE vIsEqualizated BOOL;
 
 	SET NEW.editorFk = account.myUser_getId();
-	SET NEW.geoFk = address_getGeo(NEW.id);
 
 	IF (NEW.phone <> '') THEN
 		CALL pbx.phone_isValid(NEW.phone);

db/routines/vn/triggers/address_beforeUpdate.sql

@@ -3,6 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`address_beforeUpdate`
 	BEFORE UPDATE ON `address`
 	FOR EACH ROW
 BEGIN
+	
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF !(NEW.phone <=> OLD.phone) AND (NEW.phone <> '') THEN
@@ -13,10 +14,5 @@ BEGIN
 		CALL pbx.phone_isValid(NEW.mobile);
 	END IF;
 
-	IF NOT (NEW.provinceFk <=> OLD.provinceFk)
-		OR (NEW.postalCode <=> OLD.postalCode) THEN
-
-		SET NEW.geoFk = address_getGeo(NEW.id);
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/client_beforeInsert.sql

@@ -3,10 +3,8 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`client_beforeInsert`
 	BEFORE INSERT ON `client`
 	FOR EACH ROW
 BEGIN
+
 	SET NEW.editorFk = account.myUser_getId();
-	SET NEW.accountingAccount = 4300000000 + NEW.id;
-    SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
-	SET NEW.geoFk = client_getGeo(NEW.id);
 
 	IF (NEW.phone <> '') THEN
 		CALL pbx.phone_isValid(NEW.phone);
@@ -15,5 +13,9 @@ BEGIN
 	IF (NEW.mobile <> '') THEN
 		CALL pbx.phone_isValid(NEW.mobile);
 	END IF;
+
+	SET NEW.accountingAccount = 4300000000 + NEW.id;
+    
+    SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
 END$$
 DELIMITER ;

db/routines/vn/triggers/client_beforeUpdate.sql

@@ -72,11 +72,5 @@ BEGIN
 	IF NOT (NEW.businessTypeFk <=> OLD.businessTypeFk) AND (NEW.businessTypeFk = 'individual' OR OLD.businessTypeFk = 'individual') THEN
 		SET NEW.isTaxDataChecked = 0;
 	END IF;
-
-	IF NOT (NEW.provinceFk <=> OLD.provinceFk)
-		OR (NEW.postcode <=> OLD.postcode) THEN
-
-		SET NEW.geoFk = client_getGeo(NEW.id);
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/entry_beforeUpdate.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`entry_beforeUpdate`
 	BEFORE UPDATE ON `entry`
 	FOR EACH ROW
 BEGIN
-	DECLARE vIsRaid BOOL;
+	DECLARE vDaysInForward INT;
 	DECLARE vPrintedCount INT;
 	DECLARE vHasDistinctWarehouses BOOL;
 	DECLARE vTotalBuy INT;
@@ -38,10 +38,10 @@ BEGIN
 			CALL travel_throwAwb(NEW.travelFk);
 		END IF;
 
-		SELECT t.isRaid INTO vIsRaid
+		SELECT daysInForward INTO vDaysInForward
 			FROM travel t
 				JOIN entry e ON e.travelFk = t.id
-			WHERE e.id = NEW.id;
+			WHERE entryFk = NEW.id;
 
 		SELECT NOT (o.warehouseInFk <=> n.warehouseInFk)
 				OR NOT (o.warehouseOutFk <=> n.warehouseOutFk)
@@ -50,7 +50,7 @@ BEGIN
 			WHERE o.id = OLD.travelFk
 				AND n.id = NEW.travelFk;
 
-		IF vIsRaid AND vHasDistinctWarehouses THEN
+		IF vDaysInForward AND vHasDistinctWarehouses THEN
 			SIGNAL SQLSTATE '45000'
 				SET MESSAGE_TEXT = 'A cloned entry cannot be moved to a travel with different warehouses';
 		END IF;

db/routines/vn/triggers/route_afterUpdate.sql

@@ -21,8 +21,7 @@ BEGIN
 		OR !(NEW.kmEnd <=> OLD.kmEnd)
 		OR !(NEW.workerFk <=> OLD.workerFk)
 		OR !(NEW.m3 <=> OLD.m3)
-		OR !(NEW.agencyModeFk <=> OLD.agencyModeFk)
+		OR !(NEW.agencyModeFk <=> OLD.agencyModeFk)THEN
-		OR !(NEW.vehicleFk <=> OLD.vehicleFk)THEN
 			CALL route_calcCommission(NEW.id);
 	END IF;
 

db/routines/vn/triggers/supplier_beforeInsert.sql

@@ -4,6 +4,5 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`supplier_beforeInsert`
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-	SET NEW.geoFk = supplier_getGeo(NEW.id);
 END$$
 DELIMITER ;

db/routines/vn/triggers/supplier_beforeUpdate.sql

@@ -40,10 +40,5 @@ BEGIN
 		SET NEW.isPayMethodChecked = FALSE;
 	END IF;
 
-	IF NOT (NEW.provinceFk <=> OLD.provinceFk)
-		OR (NEW.postCode <=> OLD.postCode) THEN
-
-		SET NEW.geoFk = supplier_getGeo(NEW.id);
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/town_beforeUpdate.sql

@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`town_beforeUpdate`
+	BEFORE UPDATE ON `town`
+	FOR EACH ROW
+BEGIN
+	-- IF !(OLD.geoFk <=> NEW.geoFk) THEN
+	-- 	CALL zoneGeo_throwNotEditable;
+	-- END IF;
+END$$
+DELIMITER ;

db/routines/vn/triggers/travel_beforeInsert.sql

@@ -9,10 +9,6 @@ BEGIN
 
 	CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk);
 	
-	IF NEW.isRaid IS NOT NULL OR NEW.daysInForward IS NOT NULL THEN
-		CALL travel_checkRaid(NEW.isRaid, NEW.daysInForward);
-	END IF;
-
 	IF NEW.awbFk IS NOT NULL THEN
 		CALL travel_throwAwb(NEW.id);
 	END IF;

db/routines/vn/triggers/travel_beforeUpdate.sql

@@ -20,10 +20,6 @@ BEGIN
 		CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk);
 	END IF;
 
-	IF NOT (NEW.isRaid <=> OLD.isRaid)  OR NOT (NEW.daysInForward <=> OLD.daysInForward) THEN
-		CALL travel_checkRaid(NEW.isRaid, NEW.daysInForward);
-	END IF;
-
 	IF NOT (NEW.awbFk <=> OLD.awbFk)THEN
 		SELECT COUNT(*) INTO vHasAnyInvoiceBooked 
 			FROM travel t

db/routines/vn/views/itemEntryIn.sql

@@ -6,7 +6,7 @@ AS SELECT `t`.`warehouseInFk` AS `warehouseInFk`,
 	`b`.`itemFk` AS `itemFk`,
 	`b`.`quantity` AS `quantity`,
 	`t`.`isReceived` AS `isReceived`,
-	`t`.`isRaid` AS `isVirtualStock`,
+	`t`.`daysInForward` AS `isVirtualStock`,
 	`e`.`id` AS `entryFk`
 FROM (
 		(

db/routines/vn/views/itemEntryOut.sql

@@ -15,5 +15,5 @@ FROM (
 		JOIN `vn`.`travel` `t` ON(`e`.`travelFk` = `t`.`id`)
 	)
 WHERE `e`.`isExcludedFromAvailable` = 0
-	AND NOT `t`.`isRaid`
+	AND NOT `t`.`daysInForward`
 	AND `b`.`quantity` <> 0

db/routines/vn/views/lastPurchases.sql

@@ -31,5 +31,5 @@ FROM (
 		LEFT JOIN `edi`.`ekt` `ek` ON(`ek`.`id` = `b`.`ektFk`)
 	)
 WHERE `tr`.`landed` BETWEEN `util`.`yesterday`() AND `util`.`tomorrow`()
-	AND NOT  `tr`.`isRaid`
+	AND NOT  `tr`.`daysInForward`
 	AND `b`.`stickers` > 0

db/routines/vn2008/views/entrySource.sql

@@ -8,7 +8,6 @@ AS SELECT `e`.`gestDocFk` AS `gestdoc_id`,
 	`e`.`isExcludedFromAvailable` AS `Inventario`,
 	`e`.`isConfirmed` AS `Confirmada`,
 	`e`.`isOrdered` AS `Pedida`,
-	`tr`.`isRaid` AS `isRaid`,
 	`tr`.`daysInForward` AS `daysInForward`,
 	`e`.`evaNotes` AS `notas`,
 	`e`.`supplierFk` AS `Id_Proveedor`,

db/routines/vn2008/views/travel.sql

@@ -18,6 +18,5 @@ AS SELECT `t`.`id` AS `id`,
 	`t`.`totalEntries` AS `totalEntries`,
 	`t`.`appointment` AS `appointment`,
 	`t`.`awbFk` AS `awbFk`,
-	`t`.`isRaid` AS `isRaid`,
 	`t`.`daysInForward` AS `daysInForward`
 FROM `vn`.`travel` `t`

db/routines/vn2008/views/v_compres.sql

@@ -86,4 +86,4 @@ FROM (
 	)
 WHERE NOT `W_IN`.`isFeedStock`
 	AND NOT `E`.`Inventario`
-	AND NOT `TR`.`isRaid`
+	AND NOT `TR`.`daysInForward`

db/versions/11312-navyAralia/00-firstScript.sql

@@ -1,23 +0,0 @@
-ALTER TABLE vn.workerRelatives DROP FOREIGN KEY workerRelatives_disabilityGradeFk;
-ALTER TABLE vn.workerRelatives DROP FOREIGN KEY workerRelatives_workerFk;
-
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES
-		('WorkerRelative','updateAttributes','*','ALLOW','ROLE','hr'),
-		('WorkerRelative','crud','WRITE','ALLOW','ROLE','hr'),
-		('WorkerRelative','findById','*','ALLOW','ROLE','hr'),
-		('WorkerRelative','find','*','ALLOW','ROLE','hr'),
-		('WorkerRelative','upsert','*','ALLOW','ROLE','hr'),
-		('WorkerRelative','filter','*','ALLOW','ROLE','hr'),
-		('WorkerIrpf','updateAttributes','*','ALLOW','ROLE','hr'),
-		('WorkerIrpf','crud','*','ALLOW','ROLE','hr'),
-		('WorkerIrpf','findById','*','ALLOW','ROLE','hr'),
-		('WorkerIrpf','find','*','ALLOW','ROLE','hr'),
-		('WorkerIrpf','upsert','*','ALLOW','ROLE','hr'),
-		('WorkerIrpf','filter','*','ALLOW','ROLE','hr'),
-		('DisabilityGrade','updateAttributes','*','ALLOW','ROLE','hr'),
-		('DisabilityGrade','crud','*','ALLOW','ROLE','hr'),
-		('DisabilityGrade','findById','*','ALLOW','ROLE','hr'),
-		('DisabilityGrade','find','*','ALLOW','ROLE','hr'),
-		('DisabilityGrade','upsert','*','ALLOW','ROLE','hr');
-

db/versions/11322-azureAspidistra/00-entryAcl.sql

@@ -1,40 +0,0 @@
--- Eliminar registros existentes donde property = '*'
-DELETE FROM `salix`.ACL WHERE model = 'entry' AND property = '*';
-
--- Insertar permisos para los métodos solicitados en el modelo Entry
-INSERT INTO `salix`.ACL (model, property, accessType, permission, principalType, principalId)
-VALUES
-    -- Permisos para administrative
-    ('Entry', 'upsert', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
-    ('Entry', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
-    ('Entry', 'isBooked', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-    ('Entry', 'findById', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-    ('Entry', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-    ('Entry', 'filter', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-    ('Entry', 'count', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-    ('Entry', 'getEntry', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-    ('Entry', 'getBuys', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-    ('Entry', 'findOne', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-    ('Entry', 'deleteBuys', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
-    ('Entry', 'editLatestBuys', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
-    ('Entry', 'importBuys', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
-    ('Entry', 'importBuysPreview', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-    ('Entry', 'lastItemBuys', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-    ('Entry', 'latestBuysFilter', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-
-    -- Permisos para buyer (excluyendo isBooked)
-    ('Entry', 'upsert', 'WRITE', 'ALLOW', 'ROLE', 'buyer'),
-    ('Entry', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'buyer'),
-    ('Entry', 'findById', 'READ', 'ALLOW', 'ROLE', 'buyer'),
-    ('Entry', 'find', 'READ', 'ALLOW', 'ROLE', 'buyer'),
-    ('Entry', 'filter', 'READ', 'ALLOW', 'ROLE', 'buyer'),
-    ('Entry', 'count', 'READ', 'ALLOW', 'ROLE', 'buyer'),
-    ('Entry', 'getEntry', 'READ', 'ALLOW', 'ROLE', 'buyer'),
-    ('Entry', 'getBuys', 'READ', 'ALLOW', 'ROLE', 'buyer'),
-    ('Entry', 'findOne', 'READ', 'ALLOW', 'ROLE', 'buyer'),
-    ('Entry', 'deleteBuys', 'WRITE', 'ALLOW', 'ROLE', 'buyer'),
-    ('Entry', 'editLatestBuys', 'WRITE', 'ALLOW', 'ROLE', 'buyer'),
-    ('Entry', 'importBuys', 'WRITE', 'ALLOW', 'ROLE', 'buyer'),
-    ('Entry', 'importBuysPreview', 'READ', 'ALLOW', 'ROLE', 'buyer'),
-    ('Entry', 'lastItemBuys', 'READ', 'ALLOW', 'ROLE', 'buyer'),
-    ('Entry', 'latestBuysFilter', 'READ', 'ALLOW', 'ROLE', 'buyer');

db/versions/11332-tealErica/00-firstScript.sql

@@ -1,4 +0,0 @@
-ALTER TABLE vn.travel ADD isRaid tinyint(1) DEFAULT 0 NOT NULL COMMENT 'Redada';
-
-ALTER TABLE vn.travel MODIFY COLUMN daysInForward int(10) unsigned DEFAULT NULL
-	COMMENT 'Cuando es una redada, indica el número de días que se añadirán a la fecha de hoy para establecer el landed. NULL si no es una redada';

db/versions/11341-pinkSalal/00-firstScript.sql

@@ -1,5 +0,0 @@
-
-ALTER TABLE vn.travel ADD IF NOT EXISTS isRaid  tinyint(1) DEFAULT 0 NOT NULL COMMENT 'Redada';
-
-ALTER TABLE vn.travel MODIFY COLUMN daysInForward int(10) unsigned DEFAULT NULL
-	COMMENT 'Cuando es una redada, indica el número de días que se añadirán a la fecha de hoy para establecer el landed. NULL si no es una redada';

db/versions/11342-crimsonDendro/04-itemShelvingLog.sql

@@ -1,8 +1,6 @@
-/*
 CREATE OR REPLACE TEMPORARY TABLE tmp.tItemShelvingLog
 	(PRIMARY KEY (id))
 	ENGINE = MEMORY
 	SELECT ishl.id, s.id shelvingFk
 		FROM vn.itemShelvingLog ishl
 			JOIN vn.shelving s ON s.code = ishl.shelvingFk COLLATE utf8mb3_unicode_ci;
-*/

db/versions/11342-crimsonDendro/05-itemShelvingLog.sql

@@ -1 +1 @@
--- ALTER TABLE vn.itemShelvingLog MODIFY COLUMN shelvingFk int(11) NOT NULL;
+ALTER TABLE vn.itemShelvingLog MODIFY COLUMN shelvingFk int(11) NOT NULL;

db/versions/11342-crimsonDendro/06-itemShelvingLog.sql

@@ -1,7 +1,5 @@
-/*
 UPDATE vn.itemShelvingLog ishl
 		JOIN tmp.tItemShelvingLog tishl ON tishl.id = ishl.id
 	SET ishl.shelvingFk = tishl.shelvingFk;
 
 DROP TEMPORARY TABLE tmp.tItemShelvingLog;
-*/

db/versions/11346-yellowPhormium/00-address.sql

@@ -1,23 +0,0 @@
-ALTER TABLE vn.address
-	ADD geoFk int(11) DEFAULT NULL NULL AFTER isLogifloraAllowed,
-	ADD CONSTRAINT address_zoneGeo_FK FOREIGN KEY (geoFk)
-		REFERENCES vn.zoneGeo(id) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-CREATE OR REPLACE TEMPORARY TABLE tmp.tAddressGeo
-	(PRIMARY KEY (id))
-	ENGINE = MEMORY
-	SELECT a.id, p.geoFk
-		FROM vn.address a
-			JOIN vn.town t ON t.provinceFk = a.provinceFk
-			JOIN vn.postCode p ON p.townFk = t.id
-				AND (p.code = a.postalCode OR a.postalCode IS NULL)
-			JOIN vn.zoneGeo zg ON zg.id = p.geoFk
-		GROUP BY a.id
-		ORDER BY (a.city SOUNDS LIKE t.`name`) DESC,
-			(p.code = a.postalCode) DESC;
-
-UPDATE vn.address a
-		JOIN tmp.tAddressGeo tag ON tag.id = a.id
-	SET a.geoFk = tag.geoFk;
-
-DROP TEMPORARY TABLE tmp.tAddressGeo;

db/versions/11346-yellowPhormium/01-client.sql

@@ -1,26 +0,0 @@
-ALTER TABLE vn.client
-	CHANGE hasDailyInvoice hasDailyInvoice tinyint(1) DEFAULT 0 NOT NULL
-		COMMENT 'Indica si el cliente requiere facturación diaria por defecto se copiará lo que tenga country.hasDailyInvoice'
-		AFTER recommendedCredit,
-	ADD geoFk int(11) DEFAULT NULL NULL AFTER hasDailyInvoice,
-	ADD CONSTRAINT client_zoneGeo_FK FOREIGN KEY (geoFk)
-		REFERENCES vn.zoneGeo(id) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-CREATE OR REPLACE TEMPORARY TABLE tmp.tClientGeo
-	(PRIMARY KEY (id))
-	ENGINE = MEMORY
-	SELECT c.id, p.geoFk
-		FROM vn.client c
-			JOIN vn.town t ON t.provinceFk = c.provinceFk
-			JOIN vn.postCode p ON p.townFk = t.id
-				AND (p.code = c.postcode OR c.postcode IS NULL)
-			JOIN vn.zoneGeo zg ON zg.id = p.geoFk
-		GROUP BY c.id
-		ORDER BY (c.city SOUNDS LIKE t.`name`) DESC,
-			(p.code = c.postcode) DESC;
-
-UPDATE vn.client c
-		JOIN tmp.tClientGeo tcg ON tcg.id = c.id
-	SET c.geoFk = tcg.geoFk;
-
-DROP TEMPORARY TABLE tmp.tClientGeo;

db/versions/11346-yellowPhormium/02-supplier.sql

@@ -1,27 +0,0 @@
-ALTER TABLE vn.supplier
-	CHANGE companySize companySize enum('small','medium','big') CHARACTER SET utf8mb3
-		COLLATE utf8mb3_general_ci DEFAULT NULL NULL AFTER stamp,
-	ADD geoFk int(11) DEFAULT NULL NULL AFTER companySize,
-	ADD CONSTRAINT supplier_zoneGeo_FK FOREIGN KEY (geoFk)
-			REFERENCES vn.zoneGeo(id) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-CREATE OR REPLACE TEMPORARY TABLE tmp.tSupplierGeo
-	(PRIMARY KEY (id))
-	ENGINE = MEMORY
-	SELECT s.id, p.geoFk
-		FROM vn.supplier s
-			JOIN vn.town t ON t.provinceFk = s.provinceFk
-			JOIN vn.postCode p ON p.townFk = t.id
-				AND (p.code = s.postCode OR s.postCode IS NULL)
-			LEFT JOIN vn.supplierAddress sad ON sad.supplierFk = s.id
-			JOIN vn.zoneGeo zg ON zg.id = p.geoFk
-		GROUP BY s.id
-		ORDER BY (s.city SOUNDS LIKE t.`name`) DESC,
-			(p.code = s.postCode) DESC,
-			(p.code = sad.postalCode) DESC;
-
-UPDATE vn.supplier s
-		JOIN tmp.tSupplierGeo tsg ON tsg.id = s.id
-	SET s.geoFk = tsg.geoFk;
-
-DROP TEMPORARY TABLE tmp.tSupplierGeo;

db/versions/11349-azureBamboo/00-firstScript.sql

@@ -1,7 +0,0 @@
-
-
-UPDATE salix.ACL 
-	SET principalId = 'deliveryAssistant'
-WHERE model = 'Ticket' 
-	AND property = 'updateAttributes' 
-	AND principalId = "delivery";

db/versions/11350-silverArborvitae/00-firstScript.sql

@@ -1,2 +0,0 @@
-ALTER TABLE vn.shelvingLog
-    MODIFY COLUMN changedModel enum('Shelving', 'ItemShelving') CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'Shelving' NOT NULL;

db/versions/11351-bronzeMedeola/00-firstScript.sql

@@ -1,2 +0,0 @@
-
-ALTER TABLE vn.itemConfig ADD defaultPackingTypeFk VARCHAR(1) DEFAULT 'H' NULL;

db/versions/11353-wheatCymbidium/00-firstScript.sql

@@ -1,15 +0,0 @@
-
-
-USE vn;
-
-INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
-VALUES('RouteAction', 'find', 'READ', 'ALLOW', 'ROLE', 'delivery');
-
-INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
-VALUES('RouteComplement', 'find', 'READ', 'ALLOW', 'ROLE', 'delivery');
-
-INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
-VALUES('RouteComplement', 'create', 'WRITE', 'ALLOW', 'ROLE', 'delivery');
-
-INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
-VALUES('RouteComplement', 'deleteById', 'WRITE', 'ALLOW', 'ROLE', 'delivery');

db/versions/11354-aquaMastic/00-firstScript.sql

@@ -1,2 +0,0 @@
-RENAME TABLE vn.workerTimeControlParams TO vn.workerTimeControlParams__;
-ALTER TABLE vn.workerTimeControlParams__ COMMENT='@deprecated 2024-11-19';

db/versions/11355-pinkMedeola/00-firstScript.sql

@@ -1,3 +0,0 @@
--- Place your SQL code here
-INSERT IGNORE INTO vn.saySimpleConfig (url, defaultChannel) 
-	VALUES ('https://verdnatura.saysimple.io/start-conversation', 1320);

db/versions/11357-whiteGerbera/00-firstScript.sql

@@ -1,4 +0,0 @@
-ALTER TABLE vn.travel ADD IF NOT EXISTS isRaid  tinyint(1) DEFAULT 0 NOT NULL COMMENT 'Redada';
-
-ALTER TABLE vn.travel MODIFY COLUMN daysInForward int(10) unsigned DEFAULT NULL
-	COMMENT 'Cuando es una redada, indica el número de días que se añadirán a la fecha de hoy para establecer el landed. NULL si no es una redada';

db/versions/11358-maroonPhormium/00-firstScript.sql

@@ -1,51 +0,0 @@
-
-	ALTER TABLE vn.routeCommission ADD IF NOT EXISTS countryFk mediumint(8) unsigned DEFAULT NULL NULL;
-	ALTER TABLE vn.routeCommission ADD IF NOT EXISTS isKmTruckRate TINYINT(1) DEFAULT NULL NULL;
-
-	ALTER TABLE vn.routeCommission DROP FOREIGN KEY IF EXISTS routeCommission_country_FK;
-	ALTER TABLE vn.routeCommission ADD CONSTRAINT routeCommission_country_FK FOREIGN KEY (countryFk)
-		REFERENCES vn.country(id) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-	CREATE TABLE IF NOT EXISTS vn.workCenterCommission (
-		`workCenterFk` INT(11) NOT NULL,
-		`deliveryManAdjustment` DECIMAL(4,2) DEFAULT NULL
-			COMMENT 'Número de trabajadores para equilibrar los repartidores de diferentes centros.
-				Utilizado en repartidores de grafana',
-		`distributionM3Category1` decimal(5,2) DEFAULT NULL,
-		`distributionM3Category2` decimal(5,2) DEFAULT NULL,
-		`distributionCat4M3` DECIMAL(5,2) DEFAULT NULL
-			COMMENT 'Comisión por gestión de la distribución Cat IV',
-		`distributionCat5M3` DECIMAL(5,2) DEFAULT NULL
-			COMMENT 'Comisión por gestión de la distribución Cat V',
-		PRIMARY KEY (`workCenterFk`),
-		CONSTRAINT `workCenterCommission_workCenterFk` FOREIGN KEY (`workCenterFk`)
-			REFERENCES `workCenter` (`id`) ON UPDATE CASCADE ON DELETE RESTRICT
-	);
-
-	UPDATE vn.routeCommission rc
-			JOIN (SELECT id, countryFk, isKmTruckRate
-					FROM (SELECT r.id, c.countryFk, v.isKmTruckRate
-							FROM  vn.route r
-								JOIN  vn.routeCommission rc ON rc.routeFk = r.id
-								LEFT JOIN  vn.ticket t ON t.routeFk = r.id
-								LEFT JOIN  vn.client c ON c.id = t.clientFk
-								LEFT JOIN  vn.vehicle v ON v.id = r.vehicleFk
-							WHERE r.created >= '2023-12-01'
-							GROUP BY r.id, c.countryFk
-							ORDER BY r.id, COUNT(*) DESC
-							LIMIT 100000000000
-					)sub
-					GROUP BY id
-			)sub ON sub.id =  rc.routeFk
-		SET rc.isKmTruckRate = sub.isKmTruckRate,
-			rc.countryFk = sub.countryFk;
-
-	ALTER TABLE vn.workerDistributionCategory ADD IF NOT EXISTS countryFk mediumint(8) unsigned DEFAULT NULL NULL;
-	ALTER TABLE vn.workerDistributionCategory ADD IF NOT EXISTS isKmTruckRate TINYINT(1) DEFAULT NULL NULL;
-
-	ALTER TABLE vn.workerDistributionCategory DROP FOREIGN KEY IF EXISTS workerDistributionCategory_country_FK;
-	ALTER TABLE vn.workerDistributionCategory ADD CONSTRAINT workerDistributionCategory_country_FK FOREIGN KEY (countryFk)
-		REFERENCES vn.country(id) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-	ALTER TABLE vn.workerDistributionCategory ADD IF NOT EXISTS commissionSplitWorkers INT UNSIGNED NOT NULL DEFAULT 1
-		COMMENT 'Número de enrutadores entr los que se reparte la comsión';

e2e/paths/04-item/01_summary.spec.js

@@ -1,133 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Item summary path', () => {
-    let browser;
-    let page;
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('employee', 'item');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should search for an item', async() => {
-        await page.doSearch('Ranged weapon');
-        const resultsCount = await page.countElement(selectors.itemsIndex.searchResult);
-
-        await page.waitForTextInElement(selectors.itemsIndex.firstSearchResult, 'Ranged weapon');
-        await page.waitToClick(selectors.itemsIndex.firstResultPreviewButton);
-        const isVisible = await page.isVisible(selectors.itemSummary.basicData);
-
-        expect(resultsCount).toBe(4);
-        expect(isVisible).toBeTruthy();
-    });
-
-    it(`should check the item summary preview shows fields from basic data`, async() => {
-        await page.waitForTextInElement(selectors.itemSummary.basicData, 'Ranged weapon longbow 200cm');
-        const result = await page.waitToGetProperty(selectors.itemSummary.basicData, 'innerText');
-
-        expect(result).toContain('Ranged weapon longbow 200cm');
-    });
-
-    it(`should check the item summary preview shows fields from tags`, async() => {
-        await page.waitForTextInElement(selectors.itemSummary.tags, 'Brown');
-        const result = await page.waitToGetProperty(selectors.itemSummary.tags, 'innerText');
-
-        expect(result).toContain('Brown');
-    });
-
-    it(`should check the item summary preview shows fields from botanical`, async() => {
-        await page.waitForTextInElement(selectors.itemSummary.botanical, 'Abelia');
-        const result = await page.waitToGetProperty(selectors.itemSummary.botanical, 'innerText');
-
-        expect(result).toContain('Abelia');
-    });
-
-    it(`should check the item summary preview shows fields from barcode`, async() => {
-        await page.waitForTextInElement(selectors.itemSummary.barcode, '1');
-        const result = await page.waitToGetProperty(selectors.itemSummary.barcode, 'innerText');
-
-        expect(result).toContain('1');
-    });
-
-    it(`should close the summary popup`, async() => {
-        await page.closePopup();
-        await page.waitForSelector(selectors.itemSummary.basicData, {hidden: true});
-    });
-
-    it('should search for other item', async() => {
-        await page.doSearch('Melee Reinforced');
-        const resultsCount = await page.countElement(selectors.itemsIndex.searchResult);
-
-        await page.waitToClick(selectors.itemsIndex.firstResultPreviewButton);
-        await page.waitForSelector(selectors.itemSummary.basicData, {visible: true});
-
-        expect(resultsCount).toBe(3);
-    });
-
-    it(`should now check the item summary preview shows fields from basic data`, async() => {
-        await page.waitForTextInElement(selectors.itemSummary.basicData, 'Melee Reinforced weapon combat fist 15cm');
-        const result = await page.waitToGetProperty(selectors.itemSummary.basicData, 'innerText');
-
-        expect(result).toContain('Melee Reinforced weapon combat fist 15cm');
-    });
-
-    it(`should now check the item summary preview shows fields from tags`, async() => {
-        await page.waitForTextInElement(selectors.itemSummary.tags, 'Silver');
-        const result = await page.waitToGetProperty(selectors.itemSummary.tags, 'innerText');
-
-        expect(result).toContain('Silver');
-    });
-
-    it(`should now check the item summary preview shows fields from botanical`, async() => {
-        await page.waitForTextInElement(selectors.itemSummary.botanical, '-');
-        const result = await page.waitToGetProperty(selectors.itemSummary.botanical, 'innerText');
-
-        expect(result).toContain('-');
-    });
-
-    it(`should now close the summary popup`, async() => {
-        await page.closePopup();
-        await page.waitForSelector(selectors.itemSummary.basicData, {hidden: true});
-    });
-
-    it(`should navigate to one of the items detailed section`, async() => {
-        await page.accessToSearchResult('Melee weapon combat fist 15cm');
-        await page.waitForState('item.card.summary');
-    });
-
-    it(`should check the descritor edit button is not visible for employee`, async() => {
-        const visibleButton = await page.isVisible(selectors.itemDescriptor.editButton);
-
-        expect(visibleButton).toBeFalsy();
-    });
-
-    it(`should check the item summary shows fields from basic data section`, async() => {
-        await page.waitForTextInElement(selectors.itemSummary.basicData, 'Melee weapon combat fist 15cm');
-        const result = await page.waitToGetProperty(selectors.itemSummary.basicData, 'innerText');
-
-        expect(result).toContain('Melee weapon combat fist 15cm');
-    });
-
-    it(`should check the item summary shows fields from tags section`, async() => {
-        const result = await page.waitToGetProperty(selectors.itemSummary.tags, 'innerText');
-
-        expect(result).toContain('Silver');
-    });
-
-    it(`should check the item summary shows fields from botanical section`, async() => {
-        const result = await page.waitToGetProperty(selectors.itemSummary.botanical, 'innerText');
-
-        expect(result).toContain('procera');
-    });
-
-    it(`should check the item summary shows fields from barcodes section`, async() => {
-        const result = await page.waitToGetProperty(selectors.itemSummary.barcode, 'innerText');
-
-        expect(result).toContain('4');
-    });
-});

e2e/paths/04-item/02_basic_data.spec.js

@@ -1,64 +0,0 @@
-import getBrowser from '../../helpers/puppeteer';
-
-const $ = {
-    form: 'vn-item-basic-data form',
-    intrastatForm: '.vn-dialog.shown form',
-    newIntrastatButton: 'vn-item-basic-data vn-icon-button[vn-tooltip="New intrastat"] > button'
-};
-
-describe('Item Edit basic data path', () => {
-    let browser;
-    let page;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('buyer', 'item');
-        await page.accessToSearchResult('Melee weapon combat fist 15cm');
-    });
-
-    beforeEach(async() => {
-        await page.accessToSection('item.card.basicData');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it(`should edit the item basic data and confirm the item data was edited`, async() => {
-        const values = {
-            type: 'Anthurium',
-            intrastat: 'Coral y materiales similares',
-            relevancy: 1,
-            generic: 'Pallet',
-            isActive: false,
-            priceInKg: true,
-            isFragile: true,
-            packingOut: 5
-        };
-
-        const message = await page.sendForm($.form, values);
-        await page.reloadSection('item.card.basicData');
-        const formValues = await page.fetchForm($.form, Object.keys(values));
-
-        expect(message.isSuccess).toBeTrue();
-        expect(formValues).toEqual(values);
-    });
-
-    it(`should create a new intrastat and save it`, async() => {
-        await page.click($.newIntrastatButton);
-        await page.waitForSelector($.intrastatForm);
-        await page.fillForm($.intrastatForm, {
-            id: '588420239',
-            description: 'Tropical Flowers'
-        });
-        await page.respondToDialog('accept');
-
-        const message = await page.sendForm($.form);
-        await page.reloadSection('item.card.basicData');
-        const formValues = await page.fetchForm($.form, ['intrastat']);
-
-        expect(message.isSuccess).toBeTrue();
-        expect(formValues).toEqual({intrastat: 'Tropical Flowers'});
-    });
-});

e2e/paths/04-item/03_tax.spec.js

@@ -1,48 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Item edit tax path', () => {
-    let browser;
-    let page;
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('buyer', 'item');
-        await page.accessToSearchResult('Ranged weapon longbow 200cm');
-        await page.accessToSection('item.card.tax');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it(`should add the item tax to all countries`, async() => {
-        await page.autocompleteSearch(selectors.itemTax.firstClass, 'General VAT');
-        await page.autocompleteSearch(selectors.itemTax.secondClass, 'General VAT');
-        await page.waitToClick(selectors.itemTax.submitTaxButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it(`should confirm the first item tax class was edited`, async() => {
-        await page.reloadSection('item.card.tax');
-        const firstVatType = await page.waitToGetProperty(selectors.itemTax.firstClass, 'value');
-
-        expect(firstVatType).toEqual('General VAT');
-    });
-
-    it(`should confirm the second item tax class was edited`, async() => {
-        const secondVatType = await page
-            .waitToGetProperty(selectors.itemTax.secondClass, 'value');
-
-        expect(secondVatType).toEqual('General VAT');
-    });
-
-    it(`should edit the first class without saving the form`, async() => {
-        await page.autocompleteSearch(selectors.itemTax.firstClass, 'Reduced VAT');
-        const firstVatType = await page.waitToGetProperty(selectors.itemTax.firstClass, 'value');
-
-        expect(firstVatType).toEqual('Reduced VAT');
-    });
-});

e2e/paths/04-item/04_tags.spec.js

@@ -1,79 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Item create tags path', () => {
-    let browser;
-    let page;
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('buyer', 'item');
-        await page.accessToSearchResult('Ranged weapon longbow 200cm');
-        await page.accessToSection('item.card.tags');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should create a new tag and delete a former one', async() => {
-        await page.waitToClick(selectors.itemTags.fourthRemoveTagButton);
-        await page.waitToClick(selectors.itemTags.addItemTagButton);
-        await page.autocompleteSearch(selectors.itemTags.seventhTag, 'Ancho de la base');
-        await page.write(selectors.itemTags.seventhValue, '50');
-        await page.clearInput(selectors.itemTags.seventhRelevancy);
-        await page.write(selectors.itemTags.seventhRelevancy, '4');
-        await page.waitToClick(selectors.itemTags.submitItemTagsButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should confirm the fourth row data is the expected one', async() => {
-        await page.reloadSection('item.card.tags');
-        await page.waitForSelector('vn-item-tags');
-        let result = await page.waitToGetProperty(selectors.itemTags.fourthTag, 'value');
-
-        expect(result).toEqual('Ancho de la base');
-
-        result = await page
-            .waitToGetProperty(selectors.itemTags.fourthValue, 'value');
-
-        expect(result).toEqual('50');
-
-        result = await page
-            .waitToGetProperty(selectors.itemTags.fourthRelevancy, 'value');
-
-        expect(result).toEqual('4');
-    });
-
-    it('should confirm the fifth row data is the expected one', async() => {
-        let tag = await page
-            .waitToGetProperty(selectors.itemTags.fifthTag, 'value');
-
-        let value = await page
-            .waitToGetProperty(selectors.itemTags.fifthValue, 'value');
-
-        let relevancy = await page
-            .waitToGetProperty(selectors.itemTags.fifthRelevancy, 'value');
-
-        expect(tag).toEqual('Color');
-        expect(value).toEqual('Brown');
-        expect(relevancy).toEqual('5');
-    });
-
-    it('should confirm the sixth row data is the expected one', async() => {
-        let tag = await page
-            .waitToGetProperty(selectors.itemTags.sixthTag, 'value');
-
-        let value = await page
-            .waitToGetProperty(selectors.itemTags.sixthValue, 'value');
-
-        let relevancy = await page
-            .waitToGetProperty(selectors.itemTags.sixthRelevancy, 'value');
-
-        expect(tag).toEqual('Categoria');
-        expect(value).toEqual('+1 precission');
-        expect(relevancy).toEqual('6');
-    });
-});

e2e/paths/04-item/05_botanical.spec.js

@@ -1,66 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Item Create botanical path', () => {
-    let browser;
-    let page;
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('buyer', 'item');
-        await page.accessToSearchResult('Ranged weapon pistol 9mm');
-        await page.accessToSection('item.card.botanical');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it(`should create a new botanical for the item`, async() => {
-        await page.autocompleteSearch(selectors.itemBotanical.genus, 'Abelia');
-        await page.autocompleteSearch(selectors.itemBotanical.species, 'dealbata');
-        await page.waitToClick(selectors.itemBotanical.submitBotanicalButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it(`should confirm the Genus for the item was created`, async() => {
-        await page.waitForTextInField(selectors.itemBotanical.genus, 'Abelia');
-        const result = await page
-            .waitToGetProperty(selectors.itemBotanical.genus, 'value');
-
-        expect(result).toEqual('Abelia');
-    });
-
-    it(`should confirm the Species for the item was created`, async() => {
-        const result = await page
-            .waitToGetProperty(selectors.itemBotanical.species, 'value');
-
-        expect(result).toEqual('dealbata');
-    });
-
-    it(`should edit botanical for the item`, async() => {
-        await page.autocompleteSearch(selectors.itemBotanical.genus, 'Abies');
-        await page.autocompleteSearch(selectors.itemBotanical.species, 'decurrens');
-        await page.waitToClick(selectors.itemBotanical.submitBotanicalButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it(`should confirm the Genus for the item was edited`, async() => {
-        await page.waitForTextInField(selectors.itemBotanical.genus, 'Abies');
-        const result = await page
-            .waitToGetProperty(selectors.itemBotanical.genus, 'value');
-
-        expect(result).toEqual('Abies');
-    });
-
-    it(`should confirm the Species for the item was edited`, async() => {
-        const result = await page
-            .waitToGetProperty(selectors.itemBotanical.species, 'value');
-
-        expect(result).toEqual('decurrens');
-    });
-});

e2e/paths/04-item/06_barcode.spec.js

@@ -1,37 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Item Create barcodes path', () => {
-    let browser;
-    let page;
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('buyer', 'item');
-        await page.accessToSearchResult('Ranged weapon longbow 200cm');
-        await page.accessToSection('item.card.itemBarcode');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it(`should click create a new code and delete a former one`, async() => {
-        await page.waitToClick(selectors.itemBarcodes.firstCodeRemoveButton);
-        await page.waitToClick(selectors.itemBarcodes.addBarcodeButton);
-        await page.write(selectors.itemBarcodes.thirdCode, '5');
-        await page.waitToClick(selectors.itemBarcodes.submitBarcodesButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it(`should confirm the barcode 5 is created and it is now the third barcode as the first was deleted`, async() => {
-        await page.reloadSection('item.card.itemBarcode');
-        await page.waitForTextInField(selectors.itemBarcodes.thirdCode, '5');
-        const result = await page
-            .waitToGetProperty(selectors.itemBarcodes.thirdCode, 'value');
-
-        expect(result).toEqual('5');
-    });
-});

e2e/paths/04-item/07_create.spec.js

@@ -1,65 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-const $ = {
-    form: 'vn-item-create form'
-};
-
-describe('Item Create', () => {
-    let browser;
-    let page;
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('buyer', 'item');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should access to the create item view by clicking the create floating button', async() => {
-        await page.waitToClick(selectors.itemsIndex.createItemButton);
-        await page.waitForState('item.create');
-    });
-
-    it('should return to the item index by clickig the cancel button', async() => {
-        await page.waitToClick(selectors.itemCreateView.cancelButton);
-        await page.waitForState('item.index');
-    });
-
-    it('should now access to the create item view by clicking the create floating button', async() => {
-        await page.waitToClick(selectors.itemsIndex.createItemButton);
-        await page.waitForState('item.create');
-    });
-
-    it('should throw an error when insert an invalid priority', async() => {
-        const values = {
-            name: 'Infinity Gauntlet',
-            type: 'Crisantemo',
-            intrastat: 'Coral y materiales similares',
-            origin: 'Holand',
-            priority: null
-        };
-        const message = await page.sendForm($.form, values);
-
-        expect(message.text).toContain('Valid priorities');
-    });
-
-    it('should create the Infinity Gauntlet item', async() => {
-        const values = {
-            name: 'Infinity Gauntlet',
-            type: 'Crisantemo',
-            intrastat: 'Coral y materiales similares',
-            origin: 'Holand',
-            priority: '2'
-        };
-
-        await page.fillForm($.form, values);
-        const formValues = await page.fetchForm($.form, Object.keys(values));
-        const message = await page.sendForm($.form);
-
-        expect(message.isSuccess).toBeTrue();
-        expect(formValues).toEqual(values);
-    });
-});

e2e/paths/04-item/08_regularize.spec.js

@@ -1,141 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Item regularize path', () => {
-    let browser;
-    let page;
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('employee', 'item');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should edit the user local warehouse', async() => {
-        await page.waitForSpinnerLoad();
-        await page.waitToClick(selectors.globalItems.userMenuButton);
-        await page.autocompleteSearch(selectors.globalItems.userLocalWarehouse, 'Warehouse Four');
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should check the local settings were saved', async() => {
-        const userLocalWarehouse = await page
-            .waitToGetProperty(selectors.globalItems.userLocalWarehouse, 'value');
-
-        await page.closePopup();
-
-        expect(userLocalWarehouse).toContain('Warehouse Four');
-    });
-
-    it('should search for a specific item', async() => {
-        await page.accessToSearchResult('Ranged weapon pistol 9mm');
-        await page.waitForState('item.card.summary');
-    });
-
-    it('should open the regularize dialog and check the warehouse matches the local user settings', async() => {
-        await page.waitToClick(selectors.itemDescriptor.moreMenu);
-        await page.waitToClick(selectors.itemDescriptor.moreMenuRegularizeButton);
-        const result = await page.waitToGetProperty(selectors.itemDescriptor.regularizeWarehouse, 'value');
-
-        expect(result).toEqual('Warehouse Four');
-    });
-
-    it('should regularize the item', async() => {
-        await page.write(selectors.itemDescriptor.regularizeQuantity, '100');
-        await page.autocompleteSearch(selectors.itemDescriptor.regularizeWarehouse, 'Warehouse One');
-        await page.waitToClick(selectors.itemDescriptor.regularizeSaveButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should click on the Tickets button of the top bar menu', async() => {
-        await page.waitToClick(selectors.globalItems.applicationsMenuButton);
-        await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);
-        await Promise.all([
-            page.waitForNavigation({waitUntil: ['load', 'networkidle0', 'domcontentloaded']}),
-            page.waitToClick(selectors.globalItems.ticketsButton)
-        ]);
-        await page.waitForState('ticket.index');
-    });
-
-    it('should clear the user local settings now', async() => {
-        await page.waitToClick(selectors.globalItems.userMenuButton);
-        await page.waitForContentLoaded();
-        await page.clearInput(selectors.globalItems.userConfigFirstAutocomplete);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should search for the ticket with alias missing', async() => {
-        await page.keyboard.press('Escape');
-        await page.accessToSearchResult('missing');
-        await page.waitForState('ticket.card.summary');
-    });
-
-    it(`should check the ticket sale quantity is showing a negative value`, async() => {
-        await page.waitForTextInElement(selectors.ticketSummary.firstSaleQuantity, '-100');
-        const result = await page
-            .waitToGetProperty(selectors.ticketSummary.firstSaleQuantity, 'innerText');
-
-        expect(result).toContain('-100');
-    });
-
-    it(`should check the ticket sale discount is 100%`, async() => {
-        const result = await page
-            .waitToGetProperty(selectors.ticketSummary.firstSaleDiscount, 'innerText');
-
-        expect(result).toContain('100 %');
-    });
-
-    it('should now click on the Items button of the top bar menu', async() => {
-        await page.waitToClick(selectors.globalItems.applicationsMenuButton);
-        await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);
-        await page.waitToClick(selectors.globalItems.itemsButton);
-        await page.waitForState('item.index');
-    });
-
-    it('should search for the item once again', async() => {
-        await page.accessToSearchResult('Ranged weapon pistol 9mm');
-        await page.waitForState('item.card.summary');
-    });
-
-    it('should regularize the item once more', async() => {
-        await page.waitToClick(selectors.itemDescriptor.moreMenu);
-        await page.waitToClick(selectors.itemDescriptor.moreMenuRegularizeButton);
-        await page.write(selectors.itemDescriptor.regularizeQuantity, '100');
-        await page.autocompleteSearch(selectors.itemDescriptor.regularizeWarehouse, 'Warehouse One');
-        await page.waitToClick(selectors.itemDescriptor.regularizeSaveButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should again click on the Tickets button of the top bar menu', async() => {
-        await page.waitToClick(selectors.globalItems.applicationsMenuButton);
-        await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);
-        await Promise.all([
-            page.waitForNavigation({waitUntil: ['load', 'networkidle0', 'domcontentloaded']}),
-            page.waitToClick(selectors.globalItems.ticketsButton)
-        ]);
-        await page.waitForState('ticket.index');
-    });
-
-    it('should search for the ticket missing once again', async() => {
-        await page.accessToSearchResult('Missing');
-        await page.waitForState('ticket.card.summary');
-    });
-
-    it(`should check the ticket contains now two sales`, async() => {
-        await page.waitForTextInElement(selectors.ticketSummary.firstSaleQuantity, '-100');
-        const result = await page.countElement(selectors.ticketSummary.sale);
-
-        expect(result).toEqual(2);
-    });
-});

e2e/paths/04-item/09_index.spec.js

@@ -1,84 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Item index path', () => {
-    let browser;
-    let page;
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('salesPerson', 'item');
-        await page.waitToClick(selectors.globalItems.searchButton);
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should click on the fields to show button to open the list of columns to show', async() => {
-        await page.waitToClick(selectors.itemsIndex.shownColumns);
-        const visible = await page.isVisible(selectors.itemsIndex.shownColumnsList);
-
-        expect(visible).toBeTruthy();
-    });
-
-    it('should unmark all checkboxes except the first and the last ones', async() => {
-        await page.waitToClick(selectors.itemsIndex.idCheckbox);
-        await page.waitToClick(selectors.itemsIndex.stemsCheckbox);
-        await page.waitToClick(selectors.itemsIndex.sizeCheckbox);
-        await page.waitToClick(selectors.itemsIndex.typeCheckbox);
-        await page.waitToClick(selectors.itemsIndex.categoryCheckbox);
-        await page.waitToClick(selectors.itemsIndex.intrastadCheckbox);
-        await page.waitToClick(selectors.itemsIndex.originCheckbox);
-        await page.waitToClick(selectors.itemsIndex.buyerCheckbox);
-        await page.waitToClick(selectors.itemsIndex.weightByPieceCheckbox);
-        await page.waitToClick(selectors.itemsIndex.saveFieldsButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should navigate forth and back to see the images column is still visible', async() => {
-        await page.closePopup();
-        await page.waitToClick(selectors.itemsIndex.firstSearchResult);
-        await page.waitToClick(selectors.itemDescriptor.goBackToModuleIndexButton);
-        await page.waitToClick(selectors.globalItems.searchButton);
-        await page.waitForSelector(selectors.itemsIndex.searchResult);
-        await page.waitImgLoad(selectors.itemsIndex.firstItemImage);
-        const imageVisible = await page.isVisible(selectors.itemsIndex.firstItemImageTd);
-
-        expect(imageVisible).toBeTruthy();
-    });
-
-    it('should check the ids column is not visible', async() => {
-        await page.waitForSelector(selectors.itemsIndex.firstItemId, {hidden: true});
-    });
-
-    it('should mark all unchecked boxes to leave the index as it was', async() => {
-        await page.waitToClick(selectors.itemsIndex.shownColumns);
-        await page.waitToClick(selectors.itemsIndex.idCheckbox);
-        await page.waitToClick(selectors.itemsIndex.stemsCheckbox);
-        await page.waitToClick(selectors.itemsIndex.sizeCheckbox);
-        await page.waitToClick(selectors.itemsIndex.typeCheckbox);
-        await page.waitToClick(selectors.itemsIndex.categoryCheckbox);
-        await page.waitToClick(selectors.itemsIndex.intrastadCheckbox);
-        await page.waitToClick(selectors.itemsIndex.originCheckbox);
-        await page.waitToClick(selectors.itemsIndex.buyerCheckbox);
-        await page.waitToClick(selectors.itemsIndex.weightByPieceCheckbox);
-        await page.waitToClick(selectors.itemsIndex.saveFieldsButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should now navigate forth and back to see the ids column is now visible', async() => {
-        await page.closePopup();
-        await page.waitToClick(selectors.itemsIndex.firstSearchResult);
-        await page.waitToClick(selectors.itemDescriptor.goBackToModuleIndexButton);
-        await page.waitToClick(selectors.globalItems.searchButton);
-        await page.waitForSelector(selectors.itemsIndex.searchResult);
-        const idVisible = await page.isVisible(selectors.itemsIndex.firstItemId);
-
-        expect(idVisible).toBeTruthy();
-    });
-});

e2e/paths/04-item/10_item_log.spec.js

@@ -1,45 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Item log path', () => {
-    let browser;
-    let page;
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('developer', 'item');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it(`should search for the Knowledge artifact to confirm it isn't created yet`, async() => {
-        await page.doSearch('Knowledge artifact');
-        const nResults = await page.countElement(selectors.itemsIndex.searchResult);
-
-        expect(nResults).toEqual(1);
-    });
-
-    it('should access to the create item view by clicking the create floating button', async() => {
-        await page.waitToClick(selectors.itemsIndex.createItemButton);
-        await page.waitForState('item.create');
-    });
-
-    it('should create the Knowledge artifact item', async() => {
-        await page.write(selectors.itemCreateView.temporalName, 'Knowledge artifact');
-        await page.autocompleteSearch(selectors.itemCreateView.type, 'Crisantemo');
-        await page.autocompleteSearch(selectors.itemCreateView.intrastat, 'Coral y materiales similares');
-        await page.autocompleteSearch(selectors.itemCreateView.origin, 'Holand');
-        await page.waitToClick(selectors.itemCreateView.createButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should return to the items index by clicking the return to items button', async() => {
-        await page.waitToClick(selectors.itemBasicData.goToItemIndexButton);
-        await page.waitForSelector(selectors.itemsIndex.createItemButton);
-        await page.waitForState('item.index');
-    });
-});

e2e/paths/04-item/11_descriptor.spec.js

@@ -1,41 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Item descriptor path', () => {
-    let browser;
-    let page;
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('buyer', 'item');
-        await page.accessToSearchResult('1');
-        await page.accessToSection('item.card.basicData');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should set the item to inactive', async() => {
-        await page.waitToClick(selectors.itemBasicData.isActiveCheckbox);
-        await page.waitToClick(selectors.itemBasicData.submitBasicDataButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should reload the section and check the inactive icon is visible', async() => {
-        await page.reloadSection('item.card.basicData');
-        const visibleIcon = await page.isVisible(selectors.itemDescriptor.inactiveIcon);
-
-        expect(visibleIcon).toBeTruthy();
-    });
-
-    it('should set the item back to active', async() => {
-        await page.waitToClick(selectors.itemBasicData.isActiveCheckbox);
-        await page.waitToClick(selectors.itemBasicData.submitBasicDataButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-});

e2e/paths/04-item/12_request.spec.js

@@ -1,45 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Item request path', () => {
-    let browser;
-    let page;
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('buyer', 'item');
-        await page.accessToSection('item.request');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should reach the item request section', async() => {
-        await page.waitForState('item.request');
-    });
-
-    it('should fill the id and quantity then check the concept was updated', async() => {
-        await page.writeOnEditableTD(selectors.itemRequest.firstRequestItemID, '4');
-        await page.writeOnEditableTD(selectors.itemRequest.firstRequestQuantity, '10');
-        await page.waitForTextInElement(selectors.itemRequest.firstRequestConcept, 'Melee weapon heavy shield 100cm');
-        let filledConcept = await page.waitToGetProperty(selectors.itemRequest.firstRequestConcept, 'innerText');
-
-        expect(filledConcept).toContain('Melee weapon heavy shield 100cm');
-    });
-
-    it('should check the status of the request should now be accepted', async() => {
-        let status = await page.waitToGetProperty(selectors.itemRequest.firstRequestStatus, 'innerText');
-
-        expect(status).toContain('Accepted');
-    });
-
-    it('should now click on the second declain request icon then type the reason', async() => {
-        await page.waitToClick(selectors.itemRequest.secondRequestDecline);
-        await page.write(selectors.itemRequest.declineReason, 'Not quite as expected');
-        await page.respondToDialog('accept');
-        let status = await page.waitToGetProperty(selectors.itemRequest.secondRequestStatus, 'innerText');
-
-        expect(status).toContain('Denied');
-    });
-});

e2e/paths/04-item/13_fixedPrice.spec.js

@@ -1,97 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-const $ = selectors.itemFixedPrice;
-
-describe('Item fixed prices path', () => {
-    let browser;
-    let page;
-    let httpRequest;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('buyer', 'item');
-        await page.accessToSection('item.fixedPrice');
-        page.on('request', req => {
-            if (req.url().includes(`FixedPrices/filter`))
-                httpRequest = req.url();
-        });
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should filter using all the fields', async() => {
-        await page.write($.generalSearchFilter, 'item');
-        await page.keyboard.press('Enter');
-
-        expect(httpRequest).toContain('search=item');
-
-        await page.click($.chip);
-        await page.click($.reignFilter);
-
-        expect(httpRequest).toContain('categoryFk');
-
-        await page.autocompleteSearch($.typeFilter, 'Alstroemeria');
-
-        expect(httpRequest).toContain('typeFk');
-
-        await page.click($.chip);
-        await page.autocompleteSearch($.buyerFilter, 'buyerNick');
-
-        expect(httpRequest).toContain('buyerFk');
-
-        await page.click($.chip);
-        await page.autocompleteSearch($.warehouseFilter, 'Algemesi');
-
-        expect(httpRequest).toContain('warehouseFk');
-
-        await page.click($.chip);
-        await page.click($.mineFilter);
-
-        expect(httpRequest).toContain('mine=true');
-
-        await page.click($.chip);
-        await page.click($.hasMinPriceFilter);
-
-        expect(httpRequest).toContain('hasMinPrice=true');
-
-        await page.click($.chip);
-        await page.click($.addTag);
-        await page.autocompleteSearch($.tagFilter, 'Color');
-        await page.autocompleteSearch($.tagValueFilter, 'Brown');
-
-        expect(httpRequest).toContain('tags');
-
-        await page.click($.chip);
-    });
-
-    it('should click on the add new fixed price button', async() => {
-        await page.waitToClick($.add);
-        await page.waitForSelector($.fourthFixedPrice);
-    });
-
-    it('should fill the fixed price data', async() => {
-        const now = Date.vnNew();
-        await page.autocompleteSearch($.fourthWarehouse, 'Warehouse one');
-        await page.writeOnEditableTD($.fourthGroupingPrice, '1');
-        await page.writeOnEditableTD($.fourthPackingPrice, '1');
-        await page.write($.fourthMinPrice, '1');
-        await page.pickDate($.fourthStarted, now);
-        await page.pickDate($.fourthEnded, now);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should reload the section and check the created price has the expected ID', async() => {
-        await page.goto(`http://localhost:5000/#!/item/fixed-price`);
-        await page.autocompleteSearch($.warehouseFilter, 'Warehouse one');
-        await page.click($.chip);
-        const result = await page.waitToGetProperty($.fourthItemID, 'value');
-
-        expect(result).toContain('13');
-    });
-});

e2e/paths/05-ticket/01-sale/01_list_sales.spec.js

@@ -1,99 +0,0 @@
-import selectors from '../../../helpers/selectors.js';
-import getBrowser from '../../../helpers/puppeteer';
-
-describe('Ticket List sale path', () => {
-    let browser;
-    let page;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('employee', 'ticket');
-        await page.accessToSearchResult('13');
-        await page.accessToSection('ticket.card.sale');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should confirm the first ticket sale contains the colour tag', async() => {
-        const value = await page
-            .waitToGetProperty(selectors.ticketSales.firstSaleColour, 'innerText');
-
-        expect(value).toContain('Black');
-    });
-
-    it('should confirm the first sale contains the price', async() => {
-        const value = await page
-            .waitToGetProperty(selectors.ticketSales.firstSalePrice, 'innerText');
-
-        expect(value).toContain('1.72');
-    });
-
-    it('should confirm the first sale contains the discount', async() => {
-        const value = await page
-            .waitToGetProperty(selectors.ticketSales.firstSaleDiscount, 'innerText');
-
-        expect(value).toContain('0.00%');
-    });
-
-    it('should confirm the first sale contains the total import', async() => {
-        const value = await page
-            .waitToGetProperty(selectors.ticketSales.firstSaleImport, 'innerText');
-
-        expect(value).toContain('34.40');
-    });
-
-    it('should add an empty item to the sale list', async() => {
-        await page.waitToClick(selectors.ticketSales.newItemButton);
-        const sales = await page
-            .countElement(selectors.ticketSales.saleLine);
-
-        expect(sales).toEqual(2);
-    });
-
-    it('should select a valid item to be added as the second item in the sales list', async() => {
-        let searchValue = 'Melee weapon heavy shield 100cm';
-        await page.autocompleteSearch(selectors.ticketSales.secondSaleIdAutocomplete, searchValue);
-        await page.waitToClick(selectors.ticketSales.secondSaleQuantityCell);
-        await page.type(selectors.ticketSales.secondSaleQuantity, '8');
-        await page.keyboard.press('Enter');
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should update the description of the new sale', async() => {
-        await page.click(selectors.ticketSales.secondSaleConceptCell);
-        await page.write(selectors.ticketSales.secondSaleConceptInput, 'Aegis of Valor');
-        await page.keyboard.press('Enter');
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should add a third empty item to the sale list', async() => {
-        await page.waitToClick(selectors.ticketSales.newItemButton);
-        await page.waitForNumberOfElements(selectors.ticketSales.saleLine, 3);
-        const sales = await page.countElement(selectors.ticketSales.saleLine);
-
-        expect(sales).toEqual(3);
-    });
-
-    it('should select the 2nd and 3th item and delete both', async() => {
-        await page.waitToClick(selectors.ticketSales.secondSaleCheckbox);
-        await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
-        await page.waitToClick(selectors.ticketSales.deleteSaleButton);
-        await page.waitToClick(selectors.globalItems.acceptButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it(`should verify there's only 1 single line remaining`, async() => {
-        const sales = await page.countElement(selectors.ticketSales.saleLine);
-
-        expect(sales).toEqual(1);
-    });
-});

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

@@ -1,415 +0,0 @@
-import selectors from '../../../helpers/selectors.js';
-import getBrowser from '../../../helpers/puppeteer';
-
-describe('Ticket Edit sale path', () => {
-    let browser;
-    let page;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('salesPerson', 'ticket');
-        await page.accessToSearchResult('16');
-        await page.accessToSection('ticket.card.sale');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it(`should click on the first sale claim icon to navigate over there`, async() => {
-        await page.waitToClick(selectors.ticketSales.firstSaleClaimIcon);
-        await page.waitForNavigation();
-        await page.goBack();
-        await page.goBack();
-    });
-
-    it('should navigate to the tickets index', async() => {
-        await page.waitToClick(selectors.globalItems.applicationsMenuButton);
-        await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);
-        await page.waitToClick(selectors.globalItems.ticketsButton);
-        await page.waitForState('ticket.index');
-    });
-
-    it(`should search for a ticket and then navigate to it's sales`, async() => {
-        await page.accessToSearchResult('16');
-        await page.accessToSection('ticket.card.sale');
-    });
-
-    it(`should set the ticket as libre`, async() => {
-        const searchValue = 'libre';
-        await page.waitToClick(selectors.ticketSales.stateMenuButton);
-        await page.write(selectors.ticketSales.moreMenuState, searchValue);
-        try {
-            await page.waitForFunction(searchValue => {
-                const element = document.querySelector('li.active');
-                if (element)
-                    return element.innerText.toLowerCase().includes(searchValue.toLowerCase());
-            }, {}, searchValue);
-        } catch (error) {
-            const builtSelector = await page.selectorFormater(selectors.ticketSales.moreMenuState);
-            const inputValue = await page.evaluate(() => {
-                return document.querySelector('.vn-drop-down.shown vn-textfield input').value;
-            });
-            throw new Error(`${builtSelector} value is ${inputValue}! ${error}`);
-        }
-        await page.waitForState('ticket.card.sale');
-        await page.keyboard.press('Enter');
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it(`should check it's state is libre now`, async() => {
-        await page.waitForTextInElement(selectors.ticketDescriptor.stateLabelValue, 'Libre');
-        const result = await page.waitToGetProperty(selectors.ticketDescriptor.stateLabelValue, 'innerText');
-
-        expect(result).toEqual('State Libre');
-    });
-
-    it(`should set the ticket as OK`, async() => {
-        await page.waitToClick(selectors.ticketSales.setOk);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it(`should check it's state is OK now`, async() => {
-        await page.waitForTextInElement(selectors.ticketDescriptor.stateLabelValue, 'OK');
-        const result = await page.waitToGetProperty(selectors.ticketDescriptor.stateLabelValue, 'innerText');
-
-        expect(result).toEqual('State OK');
-    });
-
-    it(`should check the zoomed image isn't present`, async() => {
-        const result = await page.countElement(selectors.ticketSales.firstSaleZoomedImage);
-
-        expect(result).toEqual(0);
-    });
-
-    it(`should click on the thumbnail image of the 1st sale and see the zoomed image`, async() => {
-        await page.waitToClick(selectors.ticketSales.firstSaleThumbnailImage);
-        const result = await page.countElement(selectors.ticketSales.firstSaleZoomedImage);
-
-        expect(result).toEqual(1);
-    });
-
-    it(`should click on the zoomed image to close it`, async() => {
-        await page.waitToClick(selectors.ticketSales.firstSaleZoomedImage);
-        const result = await page.countElement(selectors.ticketSales.firstSaleZoomedImage);
-
-        expect(result).toEqual(0);
-    });
-
-    it(`should click on the first sale ID making now the item descriptor visible`, async() => {
-        await page.waitToClick(selectors.ticketSales.firstSaleId);
-        await page.waitImgLoad(selectors.ticketSales.firstSaleDescriptorImage);
-        const visible = await page.isVisible(selectors.ticketSales.saleDescriptorPopover);
-
-        expect(visible).toBeTruthy();
-    });
-
-    it(`should click on the descriptor image of the 1st sale and see the zoomed image`, async() => {
-        await page.waitToClick('vn-item-descriptor img');
-        const result = await page.countElement(selectors.ticketSales.firstSaleZoomedImage);
-
-        expect(result).toEqual(1);
-    });
-
-    it(`should now click on the zoomed image to close it`, async() => {
-        await page.waitToClick(selectors.ticketSales.firstSaleZoomedImage);
-        const result = await page.countElement(selectors.ticketSales.firstSaleZoomedImage);
-
-        expect(result).toEqual(0);
-    });
-
-    it(`should click on the summary icon of the item-descriptor to access to the item summary`, async() => {
-        await page.waitToClick(selectors.ticketSales.saleDescriptorPopoverSummaryButton);
-        await page.waitForState('item.card.summary');
-    });
-
-    it('should return to ticket sales section', async() => {
-        await page.waitToClick(selectors.globalItems.applicationsMenuButton);
-        await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);
-        await page.waitToClick(selectors.globalItems.ticketsButton);
-        await page.accessToSearchResult('16');
-        await page.accessToSection('ticket.card.sale');
-    });
-
-    it('should remove 1 from the first sale quantity', async() => {
-        await page.waitToClick(selectors.ticketSales.firstSaleQuantityCell);
-        await page.waitForSelector(selectors.ticketSales.firstSaleQuantity);
-        await page.type(selectors.ticketSales.firstSaleQuantity, '9\u000d');
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should update the price', async() => {
-        await page.waitToClick(selectors.ticketSales.firstSalePrice);
-        await page.waitForSelector(selectors.ticketSales.firstSalePriceInput);
-        await page.type(selectors.ticketSales.firstSalePriceInput, '5\u000d');
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should confirm the price have been updated', async() => {
-        const result = await page.waitToGetProperty(selectors.ticketSales.firstSalePrice, 'innerText');
-
-        expect(result).toContain('5.00');
-    });
-
-    it('should confirm the total price for that item have been updated', async() => {
-        const result = await page.waitToGetProperty(selectors.ticketSales.firstSaleImport, 'innerText');
-
-        expect(result).toContain('45.00');
-    });
-
-    it('should update the discount', async() => {
-        await page.waitToClick(selectors.ticketSales.firstSaleDiscount);
-        await page.waitForSelector(selectors.ticketSales.firstSaleDiscountInput);
-        await page.type(selectors.ticketSales.firstSaleDiscountInput, '50');
-        await page.waitToClick(selectors.ticketSales.saveSaleDiscountButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should confirm the discount have been updated', async() => {
-        await page.waitForTextInElement(selectors.ticketSales.firstSaleDiscount, '50.00%');
-        const result = await page.waitToGetProperty(selectors.ticketSales.firstSaleDiscount, 'innerText');
-
-        expect(result).toContain('50.00%');
-    });
-
-    it('should confirm the total import for that item have been updated', async() => {
-        await page.waitForTextInElement(selectors.ticketSales.firstSaleImport, '22.50');
-        const result = await page.waitToGetProperty(selectors.ticketSales.firstSaleImport, 'innerText');
-
-        expect(result).toContain('22.50');
-    });
-
-    it('should recalculate price of sales', async() => {
-        await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
-        await page.waitToClick(selectors.ticketSales.secondSaleCheckbox);
-
-        await page.waitToClick(selectors.ticketSales.moreMenu);
-        await page.waitToClick(selectors.ticketSales.moreMenuRecalculatePrice);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should log in as salesAssistant and navigate to ticket sales', async() => {
-        await page.loginAndModule('salesAssistant', 'ticket');
-        await page.accessToSearchResult('15');
-        await page.accessToSection('ticket.card.sale');
-    });
-
-    it('should select the first sale and create a refund with warehouse', async() => {
-        await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
-        await page.waitToClick(selectors.ticketSales.moreMenu);
-        await page.waitToClick(selectors.ticketSales.moreMenuRefund);
-        await page.waitToClick(selectors.ticketSales.refundWithWarehouse);
-        await page.waitForSnackbar();
-        await page.waitForState('ticket.card.sale');
-    });
-
-    it('should select the first sale and create a refund without warehouse', async() => {
-        await page.accessToSearchResult('18');
-        await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
-        await page.waitToClick(selectors.ticketSales.moreMenu);
-        await page.waitToClick(selectors.ticketSales.moreMenuRefund);
-        await page.waitToClick(selectors.ticketSales.refundWithoutWarehouse);
-        await page.waitForSnackbar();
-        await page.waitForState('ticket.card.sale');
-    });
-
-    it('should show error trying to delete a ticket with a refund', async() => {
-        await page.loginAndModule('salesPerson', 'ticket');
-        await page.accessToSearchResult('8');
-        await page.waitToClick(selectors.ticketDescriptor.moreMenu);
-        await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteTicket);
-        await page.waitToClick(selectors.globalItems.acceptButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Tickets with associated refunds can\'t be deleted');
-        await page.waitToClick(selectors.globalItems.cancelButton);
-    });
-
-    it('should select the third sale and create a claim of it', async() => {
-        await page.accessToSearchResult('16');
-        await page.accessToSection('ticket.card.sale');
-        await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
-        await page.waitToClick(selectors.ticketSales.moreMenu);
-        await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim);
-        await page.waitToClick(selectors.globalItems.acceptButton);
-        await page.waitForNavigation();
-    });
-
-    it('should search for a ticket then access to the sales section', async() => {
-        await page.goBack();
-        await page.goBack();
-        await page.loginAndModule('salesPerson', 'ticket');
-        await page.accessToSearchResult('16');
-        await page.accessToSection('ticket.card.sale');
-    });
-
-    it('should select the third sale and delete it', async() => {
-        await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
-        await page.waitToClick(selectors.ticketSales.deleteSaleButton);
-        await page.waitToClick(selectors.globalItems.acceptButton);
-        await page.waitForSpinnerLoad();
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it(`should confirm the third sale was deleted`, async() => {
-        const result = await page.countElement(selectors.ticketSales.saleLine);
-
-        expect(result).toEqual(3);
-    });
-
-    it('should select the second sale and transfer it to a valid ticket', async() => {
-        const targetTicketId = '12';
-
-        await page.waitToClick(selectors.ticketSales.secondSaleCheckbox);
-        await page.waitToClick(selectors.ticketSales.transferSaleButton);
-        await page.waitToClick(selectors.ticketSales.transferQuantityCell);
-        await page.type(selectors.ticketSales.transferQuantityInput, '10\u000d');
-        await page.type(selectors.ticketSales.moveToTicketInput, targetTicketId);
-        await page.waitToClick(selectors.ticketSales.moveToTicketButton);
-        await page.expectURL(`ticket/${targetTicketId}/sale`);
-    });
-
-    it('should confirm the transfered line is the correct one', async() => {
-        await page.waitForSelector(selectors.ticketSales.secondSaleText);
-        const result = await page.waitToGetProperty(selectors.ticketSales.secondSaleText, 'innerText');
-
-        expect(result).toContain(`Melee weapon heavy shield`);
-    });
-
-    it('should confirm the transfered quantity is the correct one', async() => {
-        const result = await page.waitToGetProperty(selectors.ticketSales.firstSaleQuantityCell, 'innerText');
-
-        expect(result).toContain('20');
-    });
-
-    it('should go back to the original ticket sales section', async() => {
-        await page.waitToClick(selectors.ticketDescriptor.goBackToModuleIndexButton);
-        await page.accessToSearchResult('16');
-        await page.accessToSection('ticket.card.sale');
-    });
-
-    it(`should confirm the original ticket has still three lines`, async() => {
-        await page.waitForSelector(selectors.ticketSales.saleLine);
-        const result = await page.countElement(selectors.ticketSales.saleLine);
-
-        expect(result).toEqual(3);
-    });
-
-    it(`should confirm the second sale quantity is now half of it's original value after the transfer`, async() => {
-        const result = await page.waitToGetProperty(selectors.ticketSales.secondSaleQuantityCell, 'innerText');
-
-        expect(result).toContain('10');
-    });
-
-    it('should go back to the receiver ticket sales section', async() => {
-        await page.waitToClick(selectors.ticketDescriptor.goBackToModuleIndexButton);
-        await page.accessToSearchResult('12');
-        await page.accessToSection('ticket.card.sale');
-    });
-
-    it('should transfer the sale back to the original ticket', async() => {
-        const targetTicketId = '16';
-
-        await page.waitToClick(selectors.ticketSales.secondSaleCheckbox);
-        await page.waitToClick(selectors.ticketSales.transferSaleButton);
-        await page.type(selectors.ticketSales.moveToTicketInput, targetTicketId);
-        await page.waitToClick(selectors.ticketSales.moveToTicketButton);
-        await page.expectURL(`ticket/${targetTicketId}/sale`);
-    });
-
-    it('should confirm the original ticket received the line', async() => {
-        const expectedLines = 4;
-        await page.waitForNumberOfElements(selectors.ticketSales.saleLine, expectedLines);
-        const result = await page.countElement(selectors.ticketSales.saleLine);
-
-        expect(result).toEqual(expectedLines);
-    });
-
-    it(`should throw an error when attempting to create a ticket for an inactive client`, async() => {
-        await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
-        await page.waitToClick(selectors.ticketSales.transferSaleButton);
-        await page.waitToClick(selectors.ticketSales.moveToNewTicketButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain(`You can't create a ticket for an inactive client`);
-
-        await page.closePopup();
-    });
-
-    it('should go now to the ticket sales section of an active, not frozen client', async() => {
-        await page.waitToClick(selectors.ticketDescriptor.goBackToModuleIndexButton);
-        await page.accessToSearchResult('13');
-        await page.accessToSection('ticket.card.sale');
-    });
-
-    it(`should select all sales, tranfer them to a new ticket and delete the sender ticket as it would've been left empty`, async() => {
-        const senderTicketId = '13';
-
-        await page.waitToClick(selectors.ticketSales.selectAllSalesCheckbox);
-        await page.waitToClick(selectors.ticketSales.transferSaleButton);
-        await page.waitToClick(selectors.ticketSales.moveToNewTicketButton);
-        await page.evaluate((selector, ticketId) => {
-            return document.querySelector(selector).innerText.toLowerCase().indexOf(`#${ticketId}`) == -1;
-        }, selectors.ticketDescriptor.id, senderTicketId);
-        await page.waitForState('ticket.card.sale');
-    });
-
-    it('should confirm the new ticket received the line', async() => {
-        const expectedLines = 1;
-        const result = await page.countElement(selectors.ticketSales.saleLine);
-
-        expect(result).toEqual(expectedLines);
-    });
-
-    it('should check the first sale reserved icon isnt visible', async() => {
-        const result = await page.isVisible(selectors.ticketSales.firstSaleReservedIcon);
-
-        expect(result).toBeFalsy();
-    });
-
-    it('should mark the first sale as reserved', async() => {
-        await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
-
-        await page.waitToClick(selectors.ticketSales.moreMenu);
-        await page.waitToClick(selectors.ticketSales.moreMenuReserve);
-        await page.closePopup();
-        await page.waitForClassNotPresent(selectors.ticketSales.firstSaleReservedIcon, 'ng-hide');
-        const result = await page.isVisible(selectors.ticketSales.firstSaleReservedIcon);
-
-        expect(result).toBeTruthy();
-    });
-
-    it('should unmark the first sale as reserved', async() => {
-        await page.waitToClick(selectors.ticketSales.moreMenu);
-        await page.waitToClick(selectors.ticketSales.moreMenuUnmarkReseved);
-        await page.waitForClassPresent(selectors.ticketSales.firstSaleReservedIcon, 'ng-hide');
-        const result = await page.isVisible(selectors.ticketSales.firstSaleReservedIcon);
-
-        expect(result).toBeFalsy();
-    });
-
-    it('should log in as Production role and go to a target ticket summary', async() => {
-        await page.loginAndModule('production', 'ticket');
-        await page.accessToSearchResult('13');
-        await page.waitForState('ticket.card.summary');
-    });
-
-    it(`should check the ticket is deleted`, async() => {
-        await page.waitForSelector(selectors.ticketDescriptor.isDeletedIcon);
-    });
-});

e2e/paths/05-ticket/01_observations.spec.js

@@ -1,50 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Ticket Create notes path', () => {
-    let browser;
-    let page;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('employee', 'ticket');
-        await page.accessToSearchResult('5');
-        await page.accessToSection('ticket.card.observation');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should create a new note', async() => {
-        await page.waitToClick(selectors.ticketNotes.addNoteButton);
-        await page.autocompleteSearch(selectors.ticketNotes.firstNoteType, 'ItemPicker');
-        await page.write(selectors.ticketNotes.firstDescription, 'description');
-        await page.waitToClick(selectors.ticketNotes.submitNotesButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should confirm the note is the expected one', async() => {
-        await page.reloadSection('ticket.card.observation');
-        const result = await page
-            .waitToGetProperty(selectors.ticketNotes.firstNoteType, 'value');
-
-        expect(result).toEqual('ItemPicker');
-
-        const firstDescription = await page
-            .waitToGetProperty(selectors.ticketNotes.firstDescription, 'value');
-
-        expect(firstDescription).toEqual('description');
-    });
-
-    it('should delete the note', async() => {
-        await page.waitToClick(selectors.ticketNotes.firstNoteRemoveButton);
-        await page.waitToClick(selectors.ticketNotes.submitNotesButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-});

e2e/paths/05-ticket/02_expeditions_and_log.spec.js

@@ -1,32 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Ticket expeditions and log path', () => {
-    let browser;
-    let page;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('production', 'ticket');
-        await page.accessToSearchResult('1');
-        await page.accessToSection('ticket.card.expedition');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it(`should delete a former expedition and confirm the remaining expedition are the expected ones`, async() => {
-        await page.waitToClick(selectors.ticketExpedition.thirdSaleCheckbox);
-        await page.waitToClick(selectors.ticketExpedition.deleteExpeditionButton);
-        await page.waitToClick(selectors.globalItems.acceptButton);
-        await page.reloadSection('ticket.card.expedition');
-
-        await page.waitForSelector(selectors.ticketExpedition.expeditionRow, {});
-        const result = await page
-            .countElement(selectors.ticketExpedition.expeditionRow);
-
-        expect(result).toEqual(6);
-    });
-});

e2e/paths/05-ticket/04_packages.spec.js

@@ -1,78 +0,0 @@
-import getBrowser from '../../helpers/puppeteer';
-
-const $ = {
-    firstPackage: 'vn-autocomplete[label="Package"]',
-    firstQuantity: 'vn-ticket-package vn-horizontal:nth-child(1) vn-input-number[ng-model="package.quantity"]',
-    firstRemovePackageButton: 'vn-icon-button[vn-tooltip="Remove package"]',
-    addPackageButton: 'vn-icon-button[vn-tooltip="Add package"]',
-    savePackagesButton: `button[type=submit]`
-};
-
-describe('Ticket Create packages path', () => {
-    let browser;
-    let page;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('employee', 'ticket');
-        await page.accessToSearchResult('1');
-        await page.accessToSection('ticket.card.package');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it(`should attempt create a new package but receive an error if package is blank`, async() => {
-        await page.waitToClick($.firstRemovePackageButton);
-        await page.waitToClick($.addPackageButton);
-        await page.write($.firstQuantity, '99');
-        await page.waitToClick($.savePackagesButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Package cannot be blank');
-    });
-
-    it(`should delete the first package and receive and error to save a new one with blank quantity`, async() => {
-        await page.clearInput($.firstQuantity);
-        await page.autocompleteSearch($.firstPackage, 'Container medical box 100cm');
-        await page.waitToClick($.savePackagesButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Some fields are invalid');
-    });
-
-    it(`should confirm the quantity input isn't invalid yet`, async() => {
-        const result = await page
-            .evaluate(selector => {
-                return document.querySelector(`${selector} input`).checkValidity();
-            }, $.firstQuantity);
-
-        expect(result).toBeTruthy();
-    });
-
-    it(`should create a new package with correct data`, async() => {
-        await page.clearInput($.firstQuantity);
-        await page.write($.firstQuantity, '-99');
-        await page.waitToClick($.savePackagesButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it(`should confirm the first select is the expected one`, async() => {
-        await page.reloadSection('ticket.card.package');
-        await page.waitForTextInField($.firstPackage, 'Container medical box 100cm');
-        const result = await page.waitToGetProperty($.firstPackage, 'value');
-
-        expect(result).toEqual('Container medical box 100cm');
-    });
-
-    it(`should confirm quantity is just a number and the string part was ignored by the imput number`, async() => {
-        await page.waitForTextInField($.firstQuantity, '-99');
-        const result = await page.waitToGetProperty($.firstQuantity, 'value');
-
-        expect(result).toEqual('-99');
-    });
-});

e2e/paths/05-ticket/05_tracking_state.spec.js

@@ -1,72 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Ticket Create new tracking state path', () => {
-    let browser;
-    let page;
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    describe('as production', () => {
-        it('should log into the ticket 1 tracking', async() => {
-            browser = await getBrowser();
-            page = browser.page;
-            await page.loginAndModule('production', 'ticket');
-            await page.accessToSearchResult('1');
-            await page.accessToSection('ticket.card.tracking.index');
-        });
-
-        it('should access to the create state view by clicking the create floating button', async() => {
-            await page.waitToClick(selectors.ticketTracking.createStateButton);
-            await page.waitForSelector(selectors.createStateView.state, {visible: true});
-            await page.waitForState('ticket.card.tracking.edit');
-        });
-
-        it(`should create a new state`, async() => {
-            await page.autocompleteSearch(selectors.createStateView.state, 'OK');
-            await page.waitToClick(selectors.createStateView.saveStateButton);
-            const message = await page.waitForSnackbar();
-
-            expect(message.text).toContain('Data saved!');
-        });
-    });
-
-    describe('as salesPerson', () => {
-        it('should now log into the ticket 1 tracking', async() => {
-            await page.loginAndModule('salesPerson', 'ticket');
-            await page.accessToSearchResult('1');
-            await page.accessToSection('ticket.card.tracking.index');
-        });
-
-        it('should now access to the create state view by clicking the create floating button', async() => {
-            await page.waitForSelector('.vn-popup', {hidden: true});
-            await page.waitToClick(selectors.ticketTracking.createStateButton);
-            await page.waitForState('ticket.card.tracking.edit');
-        });
-
-        it(`should attemp to create an state for which salesPerson doesn't have permissions`, async() => {
-            await page.autocompleteSearch(selectors.createStateView.state, 'Encajado');
-            await page.waitToClick(selectors.createStateView.saveStateButton);
-            const message = await page.waitForSnackbar();
-
-            expect(message.text).toContain(`You don't have enough privileges`);
-        });
-
-        it(`should make sure the worker gets autocomplete uppon selecting the assigned state`, async() => {
-            await page.autocompleteSearch(selectors.createStateView.state, 'asignado');
-            const result = await page
-                .waitToGetProperty(selectors.createStateView.worker, 'value');
-
-            expect(result).toEqual('salesperson');
-        });
-
-        it(`should succesfully create a valid state`, async() => {
-            await page.waitToClick(selectors.createStateView.saveStateButton);
-            const message = await page.waitForSnackbar();
-
-            expect(message.text).toContain('Data saved!');
-        });
-    });
-});

e2e/paths/05-ticket/06_basic_data_steps.spec.js

@@ -1,143 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Ticket Edit basic data path', () => {
-    let browser;
-    let page;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('employee', 'ticket');
-        await page.accessToSearchResult('11');
-        await page.accessToSection('ticket.card.basicData.stepOne');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it(`should confirm the zone autocomplete is disabled unless your role is productionBoss`, async() => {
-        await page.waitForSelector(selectors.ticketBasicData.zone, {});
-        const disabled = await page.evaluate(selector => {
-            return document.querySelector(selector).disabled;
-        }, `${selectors.ticketBasicData.zone} input`);
-
-        expect(disabled).toBeTruthy();
-    });
-
-    it(`should now log as productionBoss to perform the rest of the tests`, async() => {
-        await page.loginAndModule('productionBoss', 'ticket');
-        await page.accessToSearchResult('11');
-        await page.accessToSection('ticket.card.basicData.stepOne');
-    });
-
-    it(`should confirm the zone autocomplete is enabled for the role productionBoss`, async() => {
-        await page.waitForSpinnerLoad();
-        await page.waitForSelector(selectors.ticketBasicData.zone);
-        const disabled = await page.evaluate(selector => {
-            return document.querySelector(selector).disabled;
-        }, `${selectors.ticketBasicData.zone} input`);
-
-        expect(disabled).toBeFalsy();
-    });
-
-    it(`should check the zone is for Gotham247`, async() => {
-        let zone = await page
-            .waitToGetProperty(selectors.ticketBasicData.zone, 'value');
-
-        expect(zone).toContain('Zone 247 A');
-    });
-
-    it(`should edit the ticket agency then check there are no zones for it`, async() => {
-        await page.autocompleteSearch(selectors.ticketBasicData.agency, 'Super-Man delivery');
-        let emptyZone = await page
-            .expectPropertyValue(selectors.ticketBasicData.zone, 'value', '');
-
-        expect(emptyZone).toBeTruthy();
-    });
-
-    it(`should edit the ticket zone then check the agency is for the new zone`, async() => {
-        await page.clearInput(selectors.ticketBasicData.agency);
-        await page.autocompleteSearch(selectors.ticketBasicData.zone, 'Zone expensive A');
-        let zone = await page
-            .waitToGetProperty(selectors.ticketBasicData.agency, 'value');
-
-        expect(zone).toContain('Gotham247Expensive');
-    });
-
-    it(`should click next`, async() => {
-        await page.waitToClick(selectors.ticketBasicData.nextStepButton);
-        await page.waitForState('ticket.card.basicData.stepTwo');
-    });
-
-    it(`should have a price diference`, async() => {
-        const result = await page
-            .waitToGetProperty(selectors.ticketBasicData.stepTwoTotalPriceDif, 'innerText');
-
-        expect(result).toContain('-€228.25');
-    });
-
-    it(`should select a new reason for the changes made then click on finalize`, async() => {
-        await page.waitToClick(selectors.ticketBasicData.chargesReason);
-        await page.waitToClick(selectors.ticketBasicData.finalizeButton);
-        await page.waitForState('ticket.card.summary');
-    });
-
-    it(`should not find ticket`, async() => {
-        await page.doSearch('29');
-        const count = await page.countElement(selectors.ticketsIndex.searchResult);
-
-        expect(count).toEqual(0);
-    });
-
-    it(`should split ticket without negatives`, async() => {
-        const newAgency = 'Gotham247';
-        const newDate = Date.vnNew();
-        newDate.setDate(newDate.getDate() - 1);
-
-        await page.accessToSearchResult('14');
-        await page.accessToSection('ticket.card.basicData.stepOne');
-
-        await page.autocompleteSearch(selectors.ticketBasicData.agency, newAgency);
-        await page.pickDate(selectors.ticketBasicData.shipped, newDate);
-
-        await page.waitToClick(selectors.ticketBasicData.nextStepButton);
-
-        await page.waitToClick(selectors.ticketBasicData.finalizeButton);
-
-        await page.waitForState('ticket.card.summary');
-
-        const newTicketAgency = await page
-            .waitToGetProperty(selectors.ticketDescriptor.descriptorDeliveryAgency, 'innerText');
-        const newTicketDate = await page
-            .waitToGetProperty(selectors.ticketDescriptor.descriptorDeliveryDate, 'innerText');
-
-        expect(newAgency).toEqual(newTicketAgency);
-        expect(newTicketDate).toContain(newDate.getDate());
-    });
-
-    it(`should new ticket have sale of old ticket`, async() => {
-        await page.accessToSection('ticket.card.sale');
-        await page.waitForState('ticket.card.sale');
-
-        const item = await page.waitToGetProperty(selectors.ticketSales.firstSaleId, 'innerText');
-
-        expect(item).toEqual('4');
-    });
-
-    it(`should old ticket have old date and agency`, async() => {
-        const oldDate = Date.vnNew();
-        const oldAgency = 'Super-Man delivery';
-
-        await page.accessToSearchResult('14');
-
-        const oldTicketAgency = await page
-            .waitToGetProperty(selectors.ticketDescriptor.descriptorDeliveryAgency, 'innerText');
-        const oldTicketDate = await page
-            .waitToGetProperty(selectors.ticketDescriptor.descriptorDeliveryDate, 'innerText');
-
-        expect(oldTicketAgency).toEqual(oldAgency);
-        expect(oldTicketDate).toContain(oldDate.getDate());
-    });
-});

e2e/paths/05-ticket/08_components.spec.js

@@ -1,30 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Ticket List components path', () => {
-    let browser;
-    let page;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('employee', 'ticket');
-        await page.accessToSearchResult('1');
-        await page.accessToSection('ticket.card.components');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should confirm the total base is correct', async() => {
-        const name = 'Base €';
-        const minLength = name.length;
-
-        await page.waitPropertyLength(selectors.ticketComponents.base, 'innerText', minLength);
-        const base = await page.waitToGetProperty(selectors.ticketComponents.base, 'innerText');
-
-        expect(base).toContain('Base');
-        expect(base.length).toBeGreaterThan(minLength);
-    });
-});

e2e/paths/05-ticket/09_weekly.spec.js

@@ -1,123 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Ticket descriptor path', () => {
-    let browser;
-    let page;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('buyerBoss', 'ticket');
-        await page.accessToSection('ticket.weekly.index');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should count the amount of tickets in the turns section', async() => {
-        const result = await page.countElement(selectors.ticketsIndex.weeklyTicket);
-
-        expect(result).toEqual(6);
-    });
-
-    it('should go back to the ticket index then search and access a ticket summary', async() => {
-        await page.accessToSection('ticket.index');
-        await page.accessToSearchResult('33');
-    });
-
-    it('should add the ticket to thursday turn using the descriptor more menu', async() => {
-        await page.waitToClick(selectors.ticketDescriptor.moreMenu);
-        await page.waitToClick(selectors.ticketDescriptor.moreMenuAddToTurn);
-        await page.waitToClick(selectors.ticketDescriptor.thursdayButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Current ticket deleted and added to shift');
-    });
-
-    it('should again click on the Tickets button of the top bar menu', async() => {
-        await page.waitToClick(selectors.globalItems.applicationsMenuButton);
-        await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);
-        await page.waitToClick(selectors.globalItems.ticketsButton);
-        await page.waitForState('ticket.index');
-    });
-
-    it('should confirm the ticket 33 was added to thursday', async() => {
-        await page.accessToSection('ticket.weekly.index');
-        const result = await page.waitToGetProperty(selectors.ticketsIndex.thirdWeeklyTicket, 'value');
-
-        expect(result).toEqual('Thursday');
-    });
-
-    it('should click on the Tickets button of the top bar menu once more', async() => {
-        await page.waitToClick(selectors.globalItems.applicationsMenuButton);
-        await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);
-        await page.waitToClick(selectors.globalItems.ticketsButton);
-        await page.waitForState('ticket.index');
-    });
-
-    it('should now search for the ticket 33', async() => {
-        await page.accessToSearchResult('33');
-        await page.waitForState('ticket.card.summary');
-    });
-
-    it('should add the ticket to saturday turn using the descriptor more menu', async() => {
-        await page.waitToClick(selectors.ticketDescriptor.moreMenu);
-        await page.waitToClick(selectors.ticketDescriptor.moreMenuAddToTurn);
-        await page.waitToClick(selectors.ticketDescriptor.saturdayButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Current ticket deleted and added to shift');
-    });
-
-    it('should click on the Tickets button of the top bar menu once again', async() => {
-        await page.waitToClick(selectors.globalItems.applicationsMenuButton);
-        await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);
-        await page.waitToClick(selectors.globalItems.ticketsButton);
-        await page.waitForState('ticket.index');
-    });
-
-    it('should confirm the ticket 33 was added on saturday', async() => {
-        await page.accessToSection('ticket.weekly.index');
-        await page.waitForTimeout(5000);
-
-        const result = await page.waitToGetProperty(selectors.ticketsIndex.thirdWeeklyTicket, 'value');
-
-        expect(result).toEqual('Saturday');
-    });
-
-    it('should now search for the weekly ticket 33', async() => {
-        await page.doSearch('33');
-        const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);
-
-        expect(nResults).toEqual(2);
-    });
-
-    it('should delete the weekly ticket 33', async() => {
-        await page.waitToClick(selectors.ticketsIndex.firstWeeklyTicketDeleteIcon);
-        await page.waitToClick(selectors.ticketsIndex.acceptDeleteTurn);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should confirm the sixth weekly ticket was deleted', async() => {
-        await page.doSearch();
-        const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);
-
-        expect(nResults).toEqual(6);
-    });
-
-    it('should update the agency then remove it afterwards', async() => {
-        await page.autocompleteSearch(selectors.ticketsIndex.firstWeeklyTicketAgency, 'Gotham247');
-        let message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-
-        await page.clearInput(selectors.ticketsIndex.firstWeeklyTicketAgency);
-        message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-});

e2e/paths/05-ticket/10_request.spec.js

@@ -1,77 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Ticket purchase request path', () => {
-    let browser;
-    let page;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('salesPerson', 'ticket');
-        await page.accessToSearchResult('1');
-        await page.accessToSection('ticket.card.request.index');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should add a new request', async() => {
-        await page.waitToClick(selectors.ticketRequests.addRequestButton);
-        await page.write(selectors.ticketRequests.descriptionInput, 'New stuff');
-        await page.write(selectors.ticketRequests.quantity, '9');
-        await page.autocompleteSearch(selectors.ticketRequests.atender, 'buyerNick');
-        await page.write(selectors.ticketRequests.price, '999');
-        await page.waitToClick(selectors.ticketRequests.saveButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should have been redirected to the request index', async() => {
-        await page.waitForState('ticket.card.request.index');
-    });
-
-    it(`should edit the third request quantity as it's state is still new`, async() => {
-        await page.write(selectors.ticketRequests.thirdRequestQuantity, '9');
-        await page.keyboard.press('Enter');
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should check the new request was added', async() => {
-        await page.reloadSection('ticket.card.request.index');
-        const result = await page.waitToGetProperty(selectors.ticketRequests.thirdRequestQuantity, 'value');
-
-        expect(result).toEqual('99');
-    });
-
-    it(`should check the first request can't be edited as its state is different to new`, async() => {
-        await page.waitForClassPresent(selectors.ticketRequests.firstRequestQuantity, 'disabled');
-        const result = await page.isDisabled(selectors.ticketRequests.firstRequestQuantity);
-
-        expect(result).toBe(true);
-    });
-
-    it(`should check the second request can't be edited as its state is different to new`, async() => {
-        await page.waitForClassPresent(selectors.ticketRequests.secondRequestQuantity, 'disabled');
-        const result = await page.isDisabled(selectors.ticketRequests.secondRequestQuantity);
-
-        expect(result).toBe(true);
-    });
-
-    it('should delete the added request', async() => {
-        await page.waitToClick(selectors.ticketRequests.thirdRemoveRequestButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should check the request was deleted', async() => {
-        await page.reloadSection('ticket.card.request.index');
-        await page.waitForSelector(selectors.ticketRequests.addRequestButton);
-        await page.waitForSelector(selectors.ticketRequests.thirdDescription, {hidden: true});
-    });
-});