Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

db/routines/vn/procedures/itemShelving_inventory.sql

@@ -24,7 +24,7 @@ BEGIN
 	SELECT ish.id,
 			p.pickingOrder,
 			p.code parking,
-			ish.shelvingFk,
+			sh.code,
 			ish.itemFk,
 			i.longName,
 			ish.visible,

db/routines/vn/triggers/buy_beforeUpdate.sql

@@ -20,6 +20,7 @@ trig:BEGIN
 		THEN
 
 		CALL entry_isEditable(OLD.entryFk);
+		CALL entry_isEditable(NEW.entryFk);
 	END IF;
 
 	SET NEW.editorFk = account.myUser_getId();

db/routines/vn/triggers/zoneIncluded_afterDelete.sql

@@ -6,8 +6,7 @@ BEGIN
 	INSERT INTO zoneLog
 		SET `action` = 'delete',
 			`changedModel` = 'zoneIncluded',
-			`changedModelId` = OLD.zoneFk,
+			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
-
 END$$
 DELIMITER ;

loopback/locale/en.json

@@ -253,5 +253,5 @@
 	"Sales already moved": "Sales already moved",
 	"Holidays to past days not available": "Holidays to past days not available",
 	"Incorrect delivery order alert on route": "Incorrect delivery order alert on route: {{ route }} zone: {{ zone }}",
-	"Ticket has been delivered out of order": "The ticket {{ticket}} {{{fullUrl}}} has been delivered out of order."
+	"Ticket has been delivered out of order": "The ticket {{ticket}} of route {{{fullUrl}}} has been delivered out of order."
 }

loopback/locale/es.json

@@ -397,4 +397,5 @@
     "Incorrect delivery order alert on route": "Alerta de orden de entrega incorrecta en ruta: {{ route }} zona: {{ zone }}",
     "Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sido entregado en su orden.",
     "Price cannot be blank": "El precio no puede estar en blanco"
+
 }

loopback/locale/fr.json

@@ -368,5 +368,5 @@
 	"ticketLostExpedition": "Le ticket [{{ticketId}}]({{{ticketUrl}}}) a l'expédition perdue suivante : {{expeditionId}}",
 	"The web user's email already exists": "L'email de l'internaute existe déjà",
 	"Incorrect delivery order alert on route": "Alerte de bon de livraison incorrect sur l'itinéraire: {{ route }} zone : {{ zone }}",
-	"Ticket has been delivered out of order": "Le ticket {{ticket}} {{{fullUrl}}} a été livré hors ordre."
+	"Ticket has been delivered out of order": "Le ticket {{ticket}} de la route {{{fullUrl}}} a été livré hors service."
 }

loopback/locale/pt.json

@@ -367,5 +367,5 @@
 	"ticketLostExpedition": "O ticket [{{ticketId}}]({{{ticketUrl}}}) tem a seguinte expedição perdida: {{expeditionId}}",
 	"The web user's email already exists": "O e-mail do utilizador da web já existe.",
 	"Incorrect delivery order alert on route": "Alerta de ordem de entrega incorreta na rota: {{ route }} zona: {{ zone }}",
-	"Ticket has been delivered out of order": "O ticket {{ticket}} {{{fullUrl}}} foi entregue fora de ordem."
+	"Ticket has been delivered out of order": "O ticket {{ticket}} da rota {{{fullUrl}}} foi entregue fora de ordem."
 }

modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js

@@ -109,7 +109,8 @@ module.exports = Self => {
                         where: {
                             clientFk: clientFk,
                             shipped: {lte: maxShipped}
-                        }
+                        },
+                        order: 'shipped DESC'
                     }, myOptions);
                     companyFk = company.companyFk;
                 }

modules/item/back/methods/item-shelving/getItemsByReviewOrder.js

@@ -52,7 +52,9 @@ module.exports = Self => {
                     JOIN vn.shelving sh ON sh.id = is2.shelvingFk
                     LEFT JOIN vn.parking p ON p.id = sh.parkingFk
                     LEFT JOIN vn.sector s ON s.id = p.sectorFk
-                WHERE sh.code = ? AND (? IS NULL OR is2.itemFk = ?)
+                WHERE sh.code = ?
+                    AND (? IS NULL OR is2.itemFk = ?)
+                    AND is2.visible > 0
             ),
             itemShelvings AS (
                 SELECT is2.itemFk, is2.created, sh.code, p.pickingOrder, p.code AS parkingFk
@@ -61,6 +63,7 @@ module.exports = Self => {
                     JOIN vn.shelving sh ON sh.id = is2.shelvingFk AND ai.code <> sh.code
                     JOIN vn.parking p ON p.id = sh.parkingFk
                     JOIN vn.sector s ON s.id = p.sectorFk
+                WHERE is2.visible > 0
             ),
             parkingDestiny AS (
                 SELECT ? AS pickingOrder

modules/ticket/back/methods/ticket/saveSign.js

@@ -1,4 +1,5 @@
 const UserError = require('vn-loopback/util/user-error');
+const smtp = require('vn-print/core/smtp');
 
 module.exports = Self => {
     Self.remoteMethodCtx('saveSign', {
@@ -31,6 +32,7 @@ module.exports = Self => {
     Self.saveSign = async(ctx, tickets, location, signedTime, options) => {
         const models = Self.app.models;
         const myOptions = {userId: ctx.req.accessToken.userId};
+        const url = await Self.app.models.Url.getUrl('lilium');
         let tx;
         let ticket;
         let dms;
@@ -159,23 +161,24 @@ module.exports = Self => {
                 if (stateCode == 'DELIVERED' && ticket.priority) {
                     const orderState = await models.State.findOne({
                         where: {code: 'DELIVERED'},
-                        fields: ['id']
+                        fields: ['order']
                     }, myOptions);
 
                     const ticketIncorrect = await Self.rawSql(`
-                        SELECT t.id
+                        SELECT tls.ticketFk
-                        FROM ticket t
+                            FROM ticketLastState tls
-                            JOIN ticketState ts ON ts.ticketFk = t.id
+                                JOIN ticketTracking tt ON tt.id = tls.ticketTrackingFk
-                            JOIN state s ON s.code = ts.code
+                                JOIN ticket t ON t.id = tt.ticketFk
+                                JOIN state s ON s.id = tt.stateFk
                             WHERE t.routeFk = ?
                                 AND s.\`order\` < ?
-                            AND priority <(SELECT t.priority 
+                                AND priority < (SELECT priority
-                                            FROM ticket t
+                                                    FROM ticket
-                                            WHERE t.id = ?)`
+                                                    WHERE id = ?)
-                    , [ticket.routeFk, orderState.id, ticket.id], myOptions);
+                    `, [ticket.routeFk, orderState.order, ticket.id], myOptions);
 
                     if (ticketIncorrect?.length > 0)
-                        await sendMail(ctx, ticket.routeFk, ticket.id, ticket.zone().name);
+                        await sendMail(ticket.routeFk, ticket.id, ticket.zone().name);
                 }
 
                 if (ticket?.address()?.province()?.country()?.code != 'ES' && ticket.$cmrFk) {
@@ -189,26 +192,21 @@ module.exports = Self => {
             throw e;
         }
         await models.Ticket.sendCmrEmail(ctx, externalTickets);
-    };
 
-    async function sendMail(ctx, route, ticket, zoneName) {
+        async function sendMail(route, ticket, zoneName) {
             const $t = ctx.req.__;
-        const url = await Self.app.models.Url.getUrl();
+            const fullUrl = `<a href="${url}route/${route}/summary">${route}</a>`;
-        const sendTo = 'repartos@verdnatura.es';
+            await smtp.send({
-        const fullUrl = `${url}route/${route}/summary`;
+                to: 'repartos@verdnatura.es',
-        const emailSubject = $t('Incorrect delivery order alert on route', {
+                subject: $t('Incorrect delivery order alert on route', {
                     route,
                     zone: zoneName
-        });
+                }),
-        const emailBody = $t('Ticket has been delivered out of order', {
+                html: $t('Ticket has been delivered out of order', {
                     ticket,
                     fullUrl
-        });
+                })
-
-        await Self.app.models.Mail.create({
-            receiver: sendTo,
-            subject: emailSubject,
-            body: emailBody
             });
         }
+    };
 };

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

@@ -6,7 +6,7 @@ describe('Ticket saveSign()', () => {
         getLocale: () => {
             return 'en';
         },
-        __: () => {},
+        __: t => t,
         accessToken: {userId: 9}
     }
     };

print/templates/reports/invoice-incoterms/sql/incoterms.sql

@@ -1,9 +1,9 @@
 WITH tickets AS(
-SELECT id, addressFk, packages, refFk
+SELECT id, addressFk, packages, refFk, weight
 	FROM vn.ticket 
 	WHERE refFk = ?
 ), volume AS(
-SELECT  SUM(volume) volume, MAX(weight)weight
+SELECT  SUM(sv.volume) volume, MAX(t.weight)weight
 	FROM tickets t
 		JOIN vn.saleVolume sv ON sv.ticketFk = t.id
 ), intrastat AS(