Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label

back/methods/collection/setSaleQuantity.js

@@ -26,11 +26,30 @@ module.exports = Self => {
 
     Self.setSaleQuantity = async(saleId, quantity) => {
         const models = Self.app.models;
+        const myOptions = {};
+        let tx;
 
-        const sale = await models.Sale.findById(saleId);
-        return await sale.updateAttributes({
-            originalQuantity: sale.quantity,
-            quantity: quantity
-        });
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            const sale = await models.Sale.findById(saleId, null, myOptions);
+            const saleUpdated = await sale.updateAttributes({
+                originalQuantity: sale.quantity,
+                quantity: quantity
+            }, myOptions);
+
+            if (tx) await tx.commit();
+
+            return saleUpdated;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
     };
 };

back/methods/collection/spec/setSaleQuantity.spec.js

@@ -2,15 +2,26 @@ const models = require('vn-loopback/server/server').models;
 
 describe('setSaleQuantity()', () => {
     it('should change quantity sale', async() => {
-        const saleId = 30;
-        const newQuantity = 10;
+        const tx = await models.Ticket.beginTransaction({});
 
-        const originalSale = await models.Sale.findById(saleId);
+        try {
+            const options = {transaction: tx};
 
-        await models.Collection.setSaleQuantity(saleId, newQuantity);
-        const updateSale = await models.Sale.findById(saleId);
+            const saleId = 30;
+            const newQuantity = 10;
 
-        expect(updateSale.originalQuantity).toEqual(originalSale.quantity);
-        expect(updateSale.quantity).toEqual(newQuantity);
+            const originalSale = await models.Sale.findById(saleId, null, options);
+
+            await models.Collection.setSaleQuantity(saleId, newQuantity, options);
+            const updateSale = await models.Sale.findById(saleId, null, options);
+
+            expect(updateSale.originalQuantity).toEqual(originalSale.quantity);
+            expect(updateSale.quantity).toEqual(newQuantity);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
     });
 });

db/changes/10510-december/00-mdbApp.sql

@@ -0,0 +1,11 @@
+CREATE TABLE `vn`.`mdbApp` (
+  `app` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `baselineBranchFk` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `userFk` int(10) unsigned DEFAULT NULL,
+  `locked` datetime DEFAULT NULL,
+  PRIMARY KEY (`app`),
+  KEY `mdbApp_FK` (`userFk`),
+  KEY `mdbApp_FK_1` (`baselineBranchFk`),
+  CONSTRAINT `mdbApp_FK` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT `mdbApp_FK_1` FOREIGN KEY (`baselineBranchFk`) REFERENCES `mdbBranch` (`name`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci

db/changes/225001/00-aclMdbApp.sql

@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('MdbApp', 'lock', 'WRITE', 'ALLOW', 'ROLE', 'developer'),
+        ('MdbApp', 'unlock', 'WRITE', 'ALLOW', 'ROLE', 'developer');

db/changes/225201/00-aclTicketLog.sql

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

db/changes/225201/00-ticketSms.sql

@@ -0,0 +1,8 @@
+CREATE TABLE `vn`.`ticketSms` (
+  `smsFk` mediumint(8) unsigned NOT NULL,
+  `ticketFk` int(11) DEFAULT NULL,
+  PRIMARY KEY (`smsFk`),
+  KEY `ticketSms_FK_1` (`ticketFk`),
+  CONSTRAINT `ticketSms_FK` FOREIGN KEY (`smsFk`) REFERENCES `sms` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `ticketSms_FK_1` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci

db/changes/225201/00-ticket_canAdvance.sql

@@ -0,0 +1,104 @@
+DROP PROCEDURE IF EXISTS `vn`.`ticket_canAdvance`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_canAdvance`(vDateFuture DATE, vDateToAdvance DATE, vWarehouseFk INT)
+BEGIN
+/**
+ * Devuelve los tickets y la cantidad de lineas de venta que se pueden adelantar.
+ *
+ * @param vDateFuture Fecha de los tickets que se quieren adelantar.
+ * @param vDateToAdvance Fecha a cuando se quiere adelantar.
+ * @param vWarehouseFk Almacén
+ */
+
+	DECLARE vDateInventory DATE;
+
+	SELECT inventoried INTO vDateInventory FROM vn.config;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.stock;
+	CREATE TEMPORARY TABLE tmp.stock
+		(itemFk INT PRIMARY KEY,
+		amount INT)
+		ENGINE = MEMORY;
+
+	INSERT INTO tmp.stock(itemFk, amount)
+		SELECT itemFk, SUM(quantity) amount FROM
+		(
+			SELECT itemFk, quantity
+				FROM vn.itemTicketOut
+				WHERE shipped >= vDateInventory
+					AND shipped < vDateFuture
+					AND warehouseFk = vWarehouseFk
+			UNION ALL
+			SELECT itemFk, quantity
+				FROM vn.itemEntryIn
+				WHERE landed >= vDateInventory
+					AND landed < vDateFuture
+					AND isVirtualStock = FALSE
+					AND warehouseInFk = vWarehouseFk
+			UNION ALL
+			SELECT itemFk, quantity
+				FROM vn.itemEntryOut
+				WHERE shipped >= vDateInventory
+					AND shipped < vDateFuture
+					AND warehouseOutFk = vWarehouseFk
+		) t
+		GROUP BY itemFk HAVING amount != 0;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.filter;
+	CREATE TEMPORARY TABLE tmp.filter
+        (INDEX (id))
+	SELECT s.ticketFk futureId,
+			t2.ticketFk id,
+			sum((s.quantity <= IFNULL(st.amount,0))) hasStock,
+			count(DISTINCT s.id) saleCount,
+			t2.state,
+			t2.stateCode,
+			st.name futureState,
+			st.code futureStateCode,
+			GROUP_CONCAT(DISTINCT ipt.code  ORDER BY ipt.code) futureIpt,
+			t2.ipt,
+			t.workerFk,
+			CAST(sum(litros) AS DECIMAL(10,0)) liters,
+			CAST(count(*) AS DECIMAL(10,0)) `lines`,
+			t2.shipped,
+			t.shipped futureShipped,
+			t2.totalWithVat,
+			t.totalWithVat futureTotalWithVat
+		FROM vn.ticket t
+			JOIN vn.ticketState ts ON ts.ticketFk = t.id
+			JOIN vn.state st ON st.id = ts.stateFk
+			JOIN vn.saleVolume sv ON t.id = sv.ticketFk
+			JOIN (SELECT
+							t2.id ticketFk,
+							t2.addressFk,
+							st.name state,
+                            st.code stateCode,
+							GROUP_CONCAT(DISTINCT ipt.code  ORDER BY ipt.code) ipt,
+							t2.shipped,
+							t2.totalWithVat
+						FROM vn.ticket t2
+							JOIN vn.sale s ON s.ticketFk = t2.id
+							JOIN vn.item i ON i.id = s.itemFk
+							JOIN vn.ticketState ts ON ts.ticketFk = t2.id
+							JOIN vn.state st ON st.id = ts.stateFk
+							LEFT JOIN vn.itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+						WHERE t2.shipped BETWEEN vDateToAdvance AND util.dayend(vDateToAdvance)
+							AND t2.warehouseFk = vWarehouseFk
+						GROUP BY t2.id) t2 ON t2.addressFk = t.addressFk
+			JOIN vn.sale s ON s.ticketFk = t.id
+			JOIN vn.item i ON i.id = s.itemFk
+			LEFT JOIN vn.itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+			LEFT JOIN tmp.stock st ON st.itemFk = s.itemFk
+		WHERE t.shipped BETWEEN vDateFuture AND util.dayend(vDateFuture)
+			AND t.warehouseFk = vWarehouseFk
+		GROUP BY t.id;
+
+	DROP TEMPORARY TABLE tmp.stock;
+END$$
+DELIMITER ;
+
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+VALUES
+    ('Ticket', 'getTicketsAdvance', 'READ', 'ALLOW', 'ROLE', 'employee');

db/changes/225201/00-ticket_split_merge.sql

@@ -0,0 +1,2 @@
+DROP PROCEDURE IF EXISTS `ticket_split`;
+DROP PROCEDURE IF EXISTS `ticket_merge`;

db/dump/fixtures.sql

@@ -690,7 +690,8 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
         (27 ,NULL,  8,  1, NULL,    util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1101, 'Wolverine',                                     1,   NULL,       0, 1,      5, 1, util.VN_CURDATE()),
         (28, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE()),
         (29, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE()),
-        (30, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE());
+        (30, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE()),
+        (31, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,       0, 1,      5, 1, util.VN_CURDATE());
 
 INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
     VALUES
@@ -991,7 +992,8 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
         (33, 5, 14, 'Ranged weapon pistol 9mm',         50, 1.79,   0, 0, 0, util.VN_CURDATE()),
         (34, 4, 28, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (35, 4, 29, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (36, 4, 30, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE());
+        (36, 4, 30, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (37, 4, 31, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE());
 
 INSERT INTO `vn`.`saleChecked`(`saleFk`, `isChecked`)
     VALUES
@@ -2731,10 +2733,22 @@ UPDATE `account`.`user`
     SET `hasGrant` = 1
         WHERE `id` = 66;
 
+INSERT INTO `vn`.`ticketLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`)
+    VALUES
+        (7, 18, 'update', 'Sale', '{"quantity":1}', '{"quantity":10}', 1, NULL),
+        (7, 18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 1, NULL),
+        (7, 18, 'update', 'Sale', '{"price":3}', '{"price":5}', 1, NULL),
+        (7, 18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 1x0.5m de '5' a '10'");
+
+
 INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`)
     VALUES
         (0, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', 'open', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all');
 
+INSERT INTO `vn`.`mdbApp` (`app`, `baselineBranchFk`, `userFk`, `locked`)
+    VALUES
+        ('foo', 'master', NULL, NULL),
+        ('bar', 'test', 9, util.VN_NOW());
 INSERT INTO `vn`.`ticketLog` (`id`, `originFk`, `userFk`, `action`, `changedModel`, `oldInstance`, `newInstance`, `changedModelId`)
     VALUES
         (1, 1, 9, 'insert', 'Ticket', '{}', '{"clientFk":1, "nickname": "Bat cave"}', 1);

e2e/helpers/selectors.js

@@ -759,6 +759,31 @@ export default {
         submit: 'vn-submit[label="Search"]',
         table: 'tbody > tr:not(.empty-rows)'
     },
+    ticketAdvance: {
+        openAdvancedSearchButton: 'vn-searchbar .append vn-icon[icon="arrow_drop_down"]',
+        dateFuture: 'vn-date-picker[label="Origin date"]',
+        dateToAdvance: 'vn-date-picker[label="Destination date"]',
+        linesMax: 'vn-textfield[label="Max Lines"]',
+        litersMax: 'vn-textfield[label="Max Liters"]',
+        futureIpt: 'vn-autocomplete[label="Origin IPT"]',
+        ipt: 'vn-autocomplete[label="Destination IPT"]',
+        tableIpt: 'vn-autocomplete[name="ipt"]',
+        tableFutureIpt: 'vn-autocomplete[name="futureIpt"]',
+        futureState: 'vn-autocomplete[label="Origin Grouped State"]',
+        state: 'vn-autocomplete[label="Destination Grouped State"]',
+        warehouseFk: 'vn-autocomplete[label="Warehouse"]',
+        tableButtonSearch: 'vn-button[vn-tooltip="Search"]',
+        moveButton: 'vn-button[vn-tooltip="Advance tickets"]',
+        acceptButton: '.vn-confirm.shown button[response="accept"]',
+        multiCheck: 'vn-multi-check',
+        tableId: 'vn-textfield[name="id"]',
+        tableFutureId: 'vn-textfield[name="futureId"]',
+        tableLiters: 'vn-textfield[name="liters"]',
+        tableLines: 'vn-textfield[name="lines"]',
+        tableStock: 'vn-textfield[name="hasStock"]',
+        submit: 'vn-submit[label="Search"]',
+        table: 'tbody > tr:not(.empty-rows)'
+    },
     createStateView: {
         state: 'vn-autocomplete[ng-model="$ctrl.stateFk"]',
         worker: 'vn-autocomplete[ng-model="$ctrl.workerFk"]',

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

@@ -127,8 +127,8 @@ describe('Item regularize path', () => {
         await page.waitForState('ticket.index');
     });
 
-    it('should search for the ticket with id 31 once again', async() => {
-        await page.accessToSearchResult('31');
+    it('should search for the ticket missing once again', async() => {
+        await page.accessToSearchResult('Missing');
         await page.waitForState('ticket.card.summary');
     });
 

e2e/paths/05-ticket/22_advance.spec.js

@@ -0,0 +1,162 @@
+import selectors from '../../helpers/selectors.js';
+import getBrowser from '../../helpers/puppeteer';
+
+describe('Ticket Advance path', () => {
+    let browser;
+    let page;
+
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+        await page.loginAndModule('employee', 'ticket');
+        await page.accessToSection('ticket.advance');
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    it('should show errors snackbar because of the required data', async() => {
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.clearInput(selectors.ticketAdvance.warehouseFk);
+
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        let message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('warehouseFk is a required argument');
+
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.clearInput(selectors.ticketAdvance.dateToAdvance);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('dateToAdvance is a required argument');
+
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.clearInput(selectors.ticketAdvance.dateFuture);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('dateFuture is a required argument');
+    });
+
+    it('should search with the required data', async() => {
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+    });
+
+    it('should search with the origin IPT', async() => {
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.autocompleteSearch(selectors.ticketAdvance.ipt, 'Horizontal');
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 0);
+
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.clearInput(selectors.ticketAdvance.ipt);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+    });
+
+    it('should search with the destination IPT', async() => {
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.autocompleteSearch(selectors.ticketAdvance.futureIpt, 'Horizontal');
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 0);
+
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.clearInput(selectors.ticketAdvance.futureIpt);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+    });
+
+    it('should search with the origin grouped state', async() => {
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.autocompleteSearch(selectors.ticketAdvance.futureState, 'Free');
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.clearInput(selectors.ticketAdvance.futureState);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+    });
+
+    it('should search with the destination grouped state', async() => {
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.autocompleteSearch(selectors.ticketAdvance.state, 'Free');
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 0);
+
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.clearInput(selectors.ticketAdvance.state);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+    });
+
+    it('should search in smart-table with an IPT Origin', async() => {
+        await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
+        await page.autocompleteSearch(selectors.ticketAdvance.tableFutureIpt, 'Vertical');
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+
+        await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+    });
+
+    it('should search in smart-table with an IPT Destination', async() => {
+        await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
+        await page.autocompleteSearch(selectors.ticketAdvance.tableIpt, 'Vertical');
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+
+        await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+    });
+
+    it('should search in smart-table with stock', async() => {
+        await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
+        await page.write(selectors.ticketAdvance.tableStock, '5');
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 2);
+
+        await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+    });
+
+    it('should search in smart-table with especified Lines', async() => {
+        await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
+        await page.write(selectors.ticketAdvance.tableLines, '0');
+        await page.keyboard.press('Enter');
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+
+        await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+    });
+
+    it('should search in smart-table with especified Liters', async() => {
+        await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
+        await page.write(selectors.ticketAdvance.tableLiters, '0');
+        await page.keyboard.press('Enter');
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+
+        await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
+        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
+        await page.waitToClick(selectors.ticketAdvance.submit);
+        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
+    });
+
+    it('should check the three last tickets and move to the future', async() => {
+        await page.waitToClick(selectors.ticketAdvance.multiCheck);
+        await page.waitToClick(selectors.ticketAdvance.moveButton);
+        await page.waitToClick(selectors.ticketAdvance.acceptButton);
+        const message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('Tickets moved successfully!');
+    });
+});

loopback/locale/en.json

@@ -66,9 +66,10 @@
 	"MESSAGE_INSURANCE_CHANGE": "I have changed the insurence credit of client [{{clientName}} ({{clientId}})]({{{url}}}) to *{{credit}} €*",
 	"Changed client paymethod": "I have changed the pay method for client [{{clientName}} ({{clientId}})]({{{url}}})",
 	"Sent units from ticket": "I sent *{{quantity}}* units of [{{concept}} ({{itemId}})]({{{itemUrl}}}) to *\"{{nickname}}\"* coming from ticket id [{{ticketId}}]({{{ticketUrl}}})",
-	"Claim will be picked": "The product from the claim [{{claimId}}]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
-	"Claim state has changed to incomplete": "The state of the claim [{{claimId}}]({{{claimUrl}}}) from client *{{clientName}}* has changed to *incomplete*",
-	"Claim state has changed to canceled": "The state of the claim [{{claimId}}]({{{claimUrl}}}) from client *{{clientName}}* has changed to *canceled*",
+	"Change quantity": "{{concept}} change of {{oldQuantity}} to {{newQuantity}}",
+    "Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
+	"Claim state has changed to incomplete": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *incomplete*",
+	"Claim state has changed to canceled": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *canceled*",
 	"Customs agent is required for a non UEE member": "Customs agent is required for a non UEE member",
 	"Incoterms is required for a non UEE member": "Incoterms is required for a non UEE member",
 	"Client checked as validated despite of duplication": "Client checked as validated despite of duplication from client id {{clientId}}",
@@ -142,6 +143,8 @@
     "Email verify": "Email verify",
 	"Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) merged with [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
     "Sale(s) blocked, please contact production": "Sale(s) blocked, please contact production",
+	"App locked": "App locked by user {{userId}}",
+    "The sales of the receiver ticket can't be modified": "The sales of the receiver ticket can't be modified",
     "Receipt's bank was not found": "Receipt's bank was not found",
     "This receipt was not compensated": "This receipt was not compensated",
     "Client's email was not found": "Client's email was not found"

loopback/locale/es.json

@@ -134,9 +134,10 @@
 	"MESSAGE_INSURANCE_CHANGE": "He cambiado el crédito asegurado del cliente [{{clientName}} ({{clientId}})]({{{url}}}) a *{{credit}} €*",
 	"Changed client paymethod": "He cambiado la forma de pago del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
 	"Sent units from ticket": "Envio *{{quantity}}* unidades de [{{concept}} ({{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenientes del ticket id [{{ticketId}}]({{{ticketUrl}}})",
-	"Claim will be picked": "Se recogerá el género de la reclamación [{{claimId}}]({{{claimUrl}}}) del cliente *{{clientName}}*",
-	"Claim state has changed to incomplete": "Se ha cambiado el estado de la reclamación [{{claimId}}]({{{claimUrl}}}) del cliente *{{clientName}}* a *incompleta*",
-	"Claim state has changed to canceled": "Se ha cambiado el estado de la reclamación [{{claimId}}]({{{claimUrl}}}) del cliente *{{clientName}}* a *anulado*",
+	"Change quantity": "{{concept}} cambia de {{oldQuantity}} a {{newQuantity}}",
+    "Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*",
+	"Claim state has changed to incomplete": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *incompleta*",
+	"Claim state has changed to canceled": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *anulado*",
 	"Client checked as validated despite of duplication": "Cliente comprobado a pesar de que existe el cliente id {{clientId}}",
 	"ORDER_ROW_UNAVAILABLE": "No hay disponibilidad de este producto",
 	"Distance must be lesser than 1000": "La distancia debe ser inferior a 1000",
@@ -245,10 +246,12 @@
 	"Already has this status": "Ya tiene este estado",
 	"There aren't records for this week": "No existen registros para esta semana",
 	"Empty data source": "Origen de datos vacio",
+	"App locked": "Aplicación bloqueada por el usuario {{userId}}",
 	"Email verify": "Correo de verificación",
 	"Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
 	"Receipt's bank was not found": "No se encontró el banco del recibo",
 	"This receipt was not compensated": "Este recibo no ha sido compensado",
 	"Client's email was not found": "No se encontró el email del cliente",
-	"Something went wrong - no sector found": "Something went wrong - no sector found"
+	"Something went wrong - no sector found": "Something went wrong - no sector found",
+	"Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9"
 }

modules/client/back/model-config.json

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

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

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

modules/invoiceOut/back/methods/invoiceOut/downloadZip.js

@@ -9,31 +9,43 @@ module.exports = Self => {
         accepts: [
             {
                 arg: 'ids',
-                type: ['number'],
-                description: 'The invoice ids'
+                type: 'string',
+                description: 'The invoices ids',
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'string',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'string',
+                http: {target: 'header'}
             }
         ],
-        returns: {
-            arg: 'base64',
-            type: 'string',
-            root: true
-        },
         http: {
             path: '/downloadZip',
-            verb: 'POST'
+            verb: 'GET'
         }
     });
 
     Self.downloadZip = async function(ctx, ids, options) {
         const models = Self.app.models;
         const myOptions = {};
+        const zip = new JSZip();
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const zip = new JSZip();
-        let totalSize = 0;
         const zipConfig = await models.ZipConfig.findOne(null, myOptions);
+        let totalSize = 0;
+        ids = ids.split(',');
+
         for (let id of ids) {
             if (zipConfig && totalSize > zipConfig.maxSize) throw new UserError('Files are too large');
             const invoiceOutPdf = await models.InvoiceOut.download(ctx, id, myOptions);
@@ -44,8 +56,10 @@ module.exports = Self => {
             totalSize += sizeInMegabytes;
             zip.file(fileName, body);
         }
-        const base64 = await zip.generateAsync({type: 'base64'});
-        return base64;
+
+        const stream = zip.generateNodeStream({streamFiles: true});
+
+        return [stream, 'application/zip', `filename="download.zip"`];
     };
 
     function extractFileName(str) {

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

@@ -3,7 +3,7 @@ const UserError = require('vn-loopback/util/user-error');
 
 describe('InvoiceOut downloadZip()', () => {
     const userId = 9;
-    const invoiceIds = [1, 2];
+    const invoiceIds = '1,2';
     const ctx = {
         req: {
 

modules/invoiceOut/front/index/index.js

@@ -29,13 +29,13 @@ export default class Controller extends Section {
             window.open(url, '_blank');
         } else {
             const invoiceOutIds = this.checked;
-            const params = {
-                ids: invoiceOutIds
-            };
-            this.$http.post(`InvoiceOuts/downloadZip`, params)
-                .then(res => {
-                    location.href = 'data:application/zip;base64,' + res.data;
-                });
+            const invoicesIds = invoiceOutIds.join(',');
+            const serializedParams = this.$httpParamSerializer({
+                access_token: this.vnToken.token,
+                ids: invoicesIds
+            });
+            const url = `api/InvoiceOuts/downloadZip?${serializedParams}`;
+            window.open(url, '_blank');
         }
     }
 }

modules/mdb/back/methods/mdbApp/lock.js

@@ -0,0 +1,66 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('lock', {
+        description: 'Lock an app for the user',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'appName',
+                type: 'string',
+                required: true,
+                description: 'The app name',
+                http: {source: 'path'}
+
+            }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/:appName/lock`,
+            verb: 'POST'
+        }
+    });
+
+    Self.lock = async(ctx, appName, options) => {
+        const models = Self.app.models;
+        const userId = ctx.req.accessToken.userId;
+        const myOptions = {};
+        const $t = ctx.req.__; // $translate
+
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            const mdbApp = await models.MdbApp.findById(appName, {fields: ['app', 'locked', 'userFk']}, myOptions);
+
+            if (mdbApp.locked) {
+                throw new UserError($t('App locked', {
+                    userId: mdbApp.userFk
+                }));
+            }
+
+            const updatedMdbApp = await mdbApp.updateAttributes({
+                userFk: userId,
+                locked: new Date()
+            }, myOptions);
+
+            if (tx) await tx.commit();
+
+            return updatedMdbApp;
+        } catch (e) {
+            if (tx) await tx.rollback();
+
+            throw e;
+        }
+    };
+};

modules/mdb/back/methods/mdbApp/specs/lock.spec.js

@@ -0,0 +1,51 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('MdbApp lock()', () => {
+    it('should throw an error if the app is already locked', async() => {
+        const tx = await models.MdbApp.beginTransaction({});
+        let error;
+
+        try {
+            const options = {transaction: tx};
+            const appName = 'bar';
+            const developerId = 9;
+            const ctx = {
+                req: {
+                    accessToken: {userId: developerId},
+                    __: () => {}
+                }
+            };
+
+            const result = await models.MdbApp.lock(ctx, appName, options);
+
+            expect(result.locked).not.toBeNull();
+
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+
+            await tx.rollback();
+        }
+
+        expect(error).toBeDefined();
+    });
+
+    it(`should lock a mdb `, async() => {
+        const tx = await models.MdbApp.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const appName = 'foo';
+            const developerId = 9;
+            const ctx = {req: {accessToken: {userId: developerId}}};
+
+            const result = await models.MdbApp.lock(ctx, appName, options);
+
+            expect(result.locked).not.toBeNull();
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+        }
+    });
+});

modules/mdb/back/methods/mdbApp/specs/unlock.spec.js

@@ -0,0 +1,22 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('MdbApp unlock()', () => {
+    it(`should unlock a mdb `, async() => {
+        const tx = await models.MdbApp.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const appName = 'bar';
+            const developerId = 9;
+            const ctx = {req: {accessToken: {userId: developerId}}};
+
+            const result = await models.MdbApp.unlock(ctx, appName, options);
+
+            expect(result.locked).toBeNull();
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+        }
+    });
+});

modules/mdb/back/methods/mdbApp/unlock.js

@@ -0,0 +1,40 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('unlock', {
+        description: 'Unlock an app for the user',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'appName',
+                type: 'string',
+                required: true,
+                description: 'The app name',
+                http: {source: 'path'}
+
+            }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/:appName/unlock`,
+            verb: 'POST'
+        }
+    });
+
+    Self.unlock = async(ctx, appName, options) => {
+        const models = Self.app.models;
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const mdbApp = await models.MdbApp.findById(appName, null, myOptions);
+        const updatedMdbApp = await mdbApp.updateAttributes({
+            userFk: null,
+            locked: null
+        }, myOptions);
+
+        return updatedMdbApp;
+    };
+};

modules/mdb/back/methods/mdbVersion/upload.js

@@ -23,6 +23,12 @@ module.exports = Self => {
                 type: 'string',
                 required: true,
                 description: `The branch name`
+            },
+            {
+                arg: 'unlock',
+                type: 'boolean',
+                required: false,
+                description: `It allows unlock the app`
             }
         ],
         returns: {
@@ -35,9 +41,11 @@ module.exports = Self => {
         }
     });
 
-    Self.upload = async(ctx, appName, newVersion, branch, options) => {
+    Self.upload = async(ctx, appName, newVersion, branch, unlock, options) => {
         const models = Self.app.models;
+        const userId = ctx.req.accessToken.userId;
         const myOptions = {};
+        const $t = ctx.req.__; // $translate
 
         const TempContainer = models.TempContainer;
         const AccessContainer = models.AccessContainer;
@@ -55,6 +63,14 @@ module.exports = Self => {
 
         let srcFile;
         try {
+            const mdbApp = await models.MdbApp.findById(appName, null, myOptions);
+
+            if (mdbApp.locked && mdbApp.userFk != userId) {
+                throw new UserError($t('App locked', {
+                    userId: mdbApp.userFk
+                }));
+            }
+
             const tempContainer = await TempContainer.container('access');
             const uploaded = await TempContainer.upload(tempContainer.name, ctx.req, ctx.result, fileOptions);
             const files = Object.values(uploaded.files).map(file => {
@@ -79,7 +95,7 @@ module.exports = Self => {
 
                 const existBranch = await models.MdbBranch.findOne({
                     where: {name: branch}
-                });
+                }, myOptions);
 
                 if (!existBranch)
                     throw new UserError('Not exist this branch');
@@ -108,7 +124,9 @@ module.exports = Self => {
                 app: appName,
                 branchFk: branch,
                 version: newVersion
-            });
+            }, myOptions);
+
+            if (unlock) await models.MdbApp.unlock(ctx, appName, myOptions);
 
             if (tx) await tx.commit();
         } catch (e) {

modules/mdb/back/model-config.json

@@ -1,4 +1,7 @@
 {
+    "MdbApp": {
+        "dataSource": "vn"
+    },
     "MdbBranch": {
         "dataSource": "vn"
     },

modules/mdb/back/models/mdbApp.js

@@ -0,0 +1,4 @@
+module.exports = Self => {
+    require('../methods/mdbApp/lock')(Self);
+    require('../methods/mdbApp/unlock')(Self);
+};

modules/mdb/back/models/mdbApp.json

@@ -0,0 +1,31 @@
+{
+    "name": "MdbApp",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "mdbApp"
+        }
+    },
+    "properties": {
+        "app": {
+            "type": "string",
+            "description": "The app name",
+            "id": true
+        },
+        "locked": {
+            "type": "date"
+        }
+    },
+    "relations": {
+		"branch": {
+			"type": "belongsTo",
+			"model": "MdbBranch",
+			"foreignKey": "baselineBranchFk"
+		},
+        "user": {
+			"type": "belongsTo",
+			"model": "MdbBranch",
+			"foreignKey": "userFk"
+		}
+    }
+}

modules/ticket/back/methods/ticket-log/getChanges.js

@@ -0,0 +1,64 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('getChanges', {
+        description: 'Get changues in the sales of a ticket',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'id',
+            type: 'number',
+            required: true,
+            description: 'the ticket id',
+            http: {source: 'path'}
+        }],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/:id/getChanges`,
+            verb: 'get'
+        }
+    });
+
+    Self.getChanges = async(ctx, id, options) => {
+        const models = Self.app.models;
+        const myOptions = {};
+        const $t = ctx.req.__; // $translate
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const ticketLogs = await models.TicketLog.find(
+            {
+                where: {
+                    and: [
+                        {originFk: id},
+                        {action: 'update'},
+                        {changedModel: 'Sale'}
+                    ]
+                },
+                fields: [
+                    'oldInstance',
+                    'newInstance',
+                    'changedModelId'
+                ],
+            }, myOptions);
+
+        const changes = [];
+        for (const ticketLog of ticketLogs) {
+            const oldQuantity = ticketLog.oldInstance.quantity;
+            const newQuantity = ticketLog.newInstance.quantity;
+
+            if (oldQuantity || newQuantity) {
+                const sale = await models.Sale.findById(ticketLog.changedModelId, null, myOptions);
+                const message = $t('Change quantity', {
+                    concept: sale.concept,
+                    oldQuantity: oldQuantity || 0,
+                    newQuantity: newQuantity || 0,
+                });
+
+                changes.push(message);
+            }
+        }
+        return changes.join('\n');
+    };
+};

modules/ticket/back/methods/ticket-log/specs/getChanges.spec.js

@@ -0,0 +1,16 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('ticketLog getChanges()', () => {
+    const ctx = {req: {}};
+
+    ctx.req.__ = value => {
+        return value;
+    };
+    it('should return the changes in the sales of a ticket', async() => {
+        const ticketId = 7;
+
+        const changues = await models.TicketLog.getChanges(ctx, ticketId);
+
+        expect(changues).toContain(`Change quantity`);
+    });
+});

modules/ticket/back/methods/ticket/getTicketsAdvance.js

@@ -0,0 +1,134 @@
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const buildFilter = require('vn-loopback/util/filter').buildFilter;
+const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
+
+module.exports = Self => {
+    Self.remoteMethodCtx('getTicketsAdvance', {
+        description: 'Find all tickets that can be moved to the present',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'warehouseFk',
+                type: 'number',
+                description: 'Warehouse identifier',
+                required: true
+            },
+            {
+                arg: 'dateFuture',
+                type: 'date',
+                description: 'Date of the tickets that you want to advance',
+                required: true
+            },
+            {
+                arg: 'dateToAdvance',
+                type: 'date',
+                description: 'Date to when you want to advance',
+                required: true
+            },
+            {
+                arg: 'ipt',
+                type: 'string',
+                description: 'Origin Item Packaging Type',
+                required: false
+            },
+            {
+                arg: 'futureIpt',
+                type: 'string',
+                description: 'Destination Item Packaging Type',
+                required: false
+            },
+            {
+                arg: 'id',
+                type: 'number',
+                description: 'Origin id',
+                required: false
+            },
+            {
+                arg: 'futureId',
+                type: 'number',
+                description: 'Destination id',
+                required: false
+            },
+            {
+                arg: 'state',
+                type: 'string',
+                description: 'Origin state',
+                required: false
+            },
+            {
+                arg: 'futureState',
+                type: 'string',
+                description: 'Destination state',
+                required: false
+            },
+            {
+                arg: 'filter',
+                type: 'object',
+                description: `Filter defining where, order, offset, and limit - must be a JSON-encoded string`
+            }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/getTicketsAdvance`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getTicketsAdvance = async(ctx, options) => {
+        const args = ctx.args;
+        const conn = Self.dataSource.connector;
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const where = buildFilter(ctx.args, (param, value) => {
+            switch (param) {
+            case 'id':
+                return {'f.id': value};
+            case 'futureId':
+                return {'f.futureId': value};
+            case 'ipt':
+                return {'f.ipt': value};
+            case 'futureIpt':
+                return {'f.futureIpt': value};
+            case 'state':
+                return {'f.stateCode': {like: `%${value}%`}};
+            case 'futureState':
+                return {'f.futureStateCode': {like: `%${value}%`}};
+            }
+        });
+
+        let filter = mergeFilters(ctx.args.filter, {where});
+        const stmts = [];
+        let stmt;
+
+        stmt = new ParameterizedSQL(
+            `CALL vn.ticket_canAdvance(?,?,?)`,
+            [args.dateFuture, args.dateToAdvance, args.warehouseFk]);
+
+        stmts.push(stmt);
+
+        stmt = new ParameterizedSQL(`
+            SELECT f.*
+            FROM tmp.filter f`);
+
+        stmt.merge(conn.makeWhere(filter.where));
+
+        stmt.merge(conn.makeOrderBy(filter.order));
+        stmt.merge(conn.makeLimit(filter));
+        const ticketsIndex = stmts.push(stmt) - 1;
+
+        stmts.push(
+            `DROP TEMPORARY TABLE
+                tmp.filter`);
+
+        const sql = ParameterizedSQL.join(stmts, ';');
+        const result = await conn.executeStmt(sql, myOptions);
+
+        return result[ticketsIndex];
+    };
+};

modules/ticket/back/methods/ticket/sendSms.js

@@ -31,6 +31,7 @@ module.exports = Self => {
     });
 
     Self.sendSms = async(ctx, id, destination, message, options) => {
+        const models = Self.app.models;
         const myOptions = {};
         let tx;
 
@@ -45,7 +46,14 @@ module.exports = Self => {
         const userId = ctx.req.accessToken.userId;
 
         try {
-            const sms = await Self.app.models.Sms.send(ctx, destination, message);
+            const sms = await models.Sms.send(ctx, destination, message);
+
+            const newTicketSms = {
+                ticketFk: id,
+                smsFk: sms.id
+            };
+            await models.TicketSms.create(newTicketSms);
+
             const logRecord = {
                 originFk: id,
                 userFk: userId,
@@ -60,7 +68,7 @@ module.exports = Self => {
                 }
             };
 
-            const ticketLog = await Self.app.models.TicketLog.create(logRecord, myOptions);
+            const ticketLog = await models.TicketLog.create(logRecord, myOptions);
 
             sms.logId = ticketLog.id;
 

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

@@ -107,8 +107,8 @@ describe('ticket filter()', () => {
             const result = await models.Ticket.filter(ctx, filter, options);
             const firstRow = result[0];
 
-            expect(result.length).toEqual(1);
-            expect(firstRow.id).toEqual(11);
+            expect(result.length).toBeGreaterThan(0);
+            expect(firstRow.id).toBeGreaterThan(10);
 
             await tx.rollback();
         } catch (e) {
@@ -153,7 +153,7 @@ describe('ticket filter()', () => {
             const secondRow = result[1];
             const thirdRow = result[2];
 
-            expect(result.length).toEqual(17);
+            expect(result.length).toBeGreaterThan(15);
             expect(firstRow.state).toEqual('Entregado');
             expect(secondRow.state).toEqual('Entregado');
             expect(thirdRow.state).toEqual('Entregado');
@@ -175,7 +175,7 @@ describe('ticket filter()', () => {
             const filter = {};
             const result = await models.Ticket.filter(ctx, filter, options);
 
-            expect(result.length).toEqual(26);
+            expect(result.length).toBeGreaterThan(25);
 
             await tx.rollback();
         } catch (e) {
@@ -194,7 +194,7 @@ describe('ticket filter()', () => {
             const filter = {};
             const result = await models.Ticket.filter(ctx, filter, options);
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -213,7 +213,7 @@ describe('ticket filter()', () => {
             const filter = {};
             const result = await models.Ticket.filter(ctx, filter, options);
 
-            expect(result.length).toEqual(3);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -251,7 +251,7 @@ describe('ticket filter()', () => {
             const filter = {};
             const result = await models.Ticket.filter(ctx, filter, options);
 
-            expect(result.length).toEqual(5);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -289,7 +289,7 @@ describe('ticket filter()', () => {
             const filter = {};
             const result = await models.Ticket.filter(ctx, filter, options);
 
-            expect(result.length).toEqual(6);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {

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

@@ -0,0 +1,131 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('TicketFuture getTicketsAdvance()', () => {
+    const today = new Date();
+    today.setHours(0, 0, 0, 0);
+    let tomorrow = new Date();
+    tomorrow.setDate(today.getDate() + 1);
+
+    it('should return the tickets passing the required data', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const args = {
+                dateFuture: tomorrow,
+                dateToAdvance: today,
+                warehouseFk: 1,
+            };
+
+            const ctx = {req: {accessToken: {userId: 9}}, args};
+            const result = await models.Ticket.getTicketsAdvance(ctx, options);
+
+            expect(result.length).toBeGreaterThan(0);
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return the tickets matching the origin grouped state', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const args = {
+                dateFuture: tomorrow,
+                dateToAdvance: today,
+                warehouseFk: 1,
+                state: 'OK'
+            };
+
+            const ctx = {req: {accessToken: {userId: 9}}, args};
+            const result = await models.Ticket.getTicketsAdvance(ctx, options);
+
+            expect(result.length).toBeGreaterThan(0);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return the tickets matching the destination grouped state', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const args = {
+                dateFuture: tomorrow,
+                dateToAdvance: today,
+                warehouseFk: 1,
+                futureState: 'FREE'
+            };
+
+            const ctx = {req: {accessToken: {userId: 9}}, args};
+            const result = await models.Ticket.getTicketsAdvance(ctx, options);
+
+            expect(result.length).toBeGreaterThan(0);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return the tickets matching the origin IPT', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const args = {
+                dateFuture: tomorrow,
+                dateToAdvance: today,
+                warehouseFk: 1,
+                ipt: 'Vertical'
+            };
+
+            const ctx = {req: {accessToken: {userId: 9}}, args};
+            const result = await models.Ticket.getTicketsAdvance(ctx, options);
+
+            expect(result.length).toBeLessThan(5);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return the tickets matching the destination IPT', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const args = {
+                dateFuture: tomorrow,
+                dateToAdvance: today,
+                warehouseFk: 1,
+                tfIpt: 'Vertical'
+            };
+
+            const ctx = {req: {accessToken: {userId: 9}}, args};
+            const result = await models.Ticket.getTicketsAdvance(ctx, options);
+
+            expect(result.length).toBeLessThan(5);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

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

@@ -87,7 +87,7 @@ describe('sale priceDifference()', () => {
             const secondtItem = result.items[1];
 
             expect(firstItem.movable).toEqual(410);
-            expect(secondtItem.movable).toEqual(1810);
+            expect(secondtItem.movable).toEqual(1790);
 
             await tx.rollback();
         } catch (e) {

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

@@ -15,9 +15,16 @@ describe('ticket sendSms()', () => {
             const sms = await models.Ticket.sendSms(ctx, id, destination, message, options);
 
             const createdLog = await models.TicketLog.findById(sms.logId, null, options);
+
+            const filter = {
+                ticketFk: createdLog.originFk
+            };
+            const ticketSms = await models.TicketSms.findOne(filter, options);
+
             const json = JSON.parse(JSON.stringify(createdLog.newInstance));
 
             expect(json.message).toEqual(message);
+            expect(ticketSms.ticketFk).toEqual(createdLog.originFk);
 
             await tx.rollback();
         } catch (e) {

modules/ticket/back/model-config.json

@@ -44,7 +44,7 @@
     "SaleTracking": {
         "dataSource": "vn"
     },
-    "State":{
+    "State": {
         "dataSource": "vn"
     },
     "Ticket": {
@@ -71,16 +71,16 @@
     "TicketRequest": {
         "dataSource": "vn"
     },
-    "TicketState":{
+    "TicketState": {
         "dataSource": "vn"
     },
-    "TicketLastState":{
+    "TicketLastState": {
         "dataSource": "vn"
     },
-    "TicketService":{
+    "TicketService": {
         "dataSource": "vn"
     },
-    "TicketServiceType":{
+    "TicketServiceType": {
         "dataSource": "vn"
     },
     "TicketTracking": {

modules/ticket/back/models/ticket-log.js

@@ -0,0 +1,3 @@
+module.exports = function(Self) {
+    require('../methods/ticket-log/getChanges')(Self);
+};

modules/ticket/back/models/ticket-methods.js

@@ -35,6 +35,7 @@ module.exports = function(Self) {
     require('../methods/ticket/closeByRoute')(Self);
     require('../methods/ticket/getTicketsFuture')(Self);
     require('../methods/ticket/merge')(Self);
+    require('../methods/ticket/getTicketsAdvance')(Self);
     require('../methods/ticket/isRoleAdvanced')(Self);
     require('../methods/ticket/collectionLabel')(Self);
     require('../methods/ticket/expeditionPalletLabel')(Self);

modules/ticket/front/advance-search-panel/index.html

@@ -0,0 +1,76 @@
+<div class="search-panel">
+    <form id="manifold-form" ng-submit="$ctrl.onSearch()">
+        <vn-horizontal class="vn-px-lg vn-pt-lg">
+            <vn-date-picker
+                vn-one
+                label="Origin date"
+                ng-model="filter.dateFuture"
+                required="true">
+            </vn-date-picker>
+            <vn-date-picker
+                vn-one
+                label="Destination date"
+                ng-model="filter.dateToAdvance"
+                required="true">
+            </vn-date-picker>
+        </vn-horizontal>
+        <vn-horizontal class="vn-px-lg">
+            <vn-autocomplete vn-one
+                data="$ctrl.itemPackingTypes"
+                label="Origin IPT"
+                value-field="code"
+                show-field="description"
+                ng-model="filter.futureIpt"
+                info="IPT">
+                <tpl-item>
+                    {{description}}
+                </tpl-item>
+            </vn-autocomplete>
+            <vn-autocomplete vn-one
+                data="$ctrl.itemPackingTypes"
+                label="Destination IPT"
+                value-field="code"
+                show-field="description"
+                ng-model="filter.ipt"
+                info="IPT">
+                <tpl-item>
+                    {{description}}
+                </tpl-item>
+            </vn-autocomplete>
+        </vn-horizontal>
+        <vn-horizontal class="vn-px-lg">
+            <vn-autocomplete vn-one
+                data="$ctrl.groupedStates"
+                label="Origin Grouped State"
+                value-field="code"
+                show-field="name"
+                ng-model="filter.futureState">
+                <tpl-item>
+                    {{name}}
+                </tpl-item>
+            </vn-autocomplete>
+            <vn-autocomplete vn-one
+                data="$ctrl.groupedStates"
+                label="Destination Grouped State"
+                value-field="code"
+                show-field="name"
+                ng-model="filter.state">
+                <tpl-item>
+                    {{name}}
+                </tpl-item>
+            </vn-autocomplete>
+        </vn-horizontal>
+        <vn-horizontal class="vn-px-lg">
+            <vn-autocomplete
+                vn-one
+                label="Warehouse"
+                ng-model="filter.warehouseFk"
+                url="Warehouses"
+                required="true">
+            </vn-autocomplete>
+        </vn-horizontal>
+        <vn-horizontal class="vn-px-lg vn-pb-lg vn-mt-lg">
+            <vn-submit label="Search"></vn-submit>
+        </vn-horizontal>
+    </form>
+</div>

modules/ticket/front/advance-search-panel/index.js

@@ -0,0 +1,43 @@
+import ngModule from '../module';
+import SearchPanel from 'core/components/searchbar/search-panel';
+
+class Controller extends SearchPanel {
+    constructor($, $element) {
+        super($, $element);
+        this.filter = this.$.filter;
+        this.getGroupedStates();
+        this.getItemPackingTypes();
+    }
+
+    getGroupedStates() {
+        let groupedStates = [];
+        this.$http.get('AlertLevels').then(res => {
+            for (let state of res.data) {
+                groupedStates.push({
+                    id: state.id,
+                    code: state.code,
+                    name: this.$t(state.code)
+                });
+            }
+            this.groupedStates = groupedStates;
+        });
+    }
+
+    getItemPackingTypes() {
+        let itemPackingTypes = [];
+        this.$http.get('ItemPackingTypes').then(res => {
+            for (let ipt of res.data) {
+                itemPackingTypes.push({
+                    code: ipt.code,
+                    description: this.$t(ipt.description)
+                });
+            }
+            this.itemPackingTypes = itemPackingTypes;
+        });
+    }
+}
+
+ngModule.vnComponent('vnAdvanceTicketSearchPanel', {
+    template: require('./index.html'),
+    controller: Controller
+});

modules/ticket/front/advance-search-panel/locale/en.yml

@@ -0,0 +1 @@
+Advance tickets: Advance tickets

modules/ticket/front/advance-search-panel/locale/es.yml

@@ -0,0 +1 @@
+Advance tickets: Adelantar tickets

modules/ticket/front/advance/index.html

@@ -0,0 +1,160 @@
+<vn-crud-model
+    vn-id="model"
+    url="Tickets/getTicketsAdvance"
+    auto-load="false">
+</vn-crud-model>
+<vn-portal slot="topbar">
+    <vn-searchbar
+        vn-focus
+        panel="vn-advance-ticket-search-panel"
+        placeholder="Search tickets"
+        info="Search advance tickets by date"
+        suggested-filter="$ctrl.filterParams"
+        auto-state="false"
+        model="model">
+    </vn-searchbar>
+</vn-portal>
+<vn-card>
+    <smart-table
+        model="model"
+        options="$ctrl.smartTableOptions"
+        expr-builder="$ctrl.exprBuilder(param, value)"
+        >
+        <slot-actions>
+            <vn-button disabled="$ctrl.checked.length === 0"
+                icon="keyboard_double_arrow_left"
+                ng-click="moveTicketsAdvance.show($event)"
+                vn-tooltip="Advance tickets">
+            </vn-button>
+        </slot-actions>
+        <slot-table>
+            <table>
+                <thead>
+                    <tr second-header>
+                        <td></td>
+                        <th colspan="5" translate>Origin</th>
+                        <th colspan="8" translate>Destination</th>
+                    </tr>
+                    <tr>
+                        <th shrink>
+                            <vn-multi-check
+                                model="model"
+                                checked="$ctrl.checkAll"
+                                check-field="checked">
+                            </vn-multi-check>
+                        </th>
+                        <th field="futureId">
+                            <span translate>ID</span>
+                        </th>
+                        <th field="futureShipped">
+                            <span translate>Date</span>
+                        </th>
+                        <th field="futureIpt" title="Item Packing Type">
+                            <span>IPT</span>
+                        </th>
+                        <th field="futureState">
+                            <span translate>State</span>
+                        </th>
+                        <th field="totalWithVat">
+                            <span translate>Import</span>
+                        </th>
+                        <th separator field="id">
+                            <span translate>ID</span>
+                        </th>
+                        <th field="shipped">
+                            <span translate>Date</span>
+                        </th>
+                        <th field="ipt" title="Item Packing Type">
+                            <span>IPT</span>
+                        </th>
+                        <th field="state">
+                            <span translate>State</span>
+                        </th>
+                        <th field="liters">
+                            <span translate>Liters</span>
+                        </th>
+                        <th field="hasStock">
+                            <span>Stock</span>
+                        </th>
+                        <th field="lines">
+                            <span translate>Lines</span>
+                        </th>
+                        <th field="futureTotalWithVat">
+                            <span translate>Import</span>
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr ng-repeat="ticket in model.data">
+                        <td>
+                            <vn-check
+                                ng-model="ticket.checked"
+                                vn-click-stop>
+                            </vn-check>
+                        </td>
+                        <td>
+                            <span
+                                ng-click="ticketDescriptor.show($event, ticket.futureId)"
+                                class="link">
+                                {{::ticket.futureId | dashIfEmpty}}
+                            </span>
+                        </td>
+                        <td shrink-date>
+                            <span class="chip {{$ctrl.compareDate(ticket.futureShipped)}}">
+                                {{::ticket.futureShipped | date: 'dd/MM/yyyy'}}
+                            </span>
+                        </td>
+                        <td>{{::ticket.futureIpt | dashIfEmpty}}</td>
+                        <td>
+                            <span
+                                class="chip {{$ctrl.stateColor(ticket.futureState)}}">
+                                {{::ticket.futureState | dashIfEmpty}}
+                            </span>
+                        </td>
+                        <td>
+                            <span class="chip {{$ctrl.totalPriceColor(ticket.futureTotalWithVat)}}">
+                                {{::(ticket.futureTotalWithVat ? ticket.futureTotalWithVat : 0) | currency: 'EUR': 2}}
+                            </span>
+                        </td>
+                        <td>
+                            <span
+                                ng-click="ticketDescriptor.show($event, ticket.id)"
+                                class="link">
+                                {{::ticket.id | dashIfEmpty}}
+                            </span>
+                        </td>
+                        <td shrink-date>
+                            <span class="chip {{$ctrl.compareDate(ticket.shipped)}}">
+                                {{::ticket.shipped | date: 'dd/MM/yyyy'}}
+                            </span>
+                        </td>
+                        <td>{{::ticket.ipt | dashIfEmpty}}</td>
+                        <td>
+                            <span
+                                class="chip {{$ctrl.stateColor(ticket.state)}}">
+                                {{::ticket.state | dashIfEmpty}}
+                            </span>
+                        </td>
+                        <td>{{::ticket.liters | dashIfEmpty}}</td>
+                        <td>{{::ticket.hasStock | dashIfEmpty}}</td>
+                        <td>{{::ticket.lines | dashIfEmpty}}</td>
+                        <td>
+                            <span class="chip {{$ctrl.totalPriceColor(ticket.totalWithVat)}}">
+                                {{::(ticket.totalWithVat ? ticket.totalWithVat : 0) | currency: 'EUR': 2}}
+                            </span>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </slot-table>
+    </smart-table>
+</vn-card>
+<vn-confirm
+    vn-id="moveTicketsAdvance"
+    on-accept="$ctrl.moveTicketsAdvance()"
+    question="{{$ctrl.confirmationMessage}}"
+    message="Advance tickets">
+</vn-confirm>
+<vn-ticket-descriptor-popover
+    vn-id="ticketDescriptor">
+</vn-ticket-descriptor-popover>

modules/ticket/front/advance/index.js

@@ -0,0 +1,177 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {
+    constructor($element, $) {
+        super($element, $);
+        this.$checkAll = false;
+
+        this.smartTableOptions = {
+            activeButtons: {
+                search: true,
+            },
+            columns: [
+                {
+                    field: 'state',
+                    searchable: false
+                },
+                {
+                    field: 'futureState',
+                    searchable: false
+                },
+                {
+                    field: 'totalWithVat',
+                    searchable: false
+                },
+                {
+                    field: 'futureTotalWithVat',
+                    searchable: false
+                },
+                {
+                    field: 'shipped',
+                    searchable: false
+                },
+                {
+                    field: 'futureShipped',
+                    searchable: false
+                },
+                {
+                    field: 'ipt',
+                    autocomplete: {
+                        url: 'ItemPackingTypes',
+                        showField: 'description',
+                        valueField: 'code'
+                    }
+                },
+                {
+                    field: 'futureIpt',
+                    autocomplete: {
+                        url: 'ItemPackingTypes',
+                        showField: 'description',
+                        valueField: 'code'
+                    }
+                },
+            ]
+        };
+    }
+
+    $postLink() {
+        this.setDefaultFilter();
+    }
+
+    setDefaultFilter() {
+        let today = new Date();
+        const tomorrow = new Date(today);
+        tomorrow.setDate(tomorrow.getDate() + 1);
+        this.filterParams = {
+            dateFuture: tomorrow,
+            dateToAdvance: today,
+            warehouseFk: this.vnConfig.warehouseFk
+        };
+        this.$.model.applyFilter(null, this.filterParams);
+    }
+
+    compareDate(date) {
+        let today = new Date();
+        today.setHours(0, 0, 0, 0);
+        let timeTicket = new Date(date);
+        timeTicket.setHours(0, 0, 0, 0);
+
+        let comparation = today - timeTicket;
+
+        if (comparation == 0)
+            return 'warning';
+        if (comparation < 0)
+            return 'success';
+    }
+
+    get checked() {
+        const tickets = this.$.model.data || [];
+        const checkedLines = [];
+        for (let ticket of tickets) {
+            if (ticket.checked)
+                checkedLines.push(ticket);
+        }
+
+        return checkedLines;
+    }
+
+    stateColor(state) {
+        if (state === 'OK')
+            return 'success';
+        else if (state === 'Libre')
+            return 'notice';
+    }
+
+    dateRange(value) {
+        const minHour = new Date(value);
+        minHour.setHours(0, 0, 0, 0);
+        const maxHour = new Date(value);
+        maxHour.setHours(23, 59, 59, 59);
+
+        return [minHour, maxHour];
+    }
+
+    totalPriceColor(totalWithVat) {
+        const total = parseInt(totalWithVat);
+        if (total > 0 && total < 50)
+            return 'warning';
+    }
+
+    get confirmationMessage() {
+        if (!this.$.model) return 0;
+
+        return this.$t(`Advance confirmation`, {
+            checked: this.checked.length
+        });
+    }
+
+    moveTicketsAdvance() {
+        let ticketsToMove = [];
+        this.checked.forEach(ticket => {
+            ticketsToMove.push({
+                originId: ticket.futureId,
+                destinationId: ticket.id,
+                originShipped: ticket.futureShipped,
+                destinationShipped: ticket.shipped,
+                workerFk: ticket.workerFk
+            });
+        });
+        const params = {tickets: ticketsToMove};
+        return this.$http.post('Tickets/merge', params)
+            .then(() => {
+                this.$.model.refresh();
+                this.vnApp.showSuccess(this.$t('Success'));
+            });
+    }
+
+    exprBuilder(param, value) {
+        switch (param) {
+        case 'id':
+            return {'id': value};
+        case 'futureId':
+            return {'futureId': value};
+        case 'liters':
+            return {'liters': value};
+        case 'lines':
+            return {'lines': value};
+        case 'ipt':
+            return {'ipt': value};
+        case 'futureIpt':
+            return {'futureIpt': value};
+        case 'totalWithVat':
+            return {'totalWithVat': value};
+        case 'futureTotalWithVat':
+            return {'futureTotalWithVat': value};
+        case 'hasStock':
+            return {'hasStock': value};
+        }
+    }
+}
+
+Controller.$inject = ['$element', '$scope'];
+
+ngModule.vnComponent('vnTicketAdvance', {
+    template: require('./index.html'),
+    controller: Controller
+});

modules/ticket/front/advance/index.spec.js

@@ -0,0 +1,113 @@
+import './index.js';
+import crudModel from 'core/mocks/crud-model';
+
+describe('Component vnTicketAdvance', () => {
+    let controller;
+    let $httpBackend;
+
+    beforeEach(ngModule('ticket')
+    );
+
+    beforeEach(inject(($componentController, _$httpBackend_) => {
+        $httpBackend = _$httpBackend_;
+        const $element = angular.element('<vn-ticket-advance></vn-ticket-advance>');
+        controller = $componentController('vnTicketAdvance', {$element});
+        controller.$.model = crudModel;
+        controller.$.model.data = [{
+            id: 1,
+            checked: true,
+            state: 'OK'
+        }, {
+            id: 2,
+            checked: true,
+            state: 'Libre'
+        }];
+    }));
+
+    describe('compareDate()', () => {
+        it('should return warning when the date is the present', () => {
+            let today = new Date();
+            let result = controller.compareDate(today);
+
+            expect(result).toEqual('warning');
+        });
+
+        it('should return sucess when the date is in the future', () => {
+            let futureDate = new Date();
+            futureDate = futureDate.setDate(futureDate.getDate() + 10);
+            let result = controller.compareDate(futureDate);
+
+            expect(result).toEqual('success');
+        });
+
+        it('should return undefined when the date is in the past', () => {
+            let pastDate = new Date();
+            pastDate = pastDate.setDate(pastDate.getDate() - 10);
+            let result = controller.compareDate(pastDate);
+
+            expect(result).toEqual(undefined);
+        });
+    });
+
+    describe('checked()', () => {
+        it('should return an array of checked tickets', () => {
+            const result = controller.checked;
+            const firstRow = result[0];
+            const secondRow = result[1];
+
+            expect(result.length).toEqual(2);
+            expect(firstRow.id).toEqual(1);
+            expect(secondRow.id).toEqual(2);
+        });
+    });
+
+    describe('stateColor()', () => {
+        it('should return success to the OK tickets', () => {
+            const ok = controller.stateColor(controller.$.model.data[0].state);
+            const notOk = controller.stateColor(controller.$.model.data[1].state);
+
+            expect(ok).toEqual('success');
+            expect(notOk).not.toEqual('success');
+        });
+
+        it('should return success to the FREE tickets', () => {
+            const notFree = controller.stateColor(controller.$.model.data[0].state);
+            const free = controller.stateColor(controller.$.model.data[1].state);
+
+            expect(free).toEqual('notice');
+            expect(notFree).not.toEqual('notice');
+        });
+    });
+
+    describe('dateRange()', () => {
+        it('should return two dates with the hours at the start and end of the given date', () => {
+            const now = new Date();
+
+            const today = now.getDate();
+
+            const dateRange = controller.dateRange(now);
+            const start = dateRange[0].toString();
+            const end = dateRange[1].toString();
+
+            expect(start).toContain(today);
+            expect(start).toContain('00:00:00');
+
+            expect(end).toContain(today);
+            expect(end).toContain('23:59:59');
+        });
+    });
+
+    describe('moveTicketsAdvance()', () => {
+        it('should make an HTTP Post query', () => {
+            jest.spyOn(controller.$.model, 'refresh');
+            jest.spyOn(controller.vnApp, 'showSuccess');
+
+            $httpBackend.expectPOST(`Tickets/merge`).respond();
+            controller.moveTicketsAdvance();
+            $httpBackend.flush();
+
+            expect(controller.vnApp.showSuccess).toHaveBeenCalled();
+            expect(controller.$.model.refresh).toHaveBeenCalledWith();
+        });
+    });
+});

modules/ticket/front/advance/locale/en.yml

@@ -0,0 +1,2 @@
+Advance tickets: Advance tickets
+Success: Tickets moved successfully!

modules/ticket/front/advance/locale/es.yml

@@ -0,0 +1,6 @@
+Advance tickets: Adelantar tickets
+Search advance tickets by date: Busca tickets para adelantar por fecha
+Advance confirmation: ¿Desea adelantar {{checked}} tickets?
+Success: Tickets movidos correctamente
+Lines: Líneas
+Liters: Litros

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

@@ -43,7 +43,7 @@
                         ng-if="!$ctrl.hasDocuwareFile"
                         ng-click="$ctrl.showPdfDeliveryNote('withoutPrices')"
                         translate>
-                        as PDF without prices 
+                        as PDF without prices
                     </vn-item>
                     <vn-item
                         ng-click="$ctrl.showCsvDeliveryNote()"
@@ -110,6 +110,12 @@
             translate>
             SMS Minimum import
         </vn-item>
+        <vn-item
+            ng-click="$ctrl.sendChangesSms()"
+            name="sendChangesSms"
+            translate>
+            SMS Notify changes
+        </vn-item>
         <vn-item
             ng-click="makeInvoiceConfirmation.show()"
             ng-show="$ctrl.isEditable"
@@ -150,31 +156,31 @@
         </h5>
         <vn-tool-bar class="vn-mt-md">
             <vn-button
-                label="Monday" 
+                label="Monday"
                 ng-click="$ctrl.addTurn(0)">
             </vn-button>
             <vn-button
-                label="Tuesday" 
+                label="Tuesday"
                 ng-click="$ctrl.addTurn(1)">
             </vn-button>
             <vn-button
-                label="Wednesday" 
+                label="Wednesday"
                 ng-click="$ctrl.addTurn(2)">
             </vn-button>
             <vn-button
-                label="Thursday" 
+                label="Thursday"
                 ng-click="$ctrl.addTurn(3)">
             </vn-button>
             <vn-button
-                label="Friday" 
+                label="Friday"
                 ng-click="$ctrl.addTurn(4)">
             </vn-button>
             <vn-button
-                label="Saturday" 
+                label="Saturday"
                 ng-click="$ctrl.addTurn(5)">
             </vn-button>
             <vn-button
-                label="Sunday" 
+                label="Sunday"
                 ng-click="$ctrl.addTurn(6)">
             </vn-button>
         </vn-tool-bar>
@@ -251,13 +257,13 @@
 
 <!-- Transfer Client popup -->
 
-<vn-dialog 
-    vn-id="transferClient" 
+<vn-dialog
+    vn-id="transferClient"
     title="transferClient"
     size="sm"
     on-accept="$ctrl.transferClient($client)">
     <tpl-body>
-        <vn-autocomplete 
+        <vn-autocomplete
             vn-one
             vn-id="client"
             required="true"
@@ -316,4 +322,4 @@
     on-accept="$ctrl.refund()"
     question="Are you sure you want to refund all?"
     message="Refund all">
-</vn-confirm>
+</vn-confirm>

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

@@ -225,6 +225,18 @@ class Controller extends Section {
         });
     }
 
+    sendChangesSms() {
+        return this.$http.get(`TicketLogs/${this.id}/getChanges`)
+            .then(res => {
+                const params = {
+                    ticketId: this.id,
+                    created: this.ticket.updated,
+                    changes: res.data
+                };
+                this.showSMSDialog({message: this.$t('Send changes', params)});
+            });
+    }
+
     showSMSDialog(params) {
         const address = this.ticket.address;
         const client = this.ticket.client;

modules/ticket/front/descriptor-menu/index.spec.js

@@ -258,6 +258,19 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
         });
     });
 
+    describe('sendChangesSms()', () => {
+        it('should make a query and open the sms dialog', () => {
+            controller.$.sms = {open: () => {}};
+            jest.spyOn(controller.$.sms, 'open');
+
+            $httpBackend.expectGET(`TicketLogs/${ticket.id}/getChanges`).respond();
+            controller.sendChangesSms();
+            $httpBackend.flush();
+
+            expect(controller.$.sms.open).toHaveBeenCalledWith();
+        });
+    });
+
     describe('showSMSDialog()', () => {
         it('should set the destionationFk and destination properties and then call the sms open() method', () => {
             controller.$.sms = {open: () => {}};

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

@@ -11,4 +11,5 @@ Show Proforma: Ver proforma
 Refund all: Abonar todo
 Invoice sent: Factura enviada
 The following refund ticket have been created: "Se ha creado siguiente ticket de abono: {{ticketId}}"
-Transfer client: Transferir cliente
+Transfer client: Transferir cliente
+SMS Notify changes: SMS Notificar cambios

modules/ticket/front/descriptor/locale/en.yml

@@ -1,2 +1,3 @@
 Make a payment: "Verdnatura communicates:\rYour order is pending of payment.\rPlease, enter the web page and make the payment with card.\rThank you."
 Minimum is needed: "Verdnatura communicates:\rA minimum import of 50€ (Without BAT) is needed for your order {{ticketId}} from date {{created | date: 'dd/MM/yyyy'}} to receive it with no extra fees."
+Send changes: "Verdnatura communicates:\rOrder {{ticketId}} date {{created | date: 'dd/MM/yyyy'}}\r{{changes}}"

modules/ticket/front/descriptor/locale/es.yml

@@ -23,3 +23,4 @@ Restore ticket: Restaurar ticket
 You are going to restore this ticket: Vas a restaurar este ticket
 Are you sure you want to restore this ticket?: ¿Seguro que quieres restaurar el ticket?
 Are you sure you want to refund all?: ¿Seguro que quieres abonar todo?
+Send changes: "Verdnatura le recuerda:\rPedido {{ticketId}} día {{created | date: 'dd/MM/yyyy'}}\r{{changes}}"

modules/ticket/front/index.js

@@ -35,3 +35,5 @@ import './dms/edit';
 import './boxing';
 import './future';
 import './future-search-panel';
+import './advance';
+import './advance-search-panel';

modules/ticket/front/routes.json

@@ -8,7 +8,8 @@
         "main": [
             {"state": "ticket.index", "icon": "icon-ticket"},
             {"state": "ticket.weekly.index", "icon": "schedule"},
-            {"state": "ticket.future", "icon": "keyboard_double_arrow_right"}
+            {"state": "ticket.future", "icon": "keyboard_double_arrow_right"},
+            {"state": "ticket.advance", "icon": "keyboard_double_arrow_left"}
         ],
         "card": [
             {"state": "ticket.card.basicData.stepOne", "icon": "settings"},
@@ -290,6 +291,12 @@
             "state": "ticket.future",
             "component": "vn-ticket-future",
             "description": "Future tickets"
+        },
+        {
+            "url": "/advance",
+            "state": "ticket.advance",
+            "component": "vn-ticket-advance",
+            "description": "Advance tickets"
         }
     ]
 }