Merge branch 'test' into dev

Reviewed-on: #3225
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>

back/methods/collection/getSales.js

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

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

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

loopback/locale/en.json

@@ -223,7 +223,6 @@
 	"Shelving not valid": "Shelving not valid",
 	"printerNotExists": "The printer does not exist",
 	"There are not picking tickets": "There are not picking tickets",
-	"ticketCommercial": "The ticket {{ ticket }} for the salesperson {{ salesMan }} is in preparation. (automatically generated message)",
 	"This password can only be changed by the user themselves": "This password can only be changed by the user themselves",
 	"They're not your subordinate": "They're not your subordinate",
 	"InvoiceIn is already booked": "InvoiceIn is already booked",

loopback/locale/es.json

@@ -359,7 +359,6 @@
 	"This workCenter is already assigned to this agency": "Este centro de trabajo ya está asignado a esta agencia",
 	"Select ticket or client": "Elija un ticket o un client",
 	"It was not able to create the invoice": "No se pudo crear la factura",
-	"ticketCommercial": "El ticket {{ ticket }} para el vendedor {{ salesMan }} está en preparación. (mensaje generado automáticamente)",
 	"Incoterms and Customs agent are required for a non UEE member": "Se requieren Incoterms y agente de aduanas para un no miembro de la UEE",
 	"You can not use the same password": "No puedes usar la misma contraseña",
 	"This PDA is already assigned to another user": "Este PDA ya está asignado a otro usuario",

modules/zone/back/methods/zone/deleteZone.js

@@ -40,8 +40,7 @@ module.exports = Self => {
         try {
             const filter = {
                 where: {
-                    zoneFk: id,
+                    zoneFk: id
-                    shipped: {gte: today}
                 },
                 include: {
                     relation: 'ticketState',