Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5739-dockerRefactor

CHANGELOG.md

@@ -5,11 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2350.01] - 2023-12-14
+
+### Added
+### Changed
+### Fixed
+
+
 ## [2348.01] - 2023-11-30
 
 ### Added
 - (Ticket -> Adelantar) Permite mover lineas sin generar negativos
 - (Ticket -> Adelantar) Permite modificar la fecha de los tickets
+- (Trabajadores -> Notificaciones) Nueva sección (lilium)
 
 ### Changed
 ### Fixed

back/methods/collection/getTickets.js

@@ -75,7 +75,7 @@ module.exports = Self => {
                     LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
                     LEFT JOIN origin o ON o.id = i.originFk
                 WHERE tc.collectionFk = ?
-                GROUP BY ish.id, p.code, p2.code
+                GROUP BY s.id, ish.id, p.code, p2.code
                 ORDER BY pickingOrder;`, [id], myOptions);
 
         if (print)

back/methods/collection/newCollection.js

@@ -1,133 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethodCtx('newCollection', {
-        description: 'Make a new collection of tickets',
-        accessType: 'WRITE',
-        accepts: [{
-            arg: 'collectionFk',
-            type: 'Number',
-            required: false,
-            description: 'The collection id'
-        }, {
-            arg: 'sectorFk',
-            type: 'Number',
-            required: true,
-            description: 'The sector of worker'
-        }, {
-            arg: 'vWagons',
-            type: 'Number',
-            required: true,
-            description: 'The number of wagons'
-        }],
-        returns: {
-            type: 'Object',
-            root: true
-        },
-        http: {
-            path: `/newCollection`,
-            verb: 'POST'
-        }
-    });
-
-    Self.newCollection = async(ctx, collectionFk, sectorFk, vWagons) => {
-        let query = '';
-        const userId = ctx.req.accessToken.userId;
-
-        if (!collectionFk) {
-            query = `CALL vn.collectionTrain_newBeta(?,?,?)`;
-            const [result] = await Self.rawSql(query, [sectorFk, vWagons, userId], {userId});
-            if (result.length == 0)
-                throw new Error(`No collections for today`);
-
-            collectionFk = result[0].vCollectionFk;
-        }
-
-        query = `CALL vn.collectionTicket_get(?)`;
-        const [tickets] = await Self.rawSql(query, [collectionFk], {userId});
-
-        query = `CALL vn.collectionSale_get(?)`;
-        const [sales] = await Self.rawSql(query, [collectionFk], {userId});
-
-        query = `CALL vn.collectionPlacement_get(?)`;
-        const [placements] = await Self.rawSql(query, [collectionFk], {userId});
-
-        query = `CALL vn.collectionSticker_print(?,?)`;
-        await Self.rawSql(query, [collectionFk, sectorFk], {userId});
-
-        return makeCollection(tickets, sales, placements, collectionFk);
-    };
-
-    /**
-     * Returns a collection json
-     * @param {*} tickets - Request tickets
-     * @param {*} sales - Request sales
-     * @param {*} placements - Request placements
-     * @param {*} collectionFk - Request placements
-     * @return {Object} Collection JSON
-     */
-    async function makeCollection(tickets, sales, placements, collectionFk) {
-        let collection = [];
-
-        for (let i = 0; i < tickets.length; i++) {
-            let ticket = {};
-            ticket['ticketFk'] = tickets[i]['ticketFk'];
-            ticket['level'] = tickets[i]['level'];
-            ticket['agencyName'] = tickets[i]['agencyName'];
-            ticket['warehouseFk'] = tickets[i]['warehouseFk'];
-            ticket['salesPersonFk'] = tickets[i]['salesPersonFk'];
-
-            let ticketSales = [];
-
-            for (let x = 0; x < sales.length; x++) {
-                if (sales[x]['ticketFk'] == ticket['ticketFk']) {
-                    let sale = {};
-                    sale['collectionFk'] = collectionFk;
-                    sale['ticketFk'] = sales[x]['ticketFk'];
-                    sale['saleFk'] = sales[x]['saleFk'];
-                    sale['itemFk'] = sales[x]['itemFk'];
-                    sale['quantity'] = sales[x]['quantity'];
-                    if (sales[x]['quantityPicked'] != null)
-                        sale['quantityPicked'] = sales[x]['quantityPicked'];
-                    else
-                        sale['quantityPicked'] = 0;
-                    sale['longName'] = sales[x]['longName'];
-                    sale['size'] = sales[x]['size'];
-                    sale['color'] = sales[x]['color'];
-                    sale['discount'] = sales[x]['discount'];
-                    sale['price'] = sales[x]['price'];
-                    sale['stems'] = sales[x]['stems'];
-                    sale['category'] = sales[x]['category'];
-                    sale['origin'] = sales[x]['origin'];
-                    sale['clientFk'] = sales[x]['clientFk'];
-                    sale['productor'] = sales[x]['productor'];
-                    sale['reserved'] = sales[x]['reserved'];
-                    sale['isPreviousPrepared'] = sales[x]['isPreviousPrepared'];
-                    sale['isPrepared'] = sales[x]['isPrepared'];
-                    sale['isControlled'] = sales[x]['isControlled'];
-
-                    let salePlacements = [];
-
-                    for (let z = 0; z < placements.length; z++) {
-                        if (placements[z]['saleFk'] == sale['saleFk']) {
-                            let placement = {};
-                            placement['saleFk'] = placements[z]['saleFk'];
-                            placement['itemFk'] = placements[z]['itemFk'];
-                            placement['placement'] = placements[z]['placement'];
-                            placement['shelving'] = placements[z]['shelving'];
-                            placement['created'] = placements[z]['created'];
-                            placement['visible'] = placements[z]['visible'];
-                            placement['order'] = placements[z]['order'];
-                            placement['grouping'] = placements[z]['grouping'];
-                            salePlacements.push(placement);
-                        }
-                    }
-                    sale['placements'] = salePlacements;
-                    ticketSales.push(sale);
-                }
-            }
-            ticket['sales'] = ticketSales;
-            collection.push(ticket);
-        }
-
-        return collection;
-    }
-};

back/methods/collection/spec/newCollection.spec.js

@@ -1,12 +0,0 @@
-const {models} = require('vn-loopback/server/server');
-
-describe('newCollection()', () => {
-    it('should return a new collection', async() => {
-        pending('#3400 analizar que hacer con rutas de back collection');
-        let ctx = {req: {accessToken: {userId: 1106}}};
-        let response = await models.Collection.newCollection(ctx, 1, 1, 1);
-
-        expect(response.length).toBeGreaterThan(0);
-        expect(response[0].ticketFk).toEqual(2);
-    });
-});

back/models/collection.js

@@ -1,6 +1,5 @@
 module.exports = Self => {
     require('../methods/collection/getCollection')(Self);
-    require('../methods/collection/newCollection')(Self);
     require('../methods/collection/getSectors')(Self);
     require('../methods/collection/setSaleQuantity')(Self);
     require('../methods/collection/previousLabel')(Self);

db/changes/235001/00-getRoutesByWorker.sql

@@ -0,0 +1,26 @@
+DELETE FROM `salix`.`ACL`
+    WHERE
+        model = 'Route'
+        AND property = '*'
+        AND accessType = 'READ';
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Route', 'find', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Route', 'findById', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Route', 'findOne', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Route', 'getRoutesByWorker', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Route', 'canViewAllRoute', 'READ', 'ALLOW', 'ROLE', 'deliveryBoss'),
+        ('Route', 'cmr', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Route', 'downloadCmrsZip', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Route', 'downloadZip', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Route', 'filter', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Route', 'getByWorker', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Route', 'getDeliveryPoint', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Route', 'getExternalCmrs', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Route', 'getSuggestedTickets', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Route', 'getTickets', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('Route', 'guessPriority', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Route', 'insertTicket', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Route', 'getDeliveryPoint', 'READ', 'ALLOW', 'ROLE', 'deliveryBoss'),
+        ('Route', 'summary', 'READ', 'ALLOW', 'ROLE', 'employee');

db/dump/fixtures.sql

@@ -59,10 +59,6 @@ INSERT IGNORE INTO `vn`.`greugeConfig`(`id`, `freightPickUpPrice`)
     VALUES
         ('1', '11');
 
-INSERT INTO `vn`.`packagingConfig`(`upperGap`)
-    VALUES
-        ('10');
-
 UPDATE `account`.`role` SET id = 100 WHERE id = 0;
 
 INSERT INTO `account`.`roleConfig`(`id`, `mysqlPassword`, `rolePrefix`, `userPrefix`, `userHost`, `tplUser`)
@@ -73,7 +69,7 @@ CALL `account`.`role_sync`;
 
 INSERT INTO `account`.`user`(`id`,`name`, `nickname`, `role`,`active`,`email`, `lang`, `image`, `password`)
     SELECT id, name, CONCAT(name, 'Nick'), id, 1, CONCAT(name, '@mydomain.com'), 'en', '4fa3ada0-3ac4-11eb-9ab8-27f6fc3b85fd', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2'
-        FROM `account`.`role` WHERE id <> 20
+        FROM `account`.`role`
             ORDER BY id;
 
 INSERT INTO `account`.`account`(`id`)
@@ -87,9 +83,15 @@ INSERT INTO `vn`.`educationLevel` (`id`, `name`)
 		(1, 'ESTUDIOS PRIMARIOS COMPLETOS'),
 		(2, 'ENSEÑANZAS DE BACHILLERATO');
 
+INSERT INTO `vn`.`worker`(`id`,`code`, `firstName`, `lastName`, `bossFk`)
+    SELECT id,UPPER(LPAD(role, 3, '0')), name, name, NULL
+        FROM `account`.`user`
+            WHERE `id` = 9;
+
 INSERT INTO `vn`.`worker`(`id`,`code`, `firstName`, `lastName`, `bossFk`)
     SELECT id,UPPER(LPAD(role, 3, '0')), name, name, 9
-        FROM `account`.`user`;
+        FROM `account`.`user`
+            WHERE `id` <> 9;
 
 UPDATE `vn`.`worker` SET bossFk = NULL WHERE id = 20;
 UPDATE `vn`.`worker` SET bossFk = 20 WHERE id = 1 OR id = 9;
@@ -549,15 +551,6 @@ INSERT INTO `vn`.`supplierActivity`(`code`, `name`)
         ('flowerPlants',  'Wholesale of flowers and plants'),
         ('vegetablesFruits', 'Fruit and vegetable trade');
 
-INSERT INTO `vn`.`supplierAddress`(`id`, `supplierFk`, `nickname`, `street`, `provinceFk`, `postalCode`, `city`, `phone`, `mobile`)
-    VALUES
-        (1, 1,   'Ace Chemicals',                 'The Midtown',      1, '46000', 'Gotham', '111111111', '222222222'),
-        (2, 1,   'Arkham Asylum',                 'Grand Avenue',     1, '46000', 'Gotham', '111111111', '222222222'),
-        (3, 2,   'Wayne Tower',                   'Grand Avenue',     1, '46000', 'Gotham', '111111111', '222222222'),
-        (4, 2,   'Bank of Gotham',                'Founders Island',  1, '46000', 'Gotham', '111111111', '222222222'),
-        (5, 442, 'GCR building',                  'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222'),
-        (6, 442, 'The Gotham Tonight building',   'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222');
-
 INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`, `healthRegister`)
     VALUES
         (1,     'Plants SL',                'Plants nick',      4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA',    1, 15214, 1, 1, 15, 4,  1, 1, 18, 'flowerPlants',  1, '400664487V'),
@@ -568,6 +561,15 @@ INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`
         (791,   'Bros SL',                  'Bros nick',        5115000791, 1, '37718083S', 0, util.VN_CURDATE(), 1, 'supplier address 7', 'ASGARD',        3, 46600, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V'),
         (1381,  'Ornamentales',             'Ornamentales',     7185001381, 1, '07972486L', 0, util.VN_CURDATE(), 1, 'supplier address 4', 'GOTHAM',        1, 43022, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V');
 
+INSERT INTO `vn`.`supplierAddress`(`id`, `supplierFk`, `nickname`, `street`, `provinceFk`, `postalCode`, `city`, `phone`, `mobile`)
+    VALUES
+        (1, 1,   'Ace Chemicals',                 'The Midtown',      1, '46000', 'Gotham', '111111111', '222222222'),
+        (2, 1,   'Arkham Asylum',                 'Grand Avenue',     1, '46000', 'Gotham', '111111111', '222222222'),
+        (3, 2,   'Wayne Tower',                   'Grand Avenue',     1, '46000', 'Gotham', '111111111', '222222222'),
+        (4, 2,   'Bank of Gotham',                'Founders Island',  1, '46000', 'Gotham', '111111111', '222222222'),
+        (5, 442, 'GCR building',                  'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222'),
+        (6, 442, 'The Gotham Tonight building',   'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222');
+
 INSERT INTO `vn`.`supplierContact`(`id`, `supplierFk`, `phone`, `mobile`, `email`, `observation`, `name`)
     VALUES
         (1, 1,    123121212, 654789123,     'supplier1@email.es',   'observation1',     'the boss'),
@@ -966,6 +968,10 @@ INSERT INTO `vn`.`packaging`(`id`, `volume`, `width`, `height`, `depth`, `isPack
         ('cc',          1640038.00, 56.00,  220.00, 128.00, 1, util.VN_CURDATE(), 15,   90.00),
         ('pallet 100',  2745600.00, 100.00, 220.00, 120.00, 1, util.VN_CURDATE(), 16,   0.00);
 
+INSERT INTO `vn`.`packagingConfig`(`upperGap`, `defaultSmallPackageFk`, `defaultBigPackageFk`)
+    VALUES
+        ('10', 1, 'pallet 100');
+
 INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`)
     VALUES
         (1, 'En reparto', 'ON DELIVERY'),

db/export-data.sh

@@ -45,12 +45,12 @@ TABLES=(
     alertLevel
     bookingPlanner
     businessType
-    cplusInvoiceType472
+    siiTypeInvoiceIn
     siiTypeInvoiceOut
     cplusRectificationType
     cplusSubjectOp
     cplusTaxBreak
-    cplusTrascendency472
+    siiTrascendencyInvoiceIn
     claimResponsible
     claimReason
     claimRedelivery
@@ -68,6 +68,8 @@ TABLES=(
     volumeConfig
     workCenter
     companyI18n
+    workerTimeControlError
+    silexACL
 )
 dump_tables ${TABLES[@]}
 

e2e/helpers/selectors.js

@@ -145,6 +145,7 @@ export default {
         adController: 'vn-account-samba vn-textfield[ng-model="$ctrl.config.adController"]',
         adUser: 'vn-account-samba vn-textfield[ng-model="$ctrl.config.adUser"]',
         adPassword: 'vn-account-samba vn-textfield[ng-model="$ctrl.config.adPassword"]',
+        userDn: 'vn-account-samba vn-textfield[ng-model="$ctrl.config.userDn"]',
         verifyCert: 'vn-account-samba vn-check[ng-model="$ctrl.config.verifyCert"]',
         save: 'vn-account-samba vn-submit'
     },

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

@@ -22,7 +22,7 @@ describe('Travel basic data path', () => {
         await page.waitForState('travel.card.basicData');
     });
 
-    it('should set a wrong delivery date then receive an error on submit', async() => {
+    it('should throw error if try move a travel with entries', async() => {
         const lastMonth = Date.vnNew();
         lastMonth.setMonth(lastMonth.getMonth() - 1);
 
@@ -30,6 +30,23 @@ describe('Travel basic data path', () => {
         await page.waitToClick(selectors.travelBasicData.save);
         const message = await page.waitForSnackbar();
 
+        expect(message.text).toContain('Cannot past travels with entries');
+    });
+
+    it('should set a wrong delivery date then receive an error on submit', async() => {
+        await page.loginAndModule('buyer', 'travel');
+        await page.write(selectors.travelIndex.generalSearchFilter, '4');
+        await page.keyboard.press('Enter');
+        await page.accessToSection('travel.card.basicData');
+        await page.waitForState('travel.card.basicData');
+
+        const lastMonth = Date.vnNew();
+        lastMonth.setMonth(lastMonth.getMonth() - 2);
+
+        await page.pickDate(selectors.travelBasicData.deliveryDate, lastMonth);
+        await page.waitToClick(selectors.travelBasicData.save);
+        const message = await page.waitForSnackbar();
+
         expect(message.text).toContain('Landing cannot be lesser than shipment');
     });
 
@@ -39,7 +56,7 @@ describe('Travel basic data path', () => {
         await page.waitToClick(selectors.travelBasicData.undoChanges);
         const result = await page.waitToGetProperty(selectors.travelBasicData.reference, 'value');
 
-        expect(result).toEqual('third travel');
+        expect(result).toEqual('fourth travel');
     });
 
     it('should now edit the whole form then save', async() => {

e2e/paths/14-account/06_accounts.spec.js

@@ -23,18 +23,6 @@ describe('Account Accounts path', () => {
         expect(message.text).toContain('Roles synchronized!');
     });
 
-    it('should sync user', async() => {
-        await page.waitToClick(selectors.accountAccounts.syncUser);
-        await page.write(selectors.accountAccounts.syncUserName, 'sysadmin');
-        await page.write(selectors.accountAccounts.syncUserPassword, 'nightmare');
-
-        await page.waitToClick(selectors.accountAccounts.buttonAccept);
-
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('User synchronized!');
-    });
-
     it('should relogin', async() => {
         await page.loginAndModule('sysadmin', 'account');
         await page.accessToSection('account.accounts');

e2e/paths/14-account/08_samba.spec.js

@@ -20,8 +20,9 @@ describe('Account Samba path', () => {
         await page.waitToClick(selectors.accountSamba.checkEnable);
         await page.write(selectors.accountSamba.adDomain, '1234');
         await page.write(selectors.accountSamba.adController, '1234');
-        await page.write(selectors.accountSamba.adUser, 'nightmare');
-        await page.write(selectors.accountSamba.adPassword, 'sysadmin');
+        await page.write(selectors.accountSamba.adUser, 'sysadmin');
+        await page.write(selectors.accountSamba.adPassword, 'nightmare');
+        await page.write(selectors.accountSamba.userDn, 'testDn');
         await page.waitToClick(selectors.accountSamba.verifyCert);
         await page.waitToClick(selectors.accountSamba.save);
 

loopback/locale/es.json

@@ -327,5 +327,6 @@
 	"The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
 	"User disabled": "Usuario desactivado",
 	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
-	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima"
+	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
+	"Cannot past travels with entries": "No se pueden pasar envíos con entradas"
 }

modules/client/back/methods/client/filter.js

@@ -82,12 +82,15 @@ module.exports = Self => {
         if (args.zoneFk) {
             let stmts = [];
             stmts.push(new ParameterizedSQL('CALL vn.zone_getPostalCode(?)', [args.zoneFk]));
-            stmts.push(`SELECT name FROM tmp.zoneNodes`);
+            stmts.push(`
+                SELECT zn.geoFk, zn.name
+                    FROM tmp.zoneNodes zn
+                        JOIN zone z ON z.id = zn.zoneFk`);
             stmts.push(`DROP TEMPORARY TABLE tmp.zoneNodes`);
             const sql = ParameterizedSQL.join(stmts, ';');
-            const [results] = await conn.executeStmt(sql);
+            const results = await conn.executeStmt(sql);
 
-            for (let result of results)
+            for (let result of results[1])
                 postalCode.push(result.name);
         }
 

modules/invoiceIn/back/methods/invoice-in/getTotals.js

@@ -29,15 +29,18 @@ module.exports = Self => {
             SELECT iit.*,
                     SUM(iidd.amount) totalDueDay
                 FROM vn.invoiceIn ii
-                    LEFT JOIN (SELECT SUM(iit.taxableBase) totalTaxableBase,
-                                CAST(SUM(iit.taxableBase * (1 + (ti.PorcentajeIva / 100))) AS DECIMAL(10,2)) totalVat
+                    LEFT JOIN (
+                        SELECT SUM(iit.taxableBase) totalTaxableBase,
+                                CAST(
+                                    SUM(IFNULL(iit.taxableBase * (1 + (ti.PorcentajeIva / 100)), iit.taxableBase)) 
+                                        AS DECIMAL(10, 2)
+                                ) totalVat
                             FROM vn.invoiceInTax iit 
                                 LEFT JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk 
-                            WHERE iit.invoiceInFk = ?) iit ON TRUE
+                            WHERE iit.invoiceInFk = ?
+                    ) iit ON TRUE
                     LEFT JOIN vn.invoiceInDueDay iidd ON iidd.invoiceInFk = ii.id 
-                WHERE
-                    ii.id = ?`, [id, id]);
-
+                WHERE ii.id = ?`, [id, id]);
         return result;
     };
 };

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

@@ -163,60 +163,68 @@ module.exports = Self => {
         const stmts = [];
         let stmt;
         
-        stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.filter');
-
         stmts.push(`SET @_optimizer_search_depth = @@optimizer_search_depth`);
         stmts.push(`SET SESSION optimizer_search_depth = 0`);
 
-        stmt = new ParameterizedSQL(
-            `CREATE TEMPORARY TABLE tmp.filter
+        stmt = new ParameterizedSQL(`
+            CREATE OR REPLACE TEMPORARY TABLE tmp.filter
                 (PRIMARY KEY (id))
                 ENGINE = MEMORY
-                    SELECT
-                        t.id,
-                        t.shipped,
-                        CAST(DATE(t.shipped) AS CHAR) AS shippedDate,
-                        t.nickname,
-                        t.refFk,
-                        t.routeFk,
-                        t.warehouseFk,
-                        t.clientFk,
-                        t.totalWithoutVat,
-                        t.totalWithVat,
-                        io.id AS invoiceOutId,
-                        a.provinceFk,
-                        p.name AS province,
-                        w.name AS warehouse,
-                        am.name AS agencyMode,
-                        am.id AS agencyModeFk,
-                        st.name AS state,
-                        wk.lastName AS salesPerson,
-                        ts.stateFk AS stateFk,
-                        ts.alertLevel AS alertLevel,
-                        ts.code AS alertLevelCode,
-                        u.name AS userName,
-                        c.salesPersonFk,
-                        c.credit,
-                        z.hour AS zoneLanding,
-                        z.name AS zoneName,
-                        z.id AS zoneFk,
-                        st.classColor,
-                        TIME_FORMAT(t.shipped, '%H:%i') AS preparationHour,
-                        TIME_FORMAT(z.hour, '%H:%i') AS theoreticalhour,
-                        TIME_FORMAT(zed.etc, '%H:%i') AS practicalHour
-                    FROM ticket t
-                        LEFT JOIN invoiceOut io ON t.refFk = io.ref
-                        LEFT JOIN zone z ON z.id = t.zoneFk
-                        LEFT JOIN address a ON a.id = t.addressFk
-                        LEFT JOIN province p ON p.id = a.provinceFk
-                        LEFT JOIN warehouse w ON w.id = t.warehouseFk
-                        LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
-                        LEFT JOIN ticketState ts ON ts.ticketFk = t.id
-                        LEFT JOIN state st ON st.id = ts.stateFk
-                        LEFT JOIN client c ON c.id = t.clientFk
-                        LEFT JOIN worker wk ON wk.id = c.salesPersonFk
-                        LEFT JOIN account.user u ON u.id = wk.id
-                        LEFT JOIN zoneEstimatedDelivery zed ON zed.zoneFk = t.zoneFk`);
+                SELECT t.id,
+                    t.shipped,
+                    CAST(DATE(t.shipped) AS CHAR) shippedDate,
+                    t.nickname,
+                    t.refFk,
+                    t.routeFk,
+                    t.warehouseFk,
+                    t.clientFk,
+                    t.totalWithoutVat,
+                    t.totalWithVat,
+                    io.id invoiceOutId,
+                    a.provinceFk,
+                    p.name province,
+                    w.name warehouse,
+                    am.name agencyMode,
+                    am.id agencyModeFk,
+                    st.name state,
+                    wk.lastName salesPerson,
+                    ts.stateFk stateFk,
+                    ts.alertLevel alertLevel,
+                    ts.code alertLevelCode,
+                    u.name userName,
+                    c.salesPersonFk,
+                    c.credit,
+                    z.hour zoneLanding,
+                    z.name zoneName,
+                    z.id zoneFk,
+                    st.classColor,
+                    TIME_FORMAT(t.shipped, '%H:%i') preparationHour,
+                    TIME_FORMAT(z.hour, '%H:%i') theoreticalhour,
+                    TIME_FORMAT(zed.etc, '%H:%i') practicalHour
+                FROM ticket t
+                    LEFT JOIN invoiceOut io ON t.refFk = io.ref
+                    LEFT JOIN zone z ON z.id = t.zoneFk
+                    LEFT JOIN address a ON a.id = t.addressFk
+                    LEFT JOIN province p ON p.id = a.provinceFk
+                    LEFT JOIN warehouse w ON w.id = t.warehouseFk
+                    LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
+                    LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+                    LEFT JOIN state st ON st.id = ts.stateFk
+                    LEFT JOIN client c ON c.id = t.clientFk
+                    LEFT JOIN worker wk ON wk.id = c.salesPersonFk
+                    LEFT JOIN account.user u ON u.id = wk.id
+                    LEFT JOIN (
+                        SELECT zoneFk,
+                            CAST(
+                                IFNULL(zoneClosureHour, zoneHour) +
+                                    SUM(IF(hasToRecalcPrice, volume, 0)) * 60 /
+                                    GREATEST(IFNULL(m3, 0), IFNULL(minSpeed, 0))
+                                AS time
+                            ) etc
+                            FROM zoneEstimatedDelivery
+                            GROUP BY zoneFk
+                    ) zed ON zed.zoneFk = t.zoneFk
+        `);
 
         if (args.orderFk) {
             stmt.merge({

modules/order/back/methods/order/filter.js

@@ -139,46 +139,65 @@ module.exports = Self => {
         filter = mergeFilters(filter, {where});
         const stmts = [];
         let stmt;
+        stmts.push(`SET @_optimizer_search_depth = @@optimizer_search_depth`);
+        stmts.push(`SET SESSION optimizer_search_depth = 0`);
 
-        stmt = new ParameterizedSQL(
-            `CREATE OR REPLACE TEMPORARY TABLE tmp.filter
-            (INDEX (id))
-            ENGINE = MEMORY
-            SELECT
-                o.id,
-                o.total,
-                o.date_send landed,
-                o.date_make created,
-                o.customer_id clientFk,
-                o.agency_id agencyModeFk,
-                o.address_id addressFk,
-                o.company_id companyFk,
-                o.source_app sourceApp,
-                o.confirmed isConfirmed,
-                c.name clientName,
-                c.salesPersonFk,
-                u.nickname workerNickname,
-                u.name name,
-                co.code companyCode,
-                zed.zoneFk,
-                zed.hourTheoretical,
-                zed.hourEffective,
-                am.name AS agencyName
-            FROM hedera.order o
-                LEFT JOIN address a ON a.id = o.address_id
-                LEFT JOIN agencyMode am ON am.id = o.agency_id
-                LEFT JOIN client c ON c.id = o.customer_id
-                LEFT JOIN worker wk ON wk.id = c.salesPersonFk
-                LEFT JOIN account.user u ON u.id = wk.id
-                LEFT JOIN company co ON co.id = o.company_id
-                LEFT JOIN orderTicket ot ON ot.orderFk = o.id
-                LEFT JOIN ticket t ON t.id = ot.ticketFk
-                LEFT JOIN zoneEstimatedDelivery zed ON zed.zoneFk = t.zoneFk`);
+        stmt = new ParameterizedSQL(`
+            CREATE OR REPLACE TEMPORARY TABLE tmp.filter
+                (INDEX (id))
+                ENGINE = MEMORY
+                SELECT o.id,
+                    o.total,
+                    o.date_send landed,
+                    o.date_make created,
+                    o.customer_id clientFk,
+                    o.agency_id agencyModeFk,
+                    o.address_id addressFk,
+                    o.company_id companyFk,
+                    o.source_app sourceApp,
+                    o.confirmed isConfirmed,
+                    c.name clientName,
+                    c.salesPersonFk,
+                    u.nickname workerNickname,
+                    u.name name,
+                    co.code companyCode,
+                    zed.zoneFk,
+                    zed.hourTheoretical,
+                    zed.hourEffective,
+                    am.name agencyName
+                FROM hedera.order o
+                    LEFT JOIN address a ON a.id = o.address_id
+                    LEFT JOIN agencyMode am ON am.id = o.agency_id
+                    LEFT JOIN client c ON c.id = o.customer_id
+                    LEFT JOIN worker wk ON wk.id = c.salesPersonFk
+                    LEFT JOIN account.user u ON u.id = wk.id
+                    LEFT JOIN company co ON co.id = o.company_id
+                    LEFT JOIN orderTicket ot ON ot.orderFk = o.id
+                    LEFT JOIN ticket t ON t.id = ot.ticketFk
+                    LEFT JOIN (
+                        SELECT zoneFk,
+                                CAST(
+                                    util.VN_CURDATE() +
+                                    INTERVAL HOUR(IFNULL(zoneClosureHour, zoneHour)) * 60 +
+                                        MINUTE(IFNULL(zoneClosureHour, zoneHour)) MINUTE
+                                    AS time
+                                ) hourTheoretical,
+                                CAST(
+                                    IFNULL(zoneClosureHour, zoneHour) +
+                                        SUM(IF(hasToRecalcPrice, volume, 0)) * 60 /
+                                        GREATEST(IFNULL(m3, 0), IFNULL(minSpeed, 0))
+                                    AS time
+                                ) hourEffective
+                            FROM zoneEstimatedDelivery
+                            GROUP BY zoneFk
+                    ) zed ON zed.zoneFk = t.zoneFk
+        `);
 
         stmt.merge(conn.makeWhere(filter.where));
         stmt.merge(`GROUP BY id`);
         stmt.merge(conn.makePagination(filter));
         stmts.push(stmt);
+        stmts.push(`SET SESSION optimizer_search_depth = @_optimizer_search_depth`);
 
         stmt = new ParameterizedSQL(`SELECT * FROM tmp.filter`);
         stmt.merge(conn.makeOrderBy(filter.order));

modules/route/back/methods/route/filter.js

@@ -105,7 +105,7 @@ module.exports = Self => {
             }
         });
 
-        filter = mergeFilters(ctx.args.filter, {where});
+        filter = mergeFilters(filter, {where});
 
         let stmts = [];
         let stmt;
@@ -129,9 +129,11 @@ module.exports = Self => {
                 r.description,
                 am.name agencyName,
                 u.name AS workerUserName,
-                v.numberPlate AS vehiclePlateNumber
+                v.numberPlate AS vehiclePlateNumber,
+                Date_format(r.time, '%H:%i') hour
             FROM route r
                 LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
+                LEFT JOIN agency a ON a.id = am.agencyFk
                 LEFT JOIN vehicle v ON v.id = r.vehicleFk
                 LEFT JOIN worker w ON w.id = r.workerFk
                 LEFT JOIN account.user u ON u.id = w.id`

modules/route/back/methods/route/getByWorker.js

@@ -0,0 +1,65 @@
+const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
+
+module.exports = Self => {
+    Self.remoteMethodCtx('getByWorker', {
+        description: 'Return the routes by worker',
+        accessType: 'READ',
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/getByWorker`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getByWorker = async ctx => {
+        const models = Self.app.models;
+        const userId = ctx.req.accessToken.userId;
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const canViewAll = await models.ACL.checkAccessAcl(ctx, 'Route', 'canViewAllRoute', 'READ');
+        let filterGrant = {};
+
+        if (canViewAll) {
+            const userConfig = await models.UserConfig.getUserConfig(ctx, myOptions);
+            filterGrant = {
+                where: {'a.warehouseFk': userConfig.warehouseFk}
+            };
+        } else {
+            filterGrant = {
+                where: {'r.workerFk': userId}
+            };
+        }
+
+        const currentDate = Date.vnNew();
+        currentDate.setHours(0, 0, 0, 0);
+        const nextDay = Date.vnNew();
+        nextDay.setDate(currentDate.getDate() + 1);
+
+        const filter = {
+            where: {
+                and: [
+                    {
+                        or: [
+                            {'r.created': currentDate},
+                            {'r.created': nextDay}
+                        ]
+                    }
+                ]
+            },
+            order: [
+                'r.created ASC',
+                'r.time ASC',
+                'am.name ASC'
+            ]
+        };
+
+        const result = await Self.filter(ctx, mergeFilters(filter, filterGrant));
+        return result;
+    };
+};

modules/route/back/methods/route/getDeliveryPoint.js

@@ -1,7 +1,7 @@
 module.exports = Self => {
     Self.remoteMethod('getDeliveryPoint', {
         description: 'get the deliveryPoint address',
-        accessType: 'WRITE',
+        accessType: 'READ',
         accepts: {
             arg: 'vehicleId',
             type: 'number',

modules/route/back/methods/route/guessPriority.js

@@ -1,7 +1,7 @@
 module.exports = Self => {
     Self.remoteMethodCtx('guessPriority', {
         description: 'Changes automatically the priority of the tickets in a route',
-        accessType: 'READ',
+        accessType: 'WRITE',
         accepts: [{
             arg: 'id',
             type: 'number',
@@ -15,7 +15,7 @@ module.exports = Self => {
         },
         http: {
             path: `/:id/guessPriority`,
-            verb: 'GET'
+            verb: 'PATCH'
         }
     });
 

modules/route/back/methods/route/insertTicket.js

@@ -3,7 +3,7 @@ const UserError = require('vn-loopback/util/user-error');
 module.exports = Self => {
     Self.remoteMethod('insertTicket', {
         description: 'Check if the ticket can be insert into the route and insert it',
-        accessType: 'READ',
+        accessType: 'WRITE',
         accepts: [{
             arg: 'routeId',
             type: 'number',

modules/route/back/methods/route/specs/getByWorker.spec.js

@@ -0,0 +1,36 @@
+const app = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
+
+describe('route getByWorker()', () => {
+    const userId = 56;
+    const activeCtx = {
+        accessToken: {userId: userId},
+        http: {
+            req: {
+                headers: {origin: 'http://localhost'}
+            }
+        }
+    };
+    const ctx = {req: activeCtx};
+
+    beforeAll(() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
+    it('should return routes assigned to the worker', async() => {
+        const result = await app.models.Route.getByWorker(ctx);
+
+        expect(result.every(route => route.workerFk === userId)).toBe(true);
+    });
+
+    it('should return all routes if user has canViewAllRoute permission', async() => {
+        // Simular que el usuario tiene permiso para ver todas las rutas
+        spyOn(app.models.ACL, 'checkAccessAcl').and.returnValue(Promise.resolve(true));
+
+        const result = await app.models.Route.getByWorker(ctx);
+
+        expect(result.some(route => route.workerFk != userId)).toBe(true);
+    });
+});

modules/route/back/models/route.js

@@ -17,6 +17,7 @@ module.exports = Self => {
     require('../methods/route/cmr')(Self);
     require('../methods/route/getExternalCmrs')(Self);
     require('../methods/route/downloadCmrsZip')(Self);
+    require('../methods/route/getByWorker')(Self);
 
     Self.validate('kmStart', validateDistance, {
         message: 'Distance must be lesser than 1000'
@@ -31,5 +32,5 @@ module.exports = Self => {
         const routeMaxKm = 1000;
         if (routeTotalKm > routeMaxKm || this.kmStart > this.kmEnd)
             err();
-    };
+    }
 };

modules/route/front/tickets/index.js

@@ -120,7 +120,7 @@ class Controller extends Section {
 
     guessPriority() {
         let query = `Routes/${this.$params.id}/guessPriority/`;
-        this.$http.get(query).then(() => {
+        this.$http.patch(query).then(() => {
             this.vnApp.showSuccess(this.$t('Order changed'));
             this.$.model.refresh();
         });

modules/route/front/tickets/index.spec.js

@@ -209,22 +209,6 @@ describe('Route', () => {
         });
     });
 
-    describe('guessPriority()', () => {
-        it('should perform a GET query then call both refresh and showSuccess methods', () => {
-            jest.spyOn(controller.$.model, 'refresh');
-            jest.spyOn(controller.vnApp, 'showSuccess');
-            controller.$params = {id: 99};
-
-            const url = `Routes/${controller.$params.id}/guessPriority/`;
-            $httpBackend.expectGET(url).respond('ok');
-            controller.guessPriority();
-            $httpBackend.flush();
-
-            expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Order changed');
-            expect(controller.$.model.refresh).toHaveBeenCalledWith();
-        });
-    });
-
     describe('onDrop()', () => {
         it('should call the insert method when dragging a ticket number', () => {
             jest.spyOn(controller, 'insert');

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

@@ -3,33 +3,30 @@ const LoopBackContext = require('loopback-context');
 
 describe('ticket addSale()', () => {
     const ticketId = 13;
-    beforeAll(async() => {
-        const activeCtx = {
-            accessToken: {userId: 9},
+    function getActiveCtx(userId) {
+        return {
+            accessToken: {userId},
             http: {
                 req: {
-                    headers: {origin: 'http://localhost'}
+                    accessToken: {userId},
+                    headers: {origin: 'http://localhost'},
+                    __: () => {}
                 }
             }
         };
-        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
-            active: activeCtx
-        });
-    });
+    }
 
     it('should create a new sale for the ticket with id 13', async() => {
         const tx = await models.Ticket.beginTransaction({});
+        const activeCtx = getActiveCtx(9);
+        const ctx = activeCtx.http;
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
 
         try {
             const options = {transaction: tx};
 
-            const ctx = {
-                req: {
-                    accessToken: {userId: 9},
-                    headers: {origin: 'localhost:5000'},
-                    __: () => {}
-                }
-            };
             const itemId = 4;
             const quantity = 10;
             const newSale = await models.Ticket.addSale(ctx, ticketId, itemId, quantity, options);
@@ -45,19 +42,16 @@ describe('ticket addSale()', () => {
 
     it('should not be able to add a sale if the item quantity is not available', async() => {
         const tx = await models.Ticket.beginTransaction({});
+        const activeCtx = getActiveCtx(18);
+        const ctx = activeCtx.http;
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
 
         let error;
-
         try {
             const options = {transaction: tx};
 
-            const ctx = {
-                req: {
-                    accessToken: {userId: 9},
-                    headers: {origin: 'localhost:5000'},
-                    __: () => {}
-                }
-            };
             const itemId = 11;
             const quantity = 10;
 
@@ -74,18 +68,16 @@ describe('ticket addSale()', () => {
 
     it('should not be able to add a sale if the ticket is not editable', async() => {
         const tx = await models.Ticket.beginTransaction({});
+        const activeCtx = getActiveCtx(9);
+        const ctx = activeCtx.http;
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
 
         let error;
-
         try {
             const options = {transaction: tx};
-            const ctx = {
-                req: {
-                    accessToken: {userId: 9},
-                    headers: {origin: 'localhost:5000'},
-                    __: () => {}
-                }
-            };
+
             const notEditableTicketId = 1;
             const itemId = 4;
             const quantity = 10;

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

@@ -9,7 +9,7 @@ describe('ticket getSalesPersonMana()', () => {
 
             const mana = await models.Ticket.getSalesPersonMana(1, options);
 
-            expect(mana).toEqual(124);
+            expect(mana).toEqual(73);
 
             await tx.rollback();
         } catch (e) {

modules/travel/front/search-panel/index.js

@@ -37,17 +37,8 @@ class Controller extends SearchPanel {
     }
 
     applyFilters(param) {
-        if (typeof this.filter.scopeDays === 'number') {
-            const today = Date.vnNew();
-            const shippedFrom = new Date(today.getTime());
-            shippedFrom.setDate(today.getDate() - 30);
-            shippedFrom.setHours(0, 0, 0, 0);
-
-            const shippedTo = new Date(today.getTime());
-            shippedTo.setDate(shippedTo.getDate() + this.filter.scopeDays);
-            shippedTo.setHours(23, 59, 59, 999);
-            Object.assign(this.filter, {shippedFrom, shippedTo});
-        }
+        if (this.filter?.search)
+            delete this.filter.scopeDays;
 
         this.model.applyFilter({}, this.filter)
             .then(() => {

modules/zone/back/models/zone-estimated-delivery.json

@@ -11,28 +11,24 @@
 			"id": true,
 			"type": "number"
 		},
-		"hourTheoretical": {
+		"zoneClosureHour": {
 			"type": "date"
 		},
-		"totalVolume": {
+		"zoneHour": {
+			"type": "date"
+		},
+		"volume": {
 			"type": "number"
 		},
-		"remainingVolume": {
+		"hasToRecalcPrice": {
+			"type": "boolean"
+		},
+		"m3": {
 			"type": "number"
 		},
-		"speed": {
+		"minSpeed": {
 			"type": "number"
-		},
-		"hourEffective": {
-			"type": "date"
-		},
-		"minutesLess": {
-			"type": "date"
-		},
-		"etc": {
-			"type": "date"
 		}
-		
 	},
 	"relations": {
 		"zone": {

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "salix-back",
-    "version": "23.48.01",
+    "version": "23.50.01",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "salix-back",
-            "version": "23.48.01",
+            "version": "23.50.01",
             "license": "GPL-3.0",
             "dependencies": {
                 "axios": "^1.2.2",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "23.48.01",
+    "version": "23.50.01",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",

print/templates/reports/expedition-pallet-label/assets/css/style.css

@@ -56,9 +56,6 @@ html {
 	margin-left: 35px;
 	float:left;
 }
-#barcode{
-	text-align: center;
-}
 #right {
 	float: right;
 	margin-top: 20px;

print/templates/reports/expedition-pallet-label/expedition-pallet-label.html

@@ -9,7 +9,6 @@
             </tr>
             <tr>
                 <td>
-                    <div v-html="getBarcode(labelData.palletFk)" id="barcode"></div>
                     <table v-for="labelData in labelsData" class="zoneTable">
                         <thead>
                             <tr v-if="!labelData.isMatch" id="black">

print/templates/reports/expedition-pallet-label/expedition-pallet-label.js

@@ -39,19 +39,5 @@ module.exports = {
             const data = String(id);
             return qrcode.toDataURL(data, {margin: 0});
         },
-        getBarcode(id) {
-            const xmlSerializer = new XMLSerializer();
-            const document = new DOMImplementation().createDocument('http://www.w3.org/1999/xhtml', 'html', null);
-            const svgNode = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
-
-            jsBarcode(svgNode, id, {
-                xmlDocument: document,
-                format: 'code128',
-                displayValue: false,
-                width: 6,
-                height: 90,
-            });
-            return xmlSerializer.serializeToString(svgNode);
-        },
     },
 };