back/methods/collection/getSales.js

@@ -57,6 +57,22 @@ module.exports = Self => {
 
         if (print) await Self.rawSql('CALL vn.collection_printSticker(?,NULL)', [id], myOptions);
 
+        for (let ticket of tickets) {
+            if (ticket.observaciones) {
+                let observations = ticket.observaciones.split(' ');
+
+                for (let observation of observations) {
+                    const departmentFk = ticket.departmentFk;
+                    if (observation.startsWith('#') || observation.startsWith('@')) {
+                        await models.Chat.send(ctx,
+                            observation,
+                            $t('ticketCommercial', {ticket: ticket.ticketFk, departmentFk})
+                        );
+                    }
+                }
+            }
+        }
+
         return getCollection(id, tickets, sales, placements, myOptions);
     };
 
@@ -127,15 +143,15 @@ module.exports = Self => {
 
     async function getBarcodes(ticketId, options) {
         const query =
-                `SELECT s.id movementId, 
+                `SELECT s.id movementId,
-                        b.code, 
+                        b.code,
                         c.id
                     FROM vn.sale s
                         LEFT JOIN vn.itemBarcode b ON b.itemFk = s.itemFk
                         LEFT JOIN vn.buy c ON c.itemFk = s.itemFk
                         LEFT JOIN vn.entry e ON e.id = c.entryFk
                         LEFT JOIN vn.travel tr ON tr.id = e.travelFk
-                    WHERE s.ticketFk = ? 
+                    WHERE s.ticketFk = ?
                         AND tr.landed >= DATE_SUB(CURDATE(), INTERVAL 1 YEAR)`;
         return Self.rawSql(query, [ticketId], options);
     }

back/methods/collection/getTickets.js

@@ -114,10 +114,10 @@ module.exports = Self => {
                 st.code stateCode,
                 ac.username
             FROM sectorCollection sc
-                JOIN sectorCollectionSaleGroup ss ON ss.sectorCollectionFk  = sc.id 
+                JOIN sectorCollectionSaleGroup ss ON ss.sectorCollectionFk  = sc.id
                 JOIN saleGroup sg ON sg.id = ss.saleGroupFk
                 LEFT JOIN saleGroupDetail sgd ON sgd.saleGroupFk = sg.id
-                JOIN sale s ON s.id = sgd.saleFk 
+                JOIN sale s ON s.id = sgd.saleFk
                 LEFT JOIN parking p2 ON p2.id = sg.parkingFk
                 JOIN item i ON i.id = s.itemFk
                 JOIN itemShelvingSale iss ON iss.saleFk = s.id
@@ -127,8 +127,8 @@ module.exports = Self => {
                 LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
                 LEFT JOIN origin o ON o.id = i.originFk
                 LEFT JOIN state st ON st.id = sg.stateFk
-                LEFT JOIN account.user ac ON ac.id = sg.userFk
+                LEFT JOIN account.user ac ON ac.id = iss.userFk
-            WHERE sc.id = ? 
+            WHERE sc.id = ?
                 AND sgd.saleGroupFk
             GROUP BY s.id, ish.id, p.code, p2.code`, [id, id], myOptions);
         if (print)
@@ -136,22 +136,22 @@ module.exports = Self => {
 
         const collection = {collectionFk: id, tickets: []};
 
-        if (tickets && tickets.length) {
+        if (tickets?.length) {
             for (const ticket of tickets) {
                 const ticketId = ticket.ticketFk;
                 if (ticket.observation) {
-                    for (observation of ticket.observation?.split(' ')) {
+                    for (let observation of ticket.observation?.split(' ')) {
                         if (['#', '@'].includes(observation.charAt(0))) {
                             promises.push(Self.app.models.Chat.send(ctx, observation,
                                 $t('The ticket is in preparation', {
                                     ticketId: ticketId,
                                     ticketUrl: `${url}ticket/${ticketId}/summary`,
-                                    salesPersonId: ticket.salesPersonFk
+                                    departmentId: ticket.departmentFk
                                 })));
                         }
                     }
                 }
-                if (sales && sales.length) {
+                if (sales?.length) {
                     const barcodes = await Self.rawSql(`
                         SELECT s.id saleFk, b.code, c.id
                             FROM sale s
@@ -166,7 +166,7 @@ module.exports = Self => {
                     for (const sale of sales) {
                         if (sale.ticketFk === ticketId) {
                             sale.Barcodes = [];
-                            if (barcodes && barcodes.length) {
+                            if (barcodes?.length) {
                                 for (const barcode of barcodes) {
                                     if (barcode.saleFk === sale.saleFk) {
                                         for (const prop in barcode) {

db/dump/.dump/data.sql

@@ -1,5 +1,5 @@
 USE `util`;
-/*M!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -1165,7 +1165,7 @@ INSERT INTO `versionLog` VALUES ('vn-database','11423','00-firstScript.sql','jen
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 USE `account`;
-/*M!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -1550,7 +1550,7 @@ INSERT INTO `mailConfig` VALUES (1,'verdnatura.es');
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 USE `salix`;
-/*M!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -1605,7 +1605,6 @@ INSERT INTO `ACL` VALUES (73,'Expedition','*','READ','ALLOW','ROLE','employee',N
 INSERT INTO `ACL` VALUES (74,'Expedition','*','WRITE','ALLOW','ROLE','deliveryAssistant',NULL);
 INSERT INTO `ACL` VALUES (75,'Expedition','*','WRITE','ALLOW','ROLE','production',NULL);
 INSERT INTO `ACL` VALUES (76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee',NULL);
-INSERT INTO `ACL` VALUES (77,'WorkerMana','*','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (78,'TicketTracking','*','WRITE','ALLOW','ROLE','production',NULL);
 INSERT INTO `ACL` VALUES (79,'Ticket','state','*','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (80,'Sale','deleteSales','*','ALLOW','ROLE','employee',NULL);
@@ -2053,7 +2052,7 @@ INSERT INTO `ACL` VALUES (595,'Ticket','isEditable','READ','ALLOW','ROLE','emplo
 INSERT INTO `ACL` VALUES (596,'Ticket','setDeleted','WRITE','ALLOW','ROLE','salesPerson',NULL);
 INSERT INTO `ACL` VALUES (597,'Ticket','restore','WRITE','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (598,'Ticket','getSales','READ','ALLOW','ROLE','employee',NULL);
-INSERT INTO `ACL` VALUES (599,'Ticket','getSalesPersonMana','READ','ALLOW','ROLE','employee',NULL);
+INSERT INTO `ACL` VALUES (599,'Ticket','getDepartmentMana','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (600,'Ticket','filter','READ','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (601,'Ticket','makeInvoice','WRITE','ALLOW','ROLE','employee',NULL);
 INSERT INTO `ACL` VALUES (602,'Ticket','updateEditableTicket','WRITE','ALLOW','ROLE','employee',NULL);
@@ -2503,7 +2502,7 @@ INSERT INTO `defaultViewMultiConfig` VALUES ('routesList','{\"ID\":true,\"worker
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 USE `vn`;
-/*M!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -2942,7 +2941,7 @@ INSERT INTO `workerTimeControlError` VALUES (9,'UNDEFINED_ERROR','Error sin defi
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 USE `cache`;
-/*M!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -2967,7 +2966,7 @@ INSERT INTO `cache` VALUES (14,'lastBuy','23:59:00');
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 USE `hedera`;
-/*M!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -3239,7 +3238,7 @@ INSERT INTO `tpvResponse` VALUES (9999,'Operación que ha sido redirigida al emi
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 USE `sage`;
-/*M!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

db/dump/.dump/privileges.sql

@@ -1,5 +1,5 @@
 USE `mysql`;
-/*M!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -2250,7 +2250,7 @@ INSERT IGNORE INTO `procs_priv` VALUES ('','vn','production','buy_getUltimate','
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 USE `mysql`;
-/*M!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

db/dump/fixtures.before.sql

@@ -393,20 +393,20 @@ INSERT INTO `vn`.`contactChannel`(`id`, `name`)
 		(4, 'GCN Channel'),
 		(5, 'The Newspaper');
 
-INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`businessTypeFk`,`typeFk`)
+INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`businessTypeFk`,`typeFk`, `departmentFk`)
-	VALUES
+    VALUES
-		(1101,     'Bruce Wayne',        '84612325V',  'BATMAN',         'Alfred',           '1007 MOUNTAIN DRIVE, GOTHAM',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1101, 'Bruce Wayne',       '84612325V',  'BATMAN',      'Alfred',           '1007 MOUNTAIN DRIVE, GOTHAM',             'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',      NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal', 155),
-		(1102,     'Petter Parker',      '87945234L',  'SPIDER MAN',     'Aunt May',         '20 INGRAM STREET, QUEENS, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+		(1102, 'Petter Parker',     '87945234L',  'SPIDER MAN',  'Aunt May',         '20 INGRAM STREET, QUEENS, USA',           'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',    NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal', 155),
-		(1103,     'Clark Kent',         '06815934E',  'SUPER MAN',      'lois lane',        '344 CLINTON STREET, APARTAMENT 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+		(1103, 'Clark Kent',        '06815934E',  'SUPER MAN',   'lois lane',        '344 CLINTON STREET, APARTAMENT 3-D',      'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',       NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal', 155),
-		(1104,     'Tony Stark',         '06089160W',  'IRON MAN',       'Pepper Potts',     '10880 MALIBU POINT, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+		(1104, 'Tony Stark',        '06089160W',  'IRON MAN',    'Pepper Potts',     '10880 MALIBU POINT, 90265',               'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',       NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 'florist','normal', 155),
-		(1105,     'Max Eisenhardt',     '251628698',  'MAGNETO',        'Rogue',            'UNKNOWN WHEREABOUTS',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18,   0, 'florist','normal'),
+		(1105, 'Max Eisenhardt',    '251628698',  'MAGNETO',     'Rogue',            'UNKNOWN WHEREABOUTS',                     'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',   NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18, 0, 'florist','normal', 155),
-		(1106,     'DavidCharlesHaller', '53136686Q',  'LEGION',         'Charles Xavier',   'CITY OF NEW YORK, NEW YORK, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19,   0, 'florist','normal'),
+		(1106, 'DavidCharlesHaller','53136686Q',  'LEGION',      'Charles Xavier',   'CITY OF NEW YORK, NEW YORK, USA',         'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19, 0, 'florist','normal', 155),
-		(1107,     'Hank Pym',           '09854837G',  'ANT MAN',        'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19,   0, 'florist','normal'),
+		(1107, 'Hank Pym',          '09854837G',  'ANT MAN',     'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',      'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',         NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19, 0, 'florist','normal', 155),
-		(1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 5, 1, 300,  13, 1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19,   0, 'florist','normal'),
+		(1108, 'Charles Xavier',    '22641921P',  'PROFESSOR X', 'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA','Gotham',46460,1111111111,222222222,1,'CharlesXavier@mydomain.com',   NULL, 0, 1234567890, 0, 5, 1, 300,  13, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19, 0, 'florist','normal', 155),
-		(1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9,    0, 'florist','normal'),
+		(1109, 'Bruce Banner',      '16104829E',  'HULK',        'Black widow',      'SOMEWHERE IN NEW YORK',                   'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',     NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9,  0, 'florist','normal', 155),
-		(1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, NULL, 1, 'florist','normal'),
+		(1110, 'Jessica Jones',     '58282869H',  'JESSICA JONES','Luke Cage',       'NYCC 2015 POSTER',                        'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, NULL,1, 'florist','normal', 155),
-		(1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 0, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
+		(1111, 'Missing',           NULL,         'MISSING MAN', 'Anton',            'THE SPACE, UNIVERSE FAR AWAY',            'Gotham', 46460, 1111111111, 222222222, 1, NULL,                         NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL,0, 'others','loses', 155),
-		(1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 0, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses');
+		(1112, 'Trash',             NULL,         'GARBAGE MAN', 'Unknown name',     'NEW YORK CITY, UNDERGROUND',              'Gotham', 46460, 1111111111, 222222222, 1, NULL,                         NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL,0, 'others','loses', 155);
 
 INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
 	SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), UPPER(CONCAT(name, 'Social')), CONCAT(name, 'Contact'), UPPER(CONCAT(name, 'Street')), 'GOTHAM', 46460, 0, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1
@@ -1876,18 +1876,17 @@ INSERT INTO `vn`.`clientContact`(`id`, `clientFk`, `name`, `phone`)
 		(3, 1101, 'contact 3', 222333444),
 		(4, 1102, 'contact 1', 876543219);
 
-INSERT INTO `vn`.`workerManaExcluded`(`workerFk`)
+INSERT INTO `vn`.`departmentManaExcluded`(`departmentFk`)
-	VALUES
+    VALUES (31);
-		(9);
 /*
-el mana de los trabajadores lo podemos poner a mano en la tabla si lo calculamos antes,
+ el mana de los trabajadores lo podemos poner a mano en la tabla si lo calculamos antes,
-pero si hazemos alguna modificacion en alguna tabla que utiliza para calcularlo ya no seria correcto
+ pero si hacemos alguna modificacion en alguna tabla que utiliza para calcularlo ya no seria correcto
 
 La otra manera es poner el calculo con los 2 trabajadores que utilizamos ahora mismo para los tickets
 */
 
-call vn.manaSpellersRequery(19);
+call vn.manaSpellers_requery(155);
-call vn.manaSpellersRequery(18);
+call vn.manaSpellers_requery(31);
 
 INSERT INTO `vn`.`clientSample`(`id`, `clientFk`, `typeFk`, `created`, `workerFk`, `userFk`, `companyFk`)
 	VALUES
@@ -2188,15 +2187,6 @@ INSERT INTO `vn`.`smsConfig` (`id`, `uri`, `title`, `apiKey`)
 	VALUES
 		('1', 'https://api.gateway360.com/api/3.0/sms/send', 'Verdnatura', '5715476da95b46d686a5a255e6459523');
 
-INSERT INTO `vn`.`sharingClient`(`id`, `workerFk`, `started`, `ended`, `clientFk`)
-	VALUES
-		(1, 19, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY), 1101),
-		(2, 18, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY), 1106);
-
-INSERT INTO `vn`.`sharingCart`(`id`, `workerFk`, `started`, `ended`, `workerSubstitute`, `created`)
-	VALUES
-		(1, 18, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL +15 DAY), 19, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 DAY));
-
 CALL `vn`.zoneGeo_calcTree(); -- this is an auto calculate for table vn.zoneGeo, columns: path,lft,rgt,depth,sons
 
 INSERT INTO `vn`.`zoneIncluded` (`zoneFk`, `geoFk`, `isIncluded`)
@@ -4111,4 +4101,4 @@ INSERT IGNORE INTO vn.vehicleType (id, name)
     VALUES (1,'vehículo empresa'),
         (2, 'furgoneta'),
         (3, 'cabeza tractora'),
-        (4, 'remolque');
+        (4, 'remolque');

db/routines/bi/procedures/analisis_ventas_update.sql

@@ -1,53 +1,52 @@
-DELIMITER $$
+DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_update`()
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_update`()
-BEGIN
+BEGIN
-	DECLARE vLastMonth DATE;
+	DECLARE vLastMonth DATE;
-
+
-	SET vLastMonth = util.firstDayOfMonth(TIMESTAMPADD(MONTH, -1, util.VN_CURDATE()));
+	SET vLastMonth = util.firstDayOfMonth(TIMESTAMPADD(MONTH, -1, util.VN_CURDATE()));
-
+
-	DELETE FROM analisis_ventas
+	DELETE FROM analisis_ventas
-		WHERE Año > YEAR(vLastMonth)
+		WHERE Año > YEAR(vLastMonth)
-			OR (Año = YEAR(vLastMonth) AND Mes >= MONTH(vLastMonth));
+			OR (Año = YEAR(vLastMonth) AND Mes >= MONTH(vLastMonth));
-
+
-	INSERT INTO analisis_ventas (
+	INSERT INTO analisis_ventas (
-			Familia,
+			Familia,
-			Reino,
+			Reino,
-			Comercial,
+			departmentFk,
-			Comprador,
+			Comprador,
-			Provincia,
+			Provincia,
-			almacen,
+			almacen,
-			Año,
+			Año,
-			Mes,
+			Mes,
-			Semana,
+			Semana,
-			Vista,
+			Vista,
-			Importe
+			Importe
-		)
+		)
-		SELECT 
+		SELECT
-			it.name,
+			it.name,
-			ic.name,
+			ic.name,
-			w.code,
+			c.departmentFk,
-			w2.code,
+			w.code,
-			p.name,
+			p.name,
-			wa.name,
+			wa.name,
-			tm.year,
+			tm.year,
-			tm.month,
+			tm.month,
-			tm.week,
+			tm.week,
-			dm.description,
+			dm.description,
-			bt.importe
+			bt.importe
-		FROM bs.ventas bt
+		FROM bs.ventas bt
-			LEFT JOIN vn.itemType it ON it.id = bt.tipo_id
+			LEFT JOIN vn.itemType it ON it.id = bt.tipo_id
-			LEFT JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+			LEFT JOIN vn.itemCategory ic ON ic.id = it.categoryFk
-			LEFT JOIN vn.client c on c.id = bt.Id_Cliente
+			LEFT JOIN vn.client c on c.id = bt.Id_Cliente
-			LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
+			LEFT JOIN vn.worker w ON w.id = it.workerFk
-			LEFT JOIN vn.worker w2 ON w2.id = it.workerFk
+			JOIN vn.time tm ON tm.dated = bt.fecha
-			JOIN vn.time tm ON tm.dated = bt.fecha
+			JOIN vn.sale s ON s.id = bt.Id_Movimiento
-			JOIN vn.sale s ON s.id = bt.Id_Movimiento
+			LEFT JOIN vn.ticket t ON t.id = s.ticketFk
-			LEFT JOIN vn.ticket t ON t.id = s.ticketFk
+			JOIN vn.agencyMode am ON am.id = t.agencyModeFk
-			JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+			LEFT JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
-			LEFT JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
+			LEFT JOIN vn.address a ON a.id = t.addressFk
-			LEFT JOIN vn.address a ON a.id = t.addressFk
+			LEFT JOIN vn.province p ON p.id = a.provinceFk
-			LEFT JOIN vn.province p ON p.id = a.provinceFk
+			LEFT JOIN vn.warehouse wa ON wa.id = t.warehouseFk
-			LEFT JOIN vn.warehouse wa ON wa.id = t.warehouseFk
+		WHERE bt.fecha >= vLastMonth AND ic.merchandise;
-		WHERE bt.fecha >= vLastMonth AND ic.merchandise;
+END$$
-END$$
+DELIMITER ;
-DELIMITER ;

db/routines/bi/procedures/defaultersFromDate.sql

@@ -1,24 +1,43 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`defaultersFromDate`(IN vDate DATE)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`defaultersFromDate`(
+	IN vDated DATE
+)
 BEGIN
-
+/**
-	SELECT t1.*, c.name Cliente, w.code workerCode, c.payMethodFk pay_met_id, c.dueDay Vencimiento
+ * Retorna la info de clientes morosos a una fecha
-	FROM (
+ *
-	-- Filtramos aquellos clientes cuyo saldo se ha incrementado de ayer a hoy
+ * @param vDated Fecha a comprobar
-		select * from(
+ */
-			select today.client, today.amount todayAmount, yesterday.amount yesterdayAmount, round(yesterday.amount - today.amount,2) as difference, defaulterSince
+	WITH todayDefaulters AS(
-			from
+	SELECT client, amount, defaulterSince
-				(select client, amount, defaulterSince
+		FROM bi.defaulters
-				from defaulters
+		WHERE date = vDated
-				where date = vDate and hasChanged) today
+			AND hasChanged
-					join
+	), yesterdayDefaulters AS(
-				(select client, amount
+	SELECT client, amount
-				from defaulters
+		FROM bi.defaulters
-				where date = TIMESTAMPADD(DAY,-1,vDate)) yesterday using(client)
+		WHERE date = vDated - INTERVAL 1 DAY
-
+	), newDefaulters AS(
-					having today.amount > 0 and difference <> 0
+	SELECT td.client,
-					) newDefaulters
+			td.amount todayAmount,
-	)t1 left join vn.client c ON c.id = t1.client
+			yd.amount yesterdayAmount,
-		left join vn.worker w ON w.id = c.salesPersonFk;
+			ROUND(yd.amount - td.amount, 2) difference,
+			defaulterSince
+		FROM todayDefaulters td
+			JOIN yesterdayDefaulters yd ON yd.client = td.client
+		WHERE td.amount > 0
+		HAVING difference <> 0
+	) SELECT nd.client,
+			nd.todayAmount,
+			nd.yesterdayAmount,
+			nd.difference,
+			nd.defaulterSince,
+			c.name Cliente,
+			d.name departmentName,
+			c.payMethodFk pay_met_id,
+			c.dueDay Vencimiento
+		FROM newDefaulters nd
+			LEFT JOIN vn.client c ON c.id = nd.client
+			LEFT JOIN vn.department d ON d.id = c.departmentFk;
 END$$
 DELIMITER ;

db/routines/bs/procedures/campaignComparative.sql

@@ -1,42 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`campaignComparative`(vDateFrom DATE, vDateTo DATE)
-BEGIN
-	SELECT 
-		workerName, 
-		id, 
-		name, 
-		CAST(SUM(previousAmmount) AS DECIMAL(10, 0)) AS previousAmmount, 
-		CAST(SUM(currentAmmount) AS DECIMAL(10, 0)) AS currentAmmount 
-	FROM (
-			(SELECT 
-				 CONCAT(w.firstname, ' ', w.lastName) AS workerName,
-				 c.id,
-				 c.name,
-				 SUM(v.importe) AS previousAmmount,
-				 0 currentAmmount
-			FROM bs.ventas v
-				INNER JOIN vn.`client` c ON v.Id_Cliente = c.id
-				INNER JOIN vn.worker w ON c.salesPersonFk = w.id
-			WHERE v.fecha BETWEEN DATE_ADD(vDateFrom, INTERVAL - 1 YEAR) 
-				AND DATE_ADD(vDateTo, INTERVAL - 1 YEAR)
-				GROUP BY w.id, v.Id_Cliente)
-			UNION ALL
-			(SELECT 
-				 CONCAT(w.firstname, ' ', w.lastName) AS workerName,
-				 c.id,
-				 c.name,
-				 0 AS previousAmmount,
-				 SUM(s.quantity * s.price) AS currentAmmount
-			FROM vn.sale s
-				JOIN vn.ticket t ON t.id = s.ticketFk
-				JOIN vn.client c ON c.id = t.clientFk
-				JOIN vn.worker w ON c.salesPersonFk = w.id
-			WHERE t.shipped BETWEEN vDateFrom
-				AND vDateTo
-				GROUP BY w.id, c.id)
-			) comparative
-		GROUP BY workerName, id
-		HAVING (previousAmmount <> 0 OR currentAmmount <> 0)
-		ORDER BY workerName, id;
-END$$
-DELIMITER ;

db/routines/bs/procedures/carteras_add.sql

@@ -1,27 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`carteras_add`()
-BEGIN
-/**
- * Inserta en la tabla @bs.carteras las ventas desde el año pasado 
- * agrupadas por trabajador, año y mes
- */
-	DECLARE vYear INT DEFAULT YEAR(util.VN_CURDATE()) - 1;
-
-	DELETE FROM bs.carteras WHERE Año >= vYear;
-
-	CALL util.time_generate(
-		MAKEDATE(vYear, 1),
-		(SELECT MAX(fecha) FROM ventas)
-	);
-
-	INSERT INTO carteras(Año, Mes , CodigoTrabajador, Peso)
-		SELECT t.`year`, t.`month`, w.code, SUM(v.importe)
-			FROM tmp.time t
-				JOIN ventas v on t.dated = v.fecha
-				JOIN vn.client c on c.id = v.Id_Cliente
-				JOIN vn.worker w ON w.id = c.salesPersonFk
-			GROUP BY w.code, t.`year`, t.`month`;
-
-	DROP TEMPORARY TABLE tmp.time;		
-END$$
-DELIMITER ;

db/routines/bs/procedures/clean.sql

@@ -20,10 +20,10 @@ BEGIN
 	DELETE FROM payMethodClientEvolution
 		WHERE dated < vFourYearsAgo;
 
-	DELETE FROM salesByclientSalesPerson 
+	DELETE FROM salesByclientSalesPerson
 		WHERE dated < vFourYearsAgo;
 
-	DELETE FROM m3 
+	DELETE FROM m3
 		WHERE fecha < vTwoYearAgo;
 
 	DELETE FROM salesByItemTypeDay

db/routines/bs/procedures/clientDied_calc.sql

@@ -0,0 +1,60 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`clientDied_calc`(
+	vDays INT,
+	vCountryCode VARCHAR(2)
+)
+BEGIN
+/**
+ * Recalcula los clientes inactivos y hace insert en la tabla clientDied
+ * estableciendo hasta 3 avisos en función del periodo y el código de país.
+ *
+ * @param vDays El número de días a considerar para la inactividad del cliente
+ * @param vCountryCode El código del país para filtrar los clientes
+ */
+	DECLARE vFirstPeriod , vSecondPeriod, vThridPeriod DATE;
+	SET vFirstPeriod = util.VN_CURDATE() - INTERVAL vDays DAY;
+	SET vSecondPeriod = util.VN_CURDATE() - INTERVAL vDays * 2 DAY;
+	SET vThridPeriod = util.VN_CURDATE() - INTERVAL vDays * 3 DAY;
+
+	DELETE cd.* FROM clientDied cd
+		JOIN (
+			SELECT c.id FROM vn.client c
+				JOIN vn.country co ON co.id = c.countryFk
+				WHERE co.code = vCountryCode
+		) sub ON sub.id = cd.clientFk;
+
+	INSERT INTO clientDied (clientFk, lastInvoiced, warning)
+		SELECT c.id,
+				sub.lastShipped,
+				CASE
+					WHEN lastShipped < vThridPeriod OR lastShipped IS NULL THEN 'third'
+					WHEN lastShipped < vSecondPeriod THEN 'second'
+					WHEN lastShipped < vFirstPeriod THEN 'first'
+				END
+			FROM vn.client c
+				JOIN vn.country co ON co .id = c.countryFk
+				JOIN vn.department w ON w.id = c.departmentFk
+				LEFT JOIN (
+					SELECT c.id, DATE(MAX(t.shipped)) lastShipped
+						FROM vn.client c
+							LEFT JOIN vn.ticket t ON t.clientFk = c.id
+							LEFT JOIN vn.country co ON co.id = c.countryFk
+						WHERE co.code = vCountryCode
+							AND (t.shipped <= util.VN_CURDATE() OR t.shipped IS NULL)
+						GROUP BY c.id
+				) sub ON sub.id = c.id
+				LEFT JOIN vn.clientObservation cob ON cob.clientFk = c.id
+					AND cob.created > vThridPeriod
+			WHERE (sub.lastShipped < vFirstPeriod OR sub.lastShipped IS NULL)
+				AND c.created < vThridPeriod
+				AND co.code = vCountryCode
+				AND cob.`text` IS NULL
+				AND c.id NOT IN (
+					SELECT DISTINCT clientFk
+						FROM vn.ticket
+						WHERE refFk IS NULL
+							AND shipped >= vFirstPeriod
+				)
+			GROUP BY c.id;
+END$$
+DELIMITER ;

db/routines/bs/procedures/clientDied_recalc.sql

@@ -33,9 +33,7 @@ BEGIN
 				END
 			FROM vn.client c
 				JOIN vn.country co ON co .id = c.countryFk
-				JOIN vn.worker w ON w.id = c.salesPersonFk
+				JOIN vn.departmentMana dm ON dm.departmentFk = c.departmentFk
-				JOIN vn.worker b ON b.id = w.bossFk
-				JOIN vn.workerMana wm ON wm.workerFk = c.salesPersonFk
 				LEFT JOIN (
 					SELECT c.id, DATE(MAX(t.shipped)) lastShipped
 						FROM vn.client c

db/routines/bs/procedures/indicatorsUpdate.sql

@@ -12,40 +12,40 @@ BEGIN
 
 	-- Ventas totales del ultimo año
 	UPDATE indicators
-		SET lastYearSales = 
+		SET lastYearSales =
 			(SELECT SUM(importe + recargo)
 				FROM ventas v
 					JOIN vn.company c ON c.id = v.empresa_id
 					JOIN vn.companyGroup cg ON cg.id = c.companyGroupFk
 				WHERE fecha BETWEEN oneYearBefore AND vDated
 					AND cg.code = 'Verdnatura'
-			) 
+			)
 		WHERE updated = vDated;
- 
+
 	-- Greuge total acumulado
 	UPDATE indicators
-		SET totalGreuge = 
+		SET totalGreuge =
 			(SELECT SUM(amount)
 				FROM vn.greuge
 				WHERE shipped <= vDated
-			) 
+			)
 		WHERE updated = vDated;
 
 	-- Tasa de morosidad con respecto a las ventas del último mes
 	UPDATE indicators
-		SET latePaymentRate = 
+		SET latePaymentRate =
-			(SELECT SUM(amount) 
+			(SELECT SUM(amount)
-				FROM bi.defaulters 
+				FROM bi.defaulters
 				WHERE date = vDated AND amount > 0)
 			/
-			(SELECT SUM(importe + recargo) 
+			(SELECT SUM(importe + recargo)
-				FROM ventas 
+				FROM ventas
 				WHERE fecha BETWEEN oneMonthBefore AND vDated)
 		WHERE updated = vDated;
 
 	-- Número de trabajadores activos
 	UPDATE indicators
-		SET countEmployee = 
+		SET countEmployee =
 			(SELECT CAST(SUM(ct.hoursWeek) / 40 AS DECIMAL (10, 2))
 				FROM vn.business b
 					JOIN vn.calendarType ct ON ct.id = b.calendarTypeFk
@@ -54,17 +54,17 @@ BEGIN
 			)
 		WHERE updated = vDated;
 
-	-- Maná medio acumulado por comercial
+	-- Maná medio acumulado
 	UPDATE indicators
 		SET averageMana =
 			(SELECT AVG(amount)
-				FROM vn.workerMana
+				FROM vn.departmentMana
 			)
 		WHERE updated = vDated;
 
 	-- Número de clientes que han comprado en los últimos 30 dias
 	UPDATE indicators
-		SET lastMonthActiveClients = 
+		SET lastMonthActiveClients =
 			(SELECT COUNT(DISTINCT t.clientFk)
 				FROM vn.ticket t
 					WHERE t.shipped BETWEEN oneMonthBefore AND vDated
@@ -73,9 +73,9 @@ BEGIN
 
 	-- Número de clientes que no han comprado en los últimos 30 dias, pero compraron en los 30 anteriores
 	UPDATE indicators
-		SET lastMonthLostClients = 
+		SET lastMonthLostClients =
 			(SELECT COUNT(lm.clientFk)
-				FROM 
+				FROM
 					(SELECT DISTINCT t.clientFk
 						FROM vn.ticket t
 						WHERE t.shipped BETWEEN oneMonthBefore AND vDated
@@ -92,9 +92,9 @@ BEGIN
 
 	-- Número de clientes que han comprado en los últimos 30 dias, pero no compraron en los 30 anteriores
 	UPDATE indicators
-		SET lastMonthNewClients = 
+		SET lastMonthNewClients =
 			(SELECT COUNT(cm.clientFk)
-				FROM 
+				FROM
 					(SELECT DISTINCT t.clientFk
 						FROM vn.ticket t
 						WHERE t.shipped BETWEEN oneMonthBefore AND vDated
@@ -120,7 +120,7 @@ BEGIN
 
 	-- Cálculo de las ventas agrupado por semanas
 	SELECT week INTO vWeek
-		FROM vn.time 
+		FROM vn.time
 		WHERE dated = vDated;
 
 	TRUNCATE salesByWeek;
@@ -134,12 +134,12 @@ BEGIN
 
 	-- Indicador Ventas semana actual
 	UPDATE indicators i
-			JOIN salesByWeek s ON s.week= vWeek 
+			JOIN salesByWeek s ON s.week= vWeek
 				AND s.year = YEAR(vDated)
 		SET i.thisWeekSales = s.sales
 		WHERE updated = vDated;
 
-	-- Indicador ventas semana actual en el año pasado 
+	-- Indicador ventas semana actual en el año pasado
 	UPDATE indicators i
 			JOIN salesByWeek s ON s.week = vWeek
 				AND s.year = YEAR(vDated)-1

db/routines/bs/procedures/manaCustomerUpdate.sql

@@ -14,51 +14,51 @@ BEGIN
 
 	SELECT id INTO vManaId
 		FROM vn.component WHERE code = 'mana';
-		
+
 	SELECT id INTO vManaAutoId
 		FROM vn.component WHERE code = 'autoMana';
-	
+
 	SELECT id INTO vClaimManaId
 		FROM vn.component WHERE code = 'manaClaim';
-	
+
 	SELECT id INTO vManaBankId
 		FROM vn.accounting WHERE code = 'mana';
-	
+
 	SELECT id INTO vManaGreugeTypeId
 		FROM vn.greugeType WHERE code = 'mana';
 
-	SELECT manaFromDays, manaToDays
+    SELECT manaFromDays, manaToDays
-		INTO vManaFromDays, vManaToDays
+        INTO vManaFromDays, vManaToDays
-		FROM vn.salespersonConfig;
+        FROM vn.manaConfig;
 
 	SELECT MAX(dated) INTO vFromDated
 		FROM vn.clientManaCache;
 
 	DELETE FROM vn.clientManaCache
 		WHERE dated = vFromDated;
-	
+
-	SELECT MAX(dated) INTO vFromDated 
+	SELECT MAX(dated) INTO vFromDated
 		FROM vn.clientManaCache;
-			
+
 	IF vFromDated IS NULL THEN
 		SELECT manaDateFrom
 			INTO vFromDated
-			FROM vn.salespersonConfig;
+			FROM vn.manaConfig;
 	END IF;
 
 	WHILE vFromDated + INTERVAL vManaToDays DAY < util.VN_CURDATE() DO
 		SELECT vFromDated + INTERVAL vManaToDays DAY,
-				vFromDated - INTERVAL vManaFromDays DAY 
+				vFromDated - INTERVAL vManaFromDays DAY
 			INTO  vToDated,
 				vForDeleteDated;
-			
+
 		DELETE FROM vn.clientManaCache
 			WHERE dated <= vForDeleteDated;
 
 		INSERT INTO vn.clientManaCache(clientFk, mana, dated)
 			SELECT Id_Cliente,
 					SUM(mana),
-					vToDated 
+					vToDated
 				FROM (
 					SELECT a.clientFk Id_Cliente, s.quantity * sc.value mana
 						FROM vn.ticket t
@@ -66,19 +66,19 @@ BEGIN
 							JOIN vn.sale s ON s.ticketFk = t.id
 							JOIN vn.saleComponent sc ON sc.saleFk = s.id
 						WHERE sc.componentFk IN (vManaAutoId, vManaId, vClaimManaId)
-							AND t.shipped > vFromDated 
+							AND t.shipped > vFromDated
 							AND DATE(t.shipped) <= vToDated
 					UNION ALL
 					SELECT clientFk, - amountPaid
 						FROM vn.receipt
 						WHERE bankFk = vManaBankId
-							AND payed > vFromDated 
+							AND payed > vFromDated
 							AND payed <= vToDated
 					UNION ALL
 					SELECT clientFk, amount
 						FROM vn.greuge
 						WHERE greugeTypeFk = vManaGreugeTypeId
-							AND shipped > vFromDated 
+							AND shipped > vFromDated
 							AND shipped <= vToDated
 					UNION ALL
 					SELECT clientFk, mana

db/routines/bs/procedures/manaSpellers_actualize.sql

@@ -1,27 +1,27 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`manaSpellers_actualize`()
 BEGIN
-/**	
+/**
- * Recalcula el valor del campo con el modificador de precio 
+ * Recalcula el valor del campo con el modificador de precio
  * para el componente de maná automático.
  */
-	UPDATE vn.workerMana wm 
+	UPDATE vn.departmentMana dm
 			JOIN (
-				SELECT c.lastSalesPersonFk, 
+				SELECT c.departmentFk,
 					FLOOR(SUM(s.amount) / 12) amount
 					FROM salesByclientSalesPerson s
 						JOIN vn.client c ON c.id = s.clientFk
 					WHERE s.dated BETWEEN util.VN_CURDATE() - INTERVAL 1 YEAR AND util.VN_CURDATE()
-					GROUP BY c.lastSalesPersonFk
+					GROUP BY c.departmentFk
-			)avgPortfolioWeight ON avgPortfolioWeight.lastSalesPersonFk = wm.workerFk 
+			)avgPortfolioWeight ON avgPortfolioWeight.departmentFk = dm.departmentFk
-			JOIN vn.salespersonConfig spc
+			JOIN vn.manaConfig mc
-		SET wm.pricesModifierRate = 
+		SET dm.pricesModifierRate =
 			IFNULL(
 					GREATEST(
-						spc.manaMinRate, 
+						mc.manaMinRate,
 						LEAST(
-							spc.manaMaxRate, 
+							mc.manaMaxRate,
-							ROUND( - wm.amount / avgPortfolioWeight.amount, 3)
+							ROUND( - dm.amount / avgPortfolioWeight.amount, 3)
 						)
 					)
 			,0);

db/routines/bs/procedures/porfolio_add.sql

@@ -0,0 +1,25 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`porfolio_add`()
+BEGIN
+/**
+ * Inserta en la tabla @bs.portfolio las ventas desde el año pasado
+ * agrupadas por equipo, año y mes
+ */
+	DECLARE vYear INT DEFAULT YEAR(util.VN_CURDATE()) - 1;
+
+	CALL util.time_generate(
+		MAKEDATE(vYear, 1),
+		(SELECT MAX(dated) FROM sale)
+	);
+
+	INSERT INTO portfolio(yeared, monthed , saleDepartmentFk, Amount)
+		SELECT t.`year`, t.`month`, w.code, SUM(s.amount)
+			FROM tmp.time t
+				JOIN sale s on t.dated = s.dated
+				JOIN vn.client c on c.id = s.clientFk
+				JOIN vn.department d ON d.id = c.departmentFk
+			GROUP BY d.id, t.`year`, t.`month`;
+
+	DROP TEMPORARY TABLE tmp.time;
+END$$
+DELIMITER ;

db/routines/bs/procedures/salePersonEvolutionAdd.sql

@@ -1,20 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`salePersonEvolutionAdd`(IN vDateStart DATETIME)
-BEGIN
-	DELETE FROM bs.salePersonEvolution 
-				WHERE  dated <=  DATE_SUB(util.VN_CURDATE(), INTERVAL 1 YEAR);
-    
-    
-    INSERT INTO bs.salePersonEvolution (dated, amount, equalizationTax, salesPersonFk)
-		SELECT fecha dated, 
-				CAST(SUM(importe) AS DECIMAL(10,2) ) amount, 
-				CAST(SUM(recargo) AS DECIMAL(10,2) ) equalizationTax ,
-				IFNULL(salesPersonFk,0) salesPersonFk
-			FROM bs.ventas v
-				JOIN vn.client c ON v.Id_Cliente = c.id 
-				JOIN vn.company co ON co.id = v.empresa_id
-			WHERE co.code = "VNL" AND fecha >= vDateStart
-		 GROUP BY v.fecha,c.salesPersonFk
-		 ORDER BY salesPersonFk,dated ASC;    
-END$$
-DELIMITER ;

db/routines/bs/procedures/salesByClientSalesPerson_add.sql

@@ -2,9 +2,9 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`salesByclientSalesPerson_add`(vDatedFrom DATE)
 BEGIN
 /**
- * Agrupa las ventas por cliente/comercial/fecha en la tabla bs.salesByclientSalesPerson
+ * Agrupa las ventas por cliente/fecha en la tabla bs.salesByclientSalesPerson
- * El asociación cliente/comercial/fecha, se mantiene correcta en el tiempo
+ * El asociación cliente/fecha, se mantiene correcta en el tiempo
- * 
+ *
  * @param vDatedFrom el cálculo se realizará desde la fecha introducida hasta ayer
  */
 
@@ -12,27 +12,26 @@ BEGIN
 		SET vDatedFrom = util.VN_CURDATE() - INTERVAL 1 MONTH;
 	END IF;
 
-	UPDATE salesByclientSalesPerson 
+	UPDATE salesByclientSalesPerson
 		SET amount = 0,
 			equalizationTax = 0,
 			amountNewBorn = 0
 		WHERE dated BETWEEN vDatedFrom AND util.yesterday();
-	
+
-	INSERT INTO salesByclientSalesPerson( 
+	INSERT INTO salesByclientSalesPerson(
-			dated, 
+			dated,
-			salesPersonFk, 
+			salesPersonFk,
-			clientFk, 
+			clientFk,
-			amount, 
+			amount,
 			equalizationTax)
-		SELECT s.dated,
+		SELECT dated,
-				c.salesPersonFk,
+				NULL,
-				s.clientFk,
+				clientFk,
-				SUM(s.amount),
+				SUM(amount),
-				SUM(s.surcharge)
+				SUM(surcharge)
-			FROM sale s
+			FROM sale
-				JOIN vn.client c on s.clientFk = c.id
+			WHERE dated BETWEEN vDatedFrom AND util.yesterday()
-			WHERE s.dated BETWEEN vDatedFrom AND util.yesterday() 
+			GROUP BY dated, clientFk
-			GROUP BY s.dated, c.salesPersonFk, s.clientFk
 		ON DUPLICATE KEY UPDATE amount= VALUES(amount),
 			equalizationTax= VALUES(equalizationTax);
 

db/routines/bs/procedures/salesDepartmentEvolution_add.sql

@@ -0,0 +1,64 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`salesDepartmentEvolution_add`()
+BEGIN
+/**
+ * Calcula los datos para los gráficos de evolución agrupado por departmentFk y día.
+ * Recalcula automáticamente los 3 últimos meses para comprobar si hay algún cambio.
+ */
+	DECLARE vDated DATE;
+
+	SELECT MAX(dated) - INTERVAL 3 MONTH INTO vDated
+		FROM salesDepartmentEvolution;
+
+	DELETE FROM salesDepartmentEvolution
+		WHERE dated >= vDated;
+
+	IF ISNULL(vDated) THEN
+		SELECT MIN(dated) INTO vDated
+			FROM salesByClientDepartment;
+
+		INSERT INTO salesByClientDepartment(
+				departmentFk,
+				dated,
+				amount,
+				equalizationTax,
+				amountNewBorn
+			)
+			SELECT departmentFk,
+					dated,
+					amount,
+					equalizationTax,
+					amountNewBorn
+				FROM salesByClientDepartment
+				WHERE dated = vDated
+				GROUP BY departmentFk;
+
+		SET vDated = vDated + INTERVAL 1 DAY;
+	END IF;
+
+	WHILE vDated < util.VN_CURDATE() DO
+
+		REPLACE salesByClientDepartment(departmentFk, dated, amount)
+			SELECT departmentFk, vDated, amount
+				FROM(SELECT departmentFk, SUM(amount) amount
+						FROM(SELECT departmentFk, amount
+								FROM salesByClientDepartment
+								WHERE dated = vDated - INTERVAL 1 DAY
+							UNION ALL
+							SELECT departmentFk, amount
+								FROM salesByClientDepartment
+								WHERE dated = vDated
+							UNION ALL
+							SELECT departmentFk, - amount
+								FROM salesByClientDepartment
+								WHERE dated = vDated - INTERVAL 1 YEAR
+							)sub
+						GROUP BY departmentFk
+					)sub
+				GROUP BY departmentFk;
+
+		SET vDated = vDated + INTERVAL 1 DAY;
+
+	END WHILE;
+END$$
+DELIMITER ;

db/routines/bs/procedures/salesPersonEvolution_add.sql

@@ -1,65 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`salesPersonEvolution_add`()
-BEGIN
-/**
- * Calcula los datos para los gráficos de evolución agrupado por salesPersonFk y día. 
- * Recalcula automáticamente los 3 últimos meses para comprobar si hay algún cambio.
- */
-	DECLARE vDated DATE;
-	DECLARE vCont INT DEFAULT 1;
-
-	SELECT MAX(dated) - INTERVAL 3 MONTH INTO vDated 
-		FROM salesPersonEvolution;
-
-	DELETE FROM salesPersonEvolution 
-		WHERE dated >= vDated;
-
-	IF ISNULL(vDated) THEN
-		SELECT MIN(dated) INTO vDated 
-			FROM salesByclientSalesPerson;
-		
-		INSERT INTO salesPersonEvolution(
-				salesPersonFk, 
-				dated, 
-				amount, 
-				equalizationTax, 
-				amountNewBorn
-			)
-			SELECT salesPersonFk, 
-				dated, 
-				amount, 
-				equalizationTax, 
-				amountNewBorn
-				FROM salesByclientSalesPerson 
-				WHERE dated = vDated
-				GROUP BY salesPersonFk;
-
-		SET vDated = vDated + INTERVAL 1 DAY;
-	END IF;
-
-	WHILE vDated < util.VN_CURDATE() DO
-		
-		SET vCont = vCont + 1;
-		REPLACE salesPersonEvolution(salesPersonFk, dated, amount)
-			SELECT salesPersonFk, vDated, amount
-				FROM(SELECT salesPersonFk, SUM(amount) amount
-						FROM(SELECT salesPersonFk, amount
-								FROM salesPersonEvolution 
-								WHERE dated = vDated - INTERVAL 1 DAY
-							UNION ALL
-							SELECT salesPersonFk, amount 
-								FROM salesByclientSalesPerson 
-								WHERE dated = vDated
-							UNION ALL
-							SELECT salesPersonFk, - amount
-								FROM salesByclientSalesPerson 
-								WHERE dated = vDated - INTERVAL 1 YEAR
-							)sub
-						GROUP BY salesPersonFk
-					)sub
-				GROUP BY salesPersonFk;
-
-		SET vDated = vDated + INTERVAL 1 DAY;
-	END WHILE;
-END$$
-DELIMITER ;

db/routines/bs/procedures/vendedores_add_launcher.sql

@@ -2,7 +2,7 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`vendedores_add_launcher`()
 BEGIN
 
-	CALL bs.salesByclientSalesPerson_add(util.VN_CURDATE()- INTERVAL 45 DAY);
+	CALL bs.salesByClientSalesPerson_add(util.VN_CURDATE()- INTERVAL 45 DAY);
-	
+
 END$$
 DELIMITER ;

db/routines/edi/triggers/putOrder_afterUpdate.sql

@@ -9,16 +9,16 @@ BEGIN
 	DECLARE vIsEktSender BOOLEAN;
 
 	IF NEW.OrderStatus = vOrderStatusDenied AND NOT (NEW.OrderStatus <=> OLD.OrderStatus) THEN
-	
+
 			SELECT s.id INTO vSaleFk
-				FROM vn.sale s 
+				FROM vn.sale s
 					JOIN vn.ticket t ON s.ticketFk = t.id
 					JOIN vn.item i ON i.id = s.itemFk
 					JOIN deliveryInformation di ON di.ID = NEW.deliveryInformationID
 				WHERE t.clientFk = NEW.EndUserPartyGLN AND t.shipped >= util.VN_CURDATE()
 					AND i.supplyResponseFk = NEW.supplyResponseID
 				LIMIT 1;
-			
+
 			UPDATE vn.sale s
 				JOIN vn.ticket t ON s.ticketFk = t.id
 				JOIN vn.item i ON i.id = s.itemFk
@@ -26,38 +26,20 @@ BEGIN
 				SET s.quantity = 0
 				WHERE t.clientFk = NEW.EndUserPartyGLN AND t.shipped >= util.VN_CURDATE()
 					AND i.supplyResponseFk = NEW.supplyResponseID;
-				
-			INSERT INTO vn.mail (sender, `subject`, body)
-				SELECT IF(u.id IS NOT NULL AND c.email IS NOT NULL,
-							c.email,
-							CONCAT(account.user_getNameFromId(c.salesPersonFk), '@verdnatura.es')
-						 ),
-						'Producto no disponible en Floramondo',
-						CONCAT('El artículo ', s.concept, ' del ticket ', t.id , ' ha sido cancelado por Floramondo. ',
-								' Se ha actualizado la cantidad de ', OLD.quantity,' a 0. ',
-							IF (u.id IS NOT NULL AND c.email IS NOT NULL ,
-								CONCAT('https://shop.verdnatura.es/#!form=ecomerce%2Fticket&ticket=', t.id ),
-								CONCAT('https://salix.verdnatura.es/#!/ticket/', t.id ,'/summary')))
-					FROM vn.sale s 
-						JOIN vn.ticket t ON t.id = s.ticketFk
-						JOIN vn.`client` c ON c.id = t.clientFk
-						LEFT JOIN account.user u ON u.id= c.salesPersonFk AND u.name IN ('ruben', 'ismaelalcolea')
-					WHERE s.id = vSaleFk;
-			
-	END IF;
 
+	END IF;
 
 	IF NEW.OrderStatus = vOrderStatusOK AND NOT (NEW.OrderStatus <=> OLD.OrderStatus) THEN
 
-		SELECT v.isEktSender INTO vIsEktSender 
+		SELECT v.isEktSender INTO vIsEktSender
 			FROM edi.VMPSettings v
-				JOIN edi.supplyResponse sr ON sr.vmpID = v.VMPID 
+				JOIN edi.supplyResponse sr ON sr.vmpID = v.VMPID
 				WHERE sr.id = NEW.supplyResponseID;
-		
+
 		IF NOT vIsEktSender THEN
 
 			CALL edi.ekt_add(NEW.id);
-		
+
 		END IF;
 
 		IF NEW.barcode THEN
@@ -66,7 +48,7 @@ BEGIN
 				SELECT i.id, NEW.barcode
 					FROM vn.item i
 					WHERE i.supplyResponseFk = NEW.supplyResponseID;
-		
+
 		END IF;
 
 	END IF;

db/routines/vn/events/client_unassignDepartment.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`client_unassignDepartment`
+	ON SCHEDULE EVERY 1 DAY
+		STARTS '2023-06-01 03:30:00.000'
+	ON COMPLETION PRESERVE
+	ENABLE
+DO CALL client_unassignDepartment$$
+DELIMITER ;

db/routines/vn/events/client_unassignSalesPerson.sql

@@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `vn`.`client_unassignSalesPerson`
-	ON SCHEDULE EVERY 1 DAY
-		STARTS '2023-06-01 03:30:00.000'
-	ON COMPLETION PRESERVE
-	ENABLE
-DO CALL client_unassignSalesPerson$$
-DELIMITER ;

db/routines/vn/functions/catalog_componentReverse.sql

@@ -1,95 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`catalog_componentReverse`(vWarehouse INT,
-    vCost DECIMAL(10,3),
-    vM3 DECIMAL(10,3),
-    vAddressFk INT,
-    vZoneFk INT)
-	RETURNS decimal(10,3)
-	DETERMINISTIC
-BEGIN
-	/* Calcula los componentes para un cliente a partir de un coste y volumen
-	* @param vWarehouse 
-	* @param vCost Valor de coste del articulo
-	* @param vM3 m3 del articulo
-    * @param vAddressFk 
-    * @param vZoneFk
-	* @return vRetailedPrice precio de venta sin iva 
-	* @return tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
-	*/
-    
-    DECLARE vBoxVolume BIGINT;    
-    DECLARE vCustomer INT;
-    DECLARE vComponentRecovery INT DEFAULT 17;
-	DECLARE vComponentMana INT DEFAULT 39;
-	DECLARE vDeliveryComponent INT DEFAULT 15;
-	DECLARE vComponentMargin INT DEFAULT 29;
-	DECLARE vComponentCost INT DEFAULT 28;
-    DECLARE vRetailedPrice DECIMAL(10,2);
-	DECLARE vItem INT DEFAULT 98;
-    
-	SELECT volume INTO vBoxVolume
-		FROM vn.packaging
-        WHERE id = '94';
-    
-    SELECT clientFk INTO vCustomer FROM address WHERE id = vAddressFk;
-
-    DROP TEMPORARY TABLE IF EXISTS tmp.catalog_component;
-    CREATE TEMPORARY TABLE tmp.catalog_component (
-		`warehouseFk` INT UNSIGNED NOT NULL,
-		`itemFk` INT NOT NULL,
-		`componentFk` INT UNSIGNED NOT NULL,
-		`cost` DECIMAL(10,4) NOT NULL,
-		INDEX `itemWarehouse` USING BTREE (`itemFk` ASC, `warehouseFk` ASC),
-		UNIQUE INDEX `itemWarehouseComponent` (`itemFk` ASC, `warehouseFk` ASC, `componentFk` ASC));
-
-	-- Cost
-	INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
-		SELECT vWarehouse, vItem, vComponentCost, vCost
-			FROM vn.rate
-				WHERE dated <= util.VN_CURDATE()
-					AND warehouseFk = vWarehouse
-				ORDER BY dated DESC
-				LIMIT 1;
-
-	-- Margen
-	-- No se aplica margen, cau 12589
-/*	INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
-		SELECT vWarehouse, vItem, vComponentMargin, (vCost / ((100 - rate2) / 100)) - vCost 
-			FROM vn.rate
-				WHERE dated <= util.VN_CURDATE()
-					AND warehouseFk = vWarehouse
-				ORDER BY dated DESC
-				LIMIT 1;
-		*/
-	-- Recobro
-	INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
-		SELECT vWarehouse, vItem, vComponentRecovery, ROUND(LEAST(recobro,0.25), 3) 
-			FROM bi.claims_ratio
-				WHERE Id_Cliente = vCustomer AND recobro > 0.009;
-
-	-- Componente de maná automático, en función del maná acumulado por el comercial.
-	INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
-		SELECT vWarehouse, vItem, vComponentMana, ROUND(wm.pricesModifierRate, 3)
-			FROM client c
-				JOIN vn.workerMana wm ON c.salesPersonFk = wm.workerFk
-			WHERE wm.isPricesModifierActivated AND c.id = vCustomer LIMIT 1;
-
-	-- Reparto
-	INSERT INTO tmp.catalog_component (warehouseFk, itemFk, componentFk, cost)
-		SELECT vWarehouse, vItem, vDeliveryComponent,
-				ROUND(
-						vM3
-						* (z.price - z.bonus)
-						* z.inflation 
-						/ vBoxVolume, 4
-						)
-			FROM zone z
-            WHERE z.id = vZoneFk;
-
-    -- Precio de venta
-	SELECT SUM(cost) INTO vRetailedPrice
-		FROM tmp.catalog_component;
-
-	RETURN vRetailedPrice;
-END$$
-DELIMITER ;

db/routines/vn/functions/clientGetSalesPerson.sql

@@ -1,11 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`clientGetSalesPerson`(vClientFk INT, vDated DATE)
-	RETURNS int(11)
-	DETERMINISTIC
-BEGIN
-/**
- * DEPRECATED: use client_getSalesPerson
- **/
-	RETURN client_getSalesPerson(vClientFk, vDated);
-END$$
-DELIMITER ;

db/routines/vn/functions/client_getFromPhone.sql

@@ -31,7 +31,7 @@ BEGIN
 		FROM tClient t
 			JOIN `client` c ON c.id = t.clientFk
 		WHERE c.isActive
-			AND c.salesPersonFk
+			AND c.departmentFk
 		LIMIT 1;
 
 	DROP TEMPORARY TABLE tClient;

db/routines/vn/functions/client_getSalesPerson.sql

@@ -1,74 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`client_getSalesPerson`(vClientFk INT, vDated DATE)
-	RETURNS int(11)
-	DETERMINISTIC
-BEGIN
-/**
- * Dado un id cliente y una fecha, devuelve su comercial para ese dia, teniendo 
- * en cuenta la jerarquía de las tablas: 1º la de sharingclient, 2º la de 
- * sharingcart y tercero la de clientes.
- *
- * @param vClientFk El id del cliente
- * @param vDated Fecha a comprobar
- * @return El id del comercial para la fecha dada
- **/
-	DECLARE vSalesPersonFk INT DEFAULT NULL;
-	DECLARE vWorkerSubstituteFk INT DEFAULT NULL;
-	DECLARE vLoop BOOLEAN;
-
-	-- Obtiene el comercial original y el de sharingclient
-
-	SELECT c.salesPersonFk, s.workerFk
-		INTO vSalesPersonFk, vWorkerSubstituteFk
-		FROM client c
-			LEFT JOIN sharingClient s
-				ON c.id = s.clientFk
-					AND vDated BETWEEN s.started AND s.ended
-		WHERE c.id = vClientFk
-		ORDER BY s.id
-        LIMIT 1;
-
-	-- Si no hay ninguno en sharingclient busca en sharingcart
-
-	IF vWorkerSubstituteFk IS NOT NULL
-	THEN
-		SET vSalesPersonFk = vWorkerSubstituteFk;
-	ELSEIF vSalesPersonFk IS NOT NULL
-	THEN
-		DROP TEMPORARY TABLE IF EXISTS tmp.stack;
-		CREATE TEMPORARY TABLE tmp.stack
-			(INDEX (substitute))
-			ENGINE = MEMORY
-			SELECT vSalesPersonFk substitute;
-
-		l: LOOP
-			SELECT workerSubstitute INTO vWorkerSubstituteFk
-				FROM sharingCart 
-				WHERE util.VN_CURDATE() BETWEEN started AND ended
-					AND workerFk = vSalesPersonFk
-				ORDER BY id
-				LIMIT 1;
-				
-			IF vWorkerSubstituteFk IS NULL THEN
-				LEAVE l;
-			END IF;
-				
-			SELECT COUNT(*) > 0 INTO vLoop
-				FROM tmp.stack WHERE substitute = vWorkerSubstituteFk;
-
-			IF vLoop THEN
-				LEAVE l;
-			END IF;
-			
-			INSERT INTO tmp.stack SET
-				substitute = vWorkerSubstituteFk;
-			
-			SET vSalesPersonFk = vWorkerSubstituteFk;
-		END LOOP;
-		
-		DROP TEMPORARY TABLE tmp.stack;
-	END IF;
-
-	RETURN vSalesPersonFk;
-END$$
-DELIMITER ;

db/routines/vn/functions/client_getSalesPersonByTicket.sql

@@ -1,23 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`client_getSalesPersonByTicket`(vTicketFk INT)
-	RETURNS int(11)
-	DETERMINISTIC
-BEGIN
-/**
- * Dado un id ticket, devuelve su comercial.
- * Para más información ir a client_getSalesPerson()
- *
- * @param vClientFk El id del cliente
- * @param vDated Fecha a comprobar
- * @return El id del comercial para la fecha dada
- **/
-    DECLARE vClientFk INT;
-    DECLARE vDated DATE;
-    
-    SELECT clientFk, shipped
-		INTO vClientFk, vDated
-        FROM ticket WHERE id = vTicketFk;
-        
-	RETURN client_getSalesPerson(vClientFk, vDated);
-END$$
-DELIMITER ;

db/routines/vn/functions/client_getSalesPersonCode.sql

@@ -1,26 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`client_getSalesPersonCode`(vClientFk INT, vDated DATE)
-	RETURNS varchar(3) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
-	DETERMINISTIC
-BEGIN
-/**
- * Dado un id cliente y una fecha, devuelve su comercial.
- * Para más información ir a client_getSalesPerson()
- *
- * @param vClientFk El id del cliente
- * @param vDated Fecha a comprobar
- * @return El código del comercial para la fecha dada
- **/
-    DECLARE vWorkerCode CHAR(3);
-    DECLARE vSalesPersonFk INT;
-    
-    SET vSalesPersonFk = client_getSalesPerson(vClientFk, vDated);
-
-	SELECT code
-		INTO vWorkerCode
-		FROM worker 
-		WHERE id = vSalesPersonFk;
-
-	RETURN vWorkerCode;
-END$$
-DELIMITER ;

db/routines/vn/functions/client_getSalesPersonCodeByTicket.sql

@@ -1,23 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`client_getSalesPersonCodeByTicket`(vTicketFk INT)
-	RETURNS varchar(3) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
-	DETERMINISTIC
-BEGIN
-/**
- * Dado un id ticket, devuelve su comercial.
- * Para más información ir a client_getSalesPerson()
- *
- * @param vClientFk El id del cliente
- * @param vDated Fecha a comprobar
- * @return El código del comercial para la fecha dada
- **/
-    DECLARE vClientFk INT;
-    DECLARE vDated DATE;
-    
-    SELECT clientFk, shipped
-		INTO vClientFk, vDated
-        FROM ticket WHERE id = vTicketFk;
-        
-	RETURN client_getSalesPersonCode(vClientFk, vDated);
-END$$
-DELIMITER ;

db/routines/vn/procedures/catalog_componentCalculate.sql

@@ -174,12 +174,12 @@ BEGIN
 		SELECT tcb.warehouseFk,
 				tcb.itemFk,
 				c2.id,
-				ROUND(base * wm.pricesModifierRate, 3) manaAuto
+				ROUND(base * dm.pricesModifierRate, 3) manaAuto
 			FROM tmp.ticketComponentBase tcb
 				JOIN `client` c on c.id = vClientFk
-				JOIN workerMana wm ON c.salesPersonFk = wm.workerFk
+				JOIN departmentMana dm ON c.departmentFk = dm.departmentFk
 				JOIN vn.component c2 ON c2.code = 'autoMana'
-			WHERE wm.isPricesModifierActivated
+			WHERE dm.isPricesModifierActivated
 			HAVING manaAuto <> 0;
 
 	-- Precios especiales

db/routines/vn/procedures/clean.sql

@@ -45,8 +45,6 @@ BEGIN
 		JOIN ticket t ON tobs.ticketFk = t.id
 		WHERE t.shipped < v5Years;
 	DELETE sc.* FROM saleCloned sc JOIN sale s ON s.id = sc.saleClonedFk JOIN ticket t ON t.id = s.ticketFk WHERE t.shipped < v1Years;
-	DELETE FROM sharingCart where ended < v2Months;
-	DELETE FROM sharingClient where ended < v2Months;
 	DELETE tw.* FROM ticketWeekly tw
 			LEFT JOIN sale s ON s.ticketFk = tw.ticketFk
 			LEFT JOIN ticketRequest tr ON tr.ticketFk = tw.ticketFk

db/routines/vn/procedures/clientDebtSpray.sql

@@ -1,29 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`clientDebtSpray`(vClientFk INT)
-BEGIN
-
-	/* Reparte el saldo de un cliente en greuge en la cartera que corresponde, y desasigna el comercial
-    *
-    *
-    */
-
-	DECLARE vClientDebt DOUBLE;
-    
-    SELECT vn.client_getDebt(vClientFk, util.VN_CURDATE()) INTO vClientDebt;
-    
-    INSERT INTO vn.greuge(clientFk, description, amount, shipped, greugeTypeFk)
-		VALUES (vClientFk, 'Saldo pendiente', vClientDebt, util.VN_CURDATE(), 5);
-    
-    CALL vn.clientGreugeSpray(vClientFk, TRUE, '', TRUE);
-    
-    INSERT INTO vn.greuge(clientFk, description, amount, shipped, greugeTypeFk)
-			SELECT vClientFk, 'Liquidación cliente', sum(amount), util.VN_CURDATE(), 5
-				FROM vn.greuge
-				WHERE clientFk = vClientFk;
-                
-	UPDATE vn.client 
-		SET salesPersonFk = NULL 
-		WHERE id = vClientFk;
-
-END$$
-DELIMITER ;

db/routines/vn/procedures/clientGreugeSpray.sql

@@ -1,7 +1,11 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`clientGreugeSpray`(IN vClientFk INT, IN onlyForHisOwner BOOL, IN vWorkerCode VARCHAR(3), IN vWithMana BOOLEAN)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`clientGreugeSpray`(
+	IN vClientFk INT,
+	IN vIsOnlyForHisOwner BOOL,
+	IN vDepartmentCode VARCHAR(45),
+	IN vWithMana BOOLEAN
+)
 BEGIN
-
 	DECLARE vGreuge DECIMAL(10,2);
 	DECLARE vOwner INT;
 	DECLARE vTotalSale INT;
@@ -9,65 +13,62 @@ BEGIN
 	DECLARE vGreugeTypeMana INT DEFAULT 3;-- Maná
 	DECLARE vMana DECIMAL(10,2);
 
-	SELECT vn.clientGetMana(vClientFk) INTO vMana;
+	SELECT clientGetMana(vClientFk) INTO vMana;
 
 	IF vWithMana AND vMana THEN
-
+		INSERT INTO greuge
-		INSERT INTO vn.greuge(	clientFk,
+			SET clientFk = vClientFk,
-								description,
+				description = 'Desasignación',
-								amount,
+				amount = - vMana,
-								shipped,
+				shipped = util.VN_CURDATE(),
-								greugeTypeFk)
+				greugeTypeFk = vGreugeTypeMana;
-		VALUES(	vClientFk,
-				'Desasignación',
-				-1 * vMana,
-				util.VN_CURDATE(),
-				vGreugeTypeMana);
-
 	END IF;
 
-	SELECT sum(amount) INTO vGreuge
+	SELECT SUM(amount) INTO vGreuge
-		FROM vn.greuge
+		FROM greuge
 		WHERE clientFk = vClientFk;
 
-	IF vGreuge != 0 THEN
+	IF vGreuge THEN
-
+		IF LENGTH(vDepartmentCode) THEN
-		IF LENGTH(vWorkerCode) = 0 THEN
+			SELECT departmentFk INTO vOwner
-
+				FROM client
-			SELECT salesPersonFk INTO vOwner
-				FROM vn.client
 				WHERE id = vClientFk;
-
 		ELSE
-		
 			SELECT id INTO vOwner
-				FROM vn.worker
+				FROM department
-				WHERE code = vWorkerCode COLLATE utf8_general_ci;
+				WHERE code = vDepartmentCode;
-
 		END IF;
-		
+
-		DROP TEMPORARY TABLE IF EXISTS tmp.clientList;
+		IF vOwner IS NULL THEN
-		CREATE TEMPORARY TABLE tmp.clientList
+			CALL util.throw('The department is incorrect');
-			SELECT DISTINCT t.clientFk, floor(cr.yearSale / 12) monthSale
+		END IF;
+
+		INSERT INTO greuge(clientFk, description, amount, shipped, greugeTypeFk)
+			WITH greuges AS(
+			SELECT DISTINCT t.clientFk, FLOOR(cr.yearSale / 12) monthSale
 				FROM vn.ticket t
 					JOIN vn.client c ON c.id = t.clientFk
-					JOIN vn.workerMana wm ON wm.workerFk = c.salesPersonFk
+					JOIN vn.departmentMana dm ON dm.departmentFk = c.departmentFk
 					JOIN vn.claimRatio cr ON cr.clientFk = c.id
-				WHERE wm.workerFk = IF(onlyForHisOwner, vOwner, wm.workerFk)
+				WHERE dm.departmentFk = IF(vIsOnlyForHisOwner, vOwner, dm.departmentFk)
-				AND t.shipped >= TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())
+					AND t.shipped >= util.VN_CURDATE() - INTERVAL 1 MONTH
-				AND c.id != vClientFk
+					AND c.id <> vClientFk
-				HAVING monthSale > 100;
+				HAVING monthSale > 100
-					
+			), totalGreuge AS(
-		SELECT SUM(monthSale) INTO vTotalSale
+			SELECT SUM(monthSale) totalSale FROM greuges
-			FROM tmp.clientList;
+			)SELECT g.clientFk,
-
+						CONCAT('Cliente: ', vClientFk),
-		INSERT INTO vn.greuge(clientFk, description, amount, shipped, greugeTypeFk)
+						vGreuge * g.monthSale / tgtotalSale,
-			SELECT clientFk, CONCAT('Cliente: ',vClientFk), vGreuge * monthSale / vTotalSale, util.VN_CURDATE(), vGreugeTypeFk
+						util.VN_CURDATE(),
-				FROM tmp.clientList
+						vGreugeTypeFk
+					FROM greuges g
+						JOIN totalGreuge tg
 			UNION ALL
-			SELECT vClientFk, 'Reparto greuge', -vGreuge, util.VN_CURDATE(), vGreugeTypeFk;
+			SELECT vClientFk,
-
+					'Reparto greuge',
+					-vGreuge,
+					util.VN_CURDATE(),
+					vGreugeTypeFk;
 	END IF;
-    
 END$$
 DELIMITER ;

db/routines/vn/procedures/clientRemoveWorker.sql

@@ -8,7 +8,7 @@ BEGIN
 			FROM tmp.clientGetDebt c
 			LEFT JOIN clientRisk r ON r.clientFk = c.clientFk
 		GROUP BY c.clientFk
-		HAVING SUM(IFNULL(r.amount,0)) = 0;
+		HAVING SUM(IFNULL(r.amount, 0)) = 0;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
@@ -16,22 +16,26 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.clientGetDebt
 		SELECT cd.clientFk
 			FROM bs.clientDied cd
-			LEFT JOIN clientProtected cp ON cp.clientFk = cd.clientFk
+				LEFT JOIN clientProtected cp ON cp.clientFk = cd.clientFk
-			JOIN client c ON c.id = cd.clientFk
+				JOIN client c ON c.id = cd.clientFk
-			JOIN province p ON p.id = c.provinceFk
+				JOIN province p ON p.id = c.provinceFk
-			LEFT JOIN autonomy a ON a.id = p.autonomyFk 
+				LEFT JOIN autonomy a ON a.id = p.autonomyFk
-			JOIN country co ON co.id = p.countryFk
+				JOIN country co ON co.id = p.countryFk
-		WHERE cd.warning = 'third'
+			WHERE cd.warning = 'third'
-			AND cp.clientFk IS NULL
+				AND cp.clientFk IS NULL
-			AND co.code NOT IN ('PT') 
+				AND co.code NOT IN ('PT')
-			AND a.name <> 'Canarias'
+				AND a.name <> 'Canarias'
-			AND c.salesPersonFk IS NOT NULL;
+				AND c.departmentFk IS NOT NULL;
 
 	OPEN rs;
 	FETCH rs INTO vClientFk;
 		WHILE NOT vDone DO
 			CALL vn.clientGreugeSpray(vClientFk, TRUE, '',TRUE);
-			UPDATE vn.client SET salesPersonFk = NULL WHERE id = vClientFk;
+
+			UPDATE vn.client
+				SET departmentFk = NULL
+				WHERE id = vClientFk;
+
 			FETCH rs INTO vClientFk;
 		END WHILE;
 	CLOSE rs;

db/routines/vn/procedures/client_unassignDepartment.sql

@@ -1,8 +1,8 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`client_unassignSalesPerson`()
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`client_unassignDepartment`()
 BEGIN
 /**
- * Elimina la asignación de salesPersonFk de la ficha del clientes
+ * Elimina la asignación de departmentFk de la ficha del clientes
  * que no han realizado una compra en los últimos 3 meses y reparte
  * su greuge entre el resto de clientes
  */
@@ -22,16 +22,15 @@ BEGIN
 			FROM bs.clientDied cd
 				JOIN client c ON c.id = cd.clientFk
 				LEFT JOIN clientProtected cp ON cp.clientFk = c.id
-				LEFT JOIN salesPersonProtected sp ON sp.salesPersonFk = c.salesPersonFk
+				LEFT JOIN departmentNoUnassign sd ON sp.departmentFk = c.departmentFk
 				JOIN province p ON p.id = c.provinceFk
 				LEFT JOIN autonomy a ON a.id = p.autonomyFk
 				JOIN country co ON co.id = p.countryFk
 				JOIN bs.clientDiedPeriod cdp ON cdp.countryFk = co.id
 			WHERE cd.warning = 'third'
 				AND cp.clientFk IS NULL
-				AND sp.salesPersonFk IS NULL
 				AND a.name <> 'Canarias'
-				AND c.salesPersonFk IS NOT NULL;
+				AND c.departmentFk IS NOT NULL;
 
 	OPEN vCursor;
 	l: LOOP
@@ -42,7 +41,7 @@ BEGIN
 		END IF;
 		CALL clientGreugeSpray(vClientFk, TRUE, '', TRUE);
 		UPDATE client
-			SET salesPersonFk = NULL
+			SET departmentFk = NULL
 			WHERE id = vClientFk;
 	END LOOP;
 	CLOSE vCursor;

db/routines/vn/procedures/client_userDisable.sql

@@ -20,15 +20,15 @@ BEGIN
 		WHERE c.typeFk = 'normal'
 			AND a.id IS NULL
 			AND u.active
-			AND c.created < util.VN_CURDATE() - INTERVAL vMonths MONTH 
+			AND c.created < util.VN_CURDATE() - INTERVAL vMonths MONTH
 			AND NOT u.role = (SELECT id FROM `role` WHERE name = 'supplier')
 			AND u.id NOT IN (
 				SELECT DISTINCT c.id
 					FROM client c
 						LEFT JOIN ticket t ON t.clientFk = c.id
-					WHERE c.salesPersonFk IS NOT NULL
+					WHERE c.departmentFk IS NOT NULL
-						OR t.created > util.VN_CURDATE() - INTERVAL vMonths MONTH 
+						OR t.created > util.VN_CURDATE() - INTERVAL vMonths MONTH
-						OR shipped > util.VN_CURDATE() - INTERVAL vMonths MONTH 
+						OR shipped > util.VN_CURDATE() - INTERVAL vMonths MONTH
 			);
 END$$
 DELIMITER ;

db/routines/vn/procedures/collection_getTickets.sql

@@ -4,31 +4,32 @@ BEGIN
 /**
  * Selecciona los tickets de una colección/ticket/sectorCollection
  * @param vParamFk ticketFk/collectionFk/sectorCollection
- * @return Retorna ticketFk, level, agencyName, warehouseFk, salesPersonFk, observation
+ * @return Retorna (ticketFk, level, agencyName, warehouseFk, observation,
- */	
+ * rgb, departmentFk)
+ */
 	DECLARE vItemPackingTypeFk VARCHAR(1);
 	DECLARE vYesterday DATE;
 
 	-- Si los sacadores son los de pruebas, pinta los colores
 	SELECT itemPackingTypeFk
 			INTO vItemPackingTypeFk
-		FROM collection 
+		FROM collection
 		WHERE id = vParamFk;
-	
+
 	SET vYesterday = util.yesterday();
 
 	WITH observation AS (
-		SELECT tob.ticketFk, tob.description 
+		SELECT tob.ticketFk, tob.description
-			FROM vn.ticketObservation tob 
+			FROM vn.ticketObservation tob
 				JOIN vn.ticketCollection tc ON tc.ticketFk = tob.ticketFk
-				JOIN vn.observationType ot ON ot.id = tob.observationTypeFk AND ot.`code` = 'itemPicker' 
+				JOIN vn.observationType ot ON ot.id = tob.observationTypeFk AND ot.`code` = 'itemPicker'
 			WHERE tc.collectionFk = vParamFk OR tc.ticketFk = vParamFk
 	)
-	SELECT t.id ticketFk, 
+	SELECT t.id ticketFk,
 			IF(!(vItemPackingTypeFk <=> 'V'), cc.code, CONCAT(SUBSTRING('ABCDEFGH', tc.wagon, 1), '-', tc.`level`)) `level`,
 			am.name agencyName,
 			t.warehouseFk,
-			w.id salesPersonFk,
+			c.departmentFk,
 			IFNULL(ob.description,'') observaciones,
 			cc.rgb,
 			p.code parkingCode,
@@ -36,41 +37,39 @@ BEGIN
 		FROM vn.ticket t
 			LEFT JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
 			LEFT JOIN vn.collection c2 ON c2.id = tc.collectionFk
-			LEFT JOIN vn.collectionColors cc 
+			LEFT JOIN vn.collectionColors cc
-				ON cc.wagon = tc.wagon 
+				ON cc.wagon = tc.wagon
-				AND cc.shelve = tc.`level` 
+				AND cc.shelve = tc.`level`
 				AND cc.trainFk = c2.trainFk
-			LEFT JOIN vn.zone z ON z.id = t.zoneFk 
+			LEFT JOIN vn.zone z ON z.id = t.zoneFk
 			LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk
 			LEFT JOIN vn.client c ON c.id = t.clientFk
-			LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
 			LEFT JOIN observation ob ON ob.ticketFk = t.id
 			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
 			LEFT JOIN vn.parking p ON tp.parkingFk = p.id
 			LEFT JOIN vn.packingSiteAdvanced ps ON ps.ticketFk = t.id
-		WHERE t.id = vParamFk 
+		WHERE t.id = vParamFk
 			AND t.shipped >= vYesterday
 	UNION
-	SELECT t.id ticketFk, 
+	SELECT t.id ticketFk,
 			IF(NOT(vItemPackingTypeFk <=> 'V'), cc.code, CONCAT(SUBSTRING('ABCDEFGH', tc.wagon, 1), '-', tc.`level`)) `level`,
 			am.name agencyName,
 			t.warehouseFk,
-			w.id salesPersonFk,
+			c.departmentFk,
 			ob.description,
 			IF(NOT (vItemPackingTypeFk <=> 'V'), cc.rgb, NULL) `rgb`,
 			p.code parkingCode,
 			IF (ps.ticketFk, TRUE, FALSE) isAdvanced
 		FROM vn.ticket t
 			JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
-			LEFT JOIN vn.collection c2 ON c2.id = tc.collectionFk 	
+			LEFT JOIN vn.collection c2 ON c2.id = tc.collectionFk
-			LEFT JOIN vn.collectionColors cc 
+			LEFT JOIN vn.collectionColors cc
-				ON cc.wagon = tc.wagon 
+				ON cc.wagon = tc.wagon
-					AND cc.shelve = tc.`level` 
+					AND cc.shelve = tc.`level`
 					AND cc.trainFk = c2.trainFk
-			LEFT JOIN vn.zone z ON z.id = t.zoneFk 
+			LEFT JOIN vn.zone z ON z.id = t.zoneFk
 			LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk
 			LEFT JOIN vn.client c ON c.id = t.clientFk
-			LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
 			LEFT JOIN observation ob ON ob.ticketFk = t.id
 			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
 			LEFT JOIN vn.parking p ON tp.parkingFk = p.id
@@ -81,18 +80,18 @@ BEGIN
 			NULL `level`,
 			am.name agencyName,
 			t.warehouseFk,
-			c.salesPersonFk,
+			c.departmentFk,
 			ob.description,
 			NULL `rgb`,
 			p.code parkingCode,
 			IF (ps.ticketFk, TRUE, FALSE) isAdvanced
 		FROM vn.sectorCollection sc
-			JOIN vn.sectorCollectionSaleGroup ss ON ss.sectorCollectionFk = sc.id 
+			JOIN vn.sectorCollectionSaleGroup ss ON ss.sectorCollectionFk = sc.id
 			JOIN vn.saleGroup sg ON sg.id = ss.saleGroupFk
-			JOIN vn.ticket t ON t.id = sg.ticketFk 
+			JOIN vn.ticket t ON t.id = sg.ticketFk
-			LEFT JOIN vn.zone z ON z.id = t.zoneFk 
+			LEFT JOIN vn.zone z ON z.id = t.zoneFk
-			LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk 
+			LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk
-			LEFT JOIN observation ob ON ob.ticketFk = t.id 
+			LEFT JOIN observation ob ON ob.ticketFk = t.id
 			LEFT JOIN vn.client c ON c.id = t.clientFk
 			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
 			LEFT JOIN vn.parking p ON tp.parkingFk = p.id

db/routines/vn/procedures/itemSale_byWeek.sql

@@ -1,41 +1,41 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemSale_byWeek`(vWeek INT, IN vYear INT, vItemFk INT, vWarehouseFk INT)
 BEGIN
-	
+
 	DECLARE vStarted DATE;
 	DECLARE vEnded DATETIME;
 
 	SELECT MIN(dated), util.dayEnd(MAX(dated)) INTO vStarted, vEnded
-		FROM `time` t 
+		FROM `time` t
 		WHERE CONCAT(vYear, LPAD(vWeek, 2, 0)) = t.period;
 
 	SELECT t.shipped,
 			w.name warehouse,
-			s.ticketFk, 
+			s.ticketFk,
 			t.nickname client,
-			am.name agencyName, 
+			am.name agencyName,
-			wk.code salesPerson,
 			s.itemFk,
-			IFNULL(CONCAT(ig.longName,' ',ig.`size`,' ',ig.subName), s.concept) AS concept, 
+			IFNULL(CONCAT(ig.longName,' ',ig.`size`,' ',ig.subName), s.concept) AS concept,
-			s.quantity, 
+			s.quantity,
 			s.price,
 			s.priceFixed,
 			s.discount,
 			tls.name stateName,
 			sb.buyFk,
 			s.id saleFk,
-			wk.id salesPersonFk
+			d.id departmentFk,
+			d.name departmentName
 		FROM sale s
 			JOIN ticket t ON t.id = s.ticketFk
-			JOIN warehouse w ON w.id = t.warehouseFk 
+			JOIN warehouse w ON w.id = t.warehouseFk
 			JOIN address a ON a.id = t.addressFk
 			LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
 			JOIN `client` c ON c.id = a.clientFk
-			LEFT JOIN worker wk ON wk.id = c.salesPersonFk 
+			LEFT JOIN department d ON d.id = c.departmentFk
 			LEFT JOIN ticketLastState tls ON tls.ticketFk = t.id
-			LEFT JOIN saleBuy sb ON sb.saleFk = s.id 
+			LEFT JOIN saleBuy sb ON sb.saleFk = s.id
-			LEFT JOIN buy b ON b.id = sb.buyFk 
+			LEFT JOIN buy b ON b.id = sb.buyFk
-			LEFT JOIN item ig ON ig.id = b.itemOriginalFk 
+			LEFT JOIN item ig ON ig.id = b.itemOriginalFk
 		WHERE s.itemFk = vItemFk
 			AND t.shipped BETWEEN vStarted AND vEnded
 			AND IF(vWarehouseFk = 0, w.hasComission , t.warehouseFk = vWarehouseFk)

db/routines/vn/procedures/manaSpellersRequery.sql

@@ -1,36 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`manaSpellersRequery`(vWorkerFk INTEGER)
-`whole_proc`:
-BEGIN
-/**
- * Guarda en workerMana el mana consumido por un trabajador
- *
- * @param vWorkerFk Id Trabajador
- */
-	DECLARE vWorkerIsExcluded BOOLEAN;
-
-	SELECT COUNT(*) INTO vWorkerIsExcluded
-		FROM workerManaExcluded
-		WHERE workerFk = vWorkerFk;
-
-	IF vWorkerIsExcluded THEN
-		LEAVE whole_proc;
-	END IF;
-
-	CREATE OR REPLACE TEMPORARY TABLE tmp.client
-		SELECT id
-			FROM client 
-			WHERE salesPersonFk = vWorkerFk;
-
-	CALL client_getMana();
-
-	INSERT INTO workerMana (workerFk, amount)
-		SELECT vWorkerFk, sum(mana)
-			FROM tmp.clientMana
-			ON DUPLICATE KEY UPDATE amount = VALUES(amount);
-
-	DROP TEMPORARY TABLE 
-		tmp.client,
-		tmp.clientMana;
-END$$
-DELIMITER ;

db/routines/vn/procedures/manaSpellers_requery.sql

@@ -0,0 +1,35 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`manaSpellers_requery`(
+	vDepartmentFk INTEGER
+)
+BEGIN
+/**
+ * Guarda en departmentMana el mana consumido por un departamento
+ *
+ * @param vDepartmentFk Id department
+ */
+	DECLARE vIsDepartmentExcluded BOOLEAN;
+
+	SELECT COUNT(*) INTO vIsDepartmentExcluded
+		FROM departmentManaExcluded
+		WHERE departmentFk = vDepartmentFk;
+
+	IF NOT vIsDepartmentExcluded THEN
+		CREATE OR REPLACE TEMPORARY TABLE tmp.client
+			SELECT id
+				FROM client
+				WHERE departmentFk = vDepartmentFk;
+
+		CALL client_getMana();
+
+		INSERT INTO departmentMana (departmentFk, amount)
+			SELECT vDepartmentFk, SUM(mana)
+				FROM tmp.clientMana
+				ON DUPLICATE KEY UPDATE amount = VALUES(amount);
+
+		DROP TEMPORARY TABLE
+			tmp.client,
+			tmp.clientMana;
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/procedures/productionControl.sql

@@ -38,7 +38,7 @@ proc: BEGIN
 		SELECT s.ticketFk,
 				LEFT(CONCAT('F: ', GROUP_CONCAT(CONCAT(i.id, ' ', i.longName) SEPARATOR ', ')), 250) itemShortage,
 				LEFT(CONCAT('R: ', GROUP_CONCAT(CONCAT(i2.id, ' ', i2.longName) SEPARATOR ', ')), 250) itemDelay,
-				LEFT(CONCAT('I: ', GROUP_CONCAT(CONCAT(i3.id, ' ', i3.longName) SEPARATOR ', ')), 250) itemLost 
+				LEFT(CONCAT('I: ', GROUP_CONCAT(CONCAT(i3.id, ' ', i3.longName) SEPARATOR ', ')), 250) itemLost
 			FROM tmp.saleProblems sp
 				JOIN vn.sale s ON s.id = sp.saleFk
 				LEFT JOIN vn.item i ON i.id = s.itemFk AND sp.hasItemShortage
@@ -74,13 +74,13 @@ proc: BEGIN
 					IF(tpr.hasTicketRequest, ' COD 100',''),
 					IF(tpr.isTaxDataChecked, '',' FICHA INCOMPLETA'),
 					IF(tpr.hasComponentLack, ' COMPONENTES', ''),
-					IF(HOUR(util.VN_NOW()) < IF(HOUR(t.shipped), HOUR(t.shipped), COALESCE(HOUR(zc.hour),HOUR(z.hour))) 
+					IF(HOUR(util.VN_NOW()) < IF(HOUR(t.shipped), HOUR(t.shipped), COALESCE(HOUR(zc.hour),HOUR(z.hour)))
 						AND tpr.isTooLittle, ' PEQUEÑO', '')
 				) AS char(255))) problem,
 				IFNULL(tls.state,2) state,
 				w.code workerCode,
 				DATE(t.shipped) shipped,
-				wk.code salesPersonCode,
+				d.code departmentCode,
 				p.id provinceFk,
 				tls.productionOrder,
 				IFNULL(tls.alertLevel, al.id) alertLevel,
@@ -96,23 +96,23 @@ proc: BEGIN
 				ag.isOwn,
 				rm.bufferFk
 			FROM tmp.productionTicket tt
-				JOIN vn.ticket t ON tt.ticketFk = t.id
+				JOIN ticket t ON tt.ticketFk = t.id
-				JOIN vn.alertLevel al ON al.code = 'FREE'
+				JOIN alertLevel al ON al.code = 'FREE'
-				LEFT JOIN vn.ticketStateToday tst ON tst.ticketFk = t.id
+				LEFT JOIN ticketStateToday tst ON tst.ticketFk = t.id
-				LEFT JOIN vn.`state` st ON st.id = tst.state
+				LEFT JOIN `state` st ON st.id = tst.state
-				LEFT JOIN vn.client c ON c.id = t.clientFk
+				LEFT JOIN client c ON c.id = t.clientFk
-				LEFT JOIN vn.worker wk ON wk.id = c.salesPersonFk
+				LEFT JOIN department d ON d.id = c.departmentFk
-				JOIN vn.address a ON a.id = t.addressFk
+				JOIN address a ON a.id = t.addressFk
-				LEFT JOIN vn.province p ON p.id = a.provinceFk
+				LEFT JOIN province p ON p.id = a.provinceFk
-				JOIN vn.agencyMode am ON am.id = t.agencyModeFk
+				JOIN agencyMode am ON am.id = t.agencyModeFk
-				JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
+				JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
-				JOIN vn.agency ag ON ag.id = am.agencyFk
+				JOIN agency ag ON ag.id = am.agencyFk
-				LEFT JOIN vn.ticketState tls ON tls.ticketFk = tt.ticketFk
+				LEFT JOIN ticketState tls ON tls.ticketFk = tt.ticketFk
-				LEFT JOIN vn.ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
+				LEFT JOIN ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
-				LEFT JOIN vn.worker w ON w.id = tls.userFk
+				LEFT JOIN worker w ON w.id = tls.userFk
-				LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
+				LEFT JOIN routesMonitor rm ON rm.routeFk = t.routeFk
-				LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
+				LEFT JOIN `zone` z ON z.id = t.zoneFk
-				LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk
+				LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
 					AND DATE(t.shipped) = zc.dated
 				LEFT JOIN vn.ticketParking  tp ON tp.ticketFk = t.id
 				LEFT JOIN vn.parking pk ON pk.id = tp.parkingFk
@@ -120,7 +120,7 @@ proc: BEGIN
 				LEFT JOIN saleProblemsDescription sp ON sp.ticketFk = tt.ticketFk
 			WHERE t.warehouseFk = vWarehouseFk
 				AND dm.code IN ('AGENCY', 'DELIVERY', 'PICKUP');
-				
+
 	 UPDATE tmp.productionBuffer pb
 			JOIN (
 				SELECT pb.ticketFk, GROUP_CONCAT(p.code) previaParking

db/routines/vn/procedures/route_getTickets.sql

@@ -8,7 +8,7 @@ BEGIN
  * @param vRouteFk
  * @select Información de los tickets
  */
-SELECT t.id Id,
+	SELECT t.id Id,
 			t.clientFk Client,
 			a.id Address,
 			a.nickname ClientName,
@@ -23,20 +23,21 @@ SELECT t.id Id,
 			a.mobile AddressMobile,
 			d.longitude Longitude,
 			d.latitude Latitude,
-			wm.mediaValue SalePersonPhone,
+			de.pbxQueue departmentPhone,
 			tob.description Note,
 			t.isSigned Signed,
 			t.priority,
 			t.cmrFk
 		FROM ticket t
 			JOIN client c ON t.clientFk = c.id
-			JOIN address a ON t.addressFk = a.id 
+			JOIN address a ON t.addressFk = a.id
-			LEFT JOIN workerMedia wm ON wm.workerFk = c.salesPersonFk
+			LEFT JOIN department de ON de.id = c.departmentFk
+			LEFT JOIN company co ON co.`code` = 'VNL'
 			LEFT JOIN (
 				SELECT t.addressFk, MAX(d.ticketFk) lastTicketFk
 					FROM ticket t
 						JOIN delivery d ON t.id = d.ticketFk
-						JOIN ticket ti ON ti.routeFk = vRouteFk 
+						JOIN ticket ti ON ti.routeFk = vRouteFk
 							AND ti.id = t.id
 							AND ti.clientFk = t.clientFk
 					GROUP BY addressFk

db/routines/vn/procedures/sectorCollection_getSale.sql

@@ -15,7 +15,7 @@ BEGIN
 			w.code workerCode,
 			sgd.saleFk,
 			iss.quantity pickedQuantity,
-			c.salesPersonFk
+			c.departmentFk
 		FROM vn.sale s
 			JOIN item i ON i.id = s.itemFk
 			JOIN saleGroupDetail sgd ON sgd.saleFk = s.id

db/routines/vn/procedures/ticket_canAdvance.sql

@@ -25,7 +25,6 @@ BEGIN
 				origin.futureState,
 				origin.futureIpt,
 				dest.ipt,
-				origin.workerFk,
 				origin.futureLiters,
 				origin.futureLines,
 				dest.shipped,
@@ -56,7 +55,6 @@ BEGIN
 				origin.saleClonedFk
 			FROM (
 				SELECT s.ticketFk,
-						c.salesPersonFk workerFk,
 						t.shipped,
 						t.totalWithVat,
 						st.name futureState,
@@ -74,11 +72,10 @@ BEGIN
 						t.warehouseFk,
 						t.companyFk,
 						t.agencyModeFk,
-						wd.departmentFk,
+						c.departmentFk,
 						sc.saleClonedFk
 					FROM ticket t
 						JOIN client c ON c.id = t.clientFk
-						JOIN workerDepartment wd ON wd.workerFk = c.salesPersonFk
 						JOIN sale s ON s.ticketFk = t.id
 						LEFT JOIN saleCloned sc ON sc.saleClonedFk = s.id
 						JOIN saleVolume sv ON sv.saleFk = s.id
@@ -115,7 +112,7 @@ BEGIN
 							t.landed,
 							t.agencyModeFk,
 							SEC_TO_TIME(
-							    COALESCE(HOUR(t.shipped), HOUR(zc.hour), HOUR(z.hour)) * 3600 + 
+							    COALESCE(HOUR(t.shipped), HOUR(zc.hour), HOUR(z.hour)) * 3600 +
 							    COALESCE(MINUTE(t.shipped), MINUTE(zc.hour), MINUTE(z.hour)) * 60
 							) preparation
 						FROM ticket t

db/routines/vn/procedures/ticket_cloneWeekly.sql

@@ -1,6 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_cloneWeekly`(
-	vDateFrom DATE, 
+	vDateFrom DATE,
 	vDateTo DATE
 )
 BEGIN
@@ -32,7 +32,7 @@ BEGIN
 				t.addressFk,
 				tt.agencyModeFk,
 				ti.dated
-			FROM ticketWeekly tt 
+			FROM ticketWeekly tt
 				JOIN ticket t ON tt.ticketFk = t.id
 				JOIN tmp.time ti
 			WHERE WEEKDAY(ti.dated) = tt.weekDay;
@@ -44,12 +44,12 @@ BEGIN
 	OPEN vTickets;
 	l: LOOP
 		SET vDone = FALSE;
-		FETCH vTickets INTO 
+		FETCH vTickets INTO
-			vTicketFk, 
+			vTicketFk,
-			vClientFk, 
+			vClientFk,
-			vWarehouseFk, 
+			vWarehouseFk,
-			vCompanyFk, 
+			vCompanyFk,
-			vAddressFk, 
+			vAddressFk,
 			vAgencyModeFk,
 			vShipment;
 
@@ -63,17 +63,17 @@ BEGIN
 				JOIN saleCloned sc ON sc.saleOriginalFk = saleOrig.id
 				JOIN sale saleClon ON saleClon.id = sc.saleClonedFk
 				JOIN ticket tClon ON tClon.id = saleClon.ticketFk
-			WHERE tOrig.id = vTicketFk 
+			WHERE tOrig.id = vTicketFk
-				AND tClon.isDeleted = FALSE 
+				AND tClon.isDeleted = FALSE
 				AND DATE(tClon.shipped) = vShipment)
 		THEN
 			ITERATE l;
 		END IF;
 
 		IF vAgencyModeFk IS NULL THEN
-			SELECT agencyModeFk INTO vAgencyModeFk 
+			SELECT agencyModeFk INTO vAgencyModeFk
 				FROM address
-				WHERE clientFk = vClientFk 
+				WHERE clientFk = vClientFk
 					AND isDefaultAddress;
 		END IF;
 
@@ -94,17 +94,17 @@ BEGIN
 			FALSE,
 			vNewTicket);
 
-		UPDATE ticket 
+		UPDATE ticket
-			SET clonedFrom = vTicketFk 
+			SET clonedFrom = vTicketFk
 			WHERE id = vNewTicket;
 
-		INSERT INTO sale (ticketFk, 
+		INSERT INTO sale (ticketFk,
-				itemFk, 
+				itemFk,
 				concept,
-				quantity, 
+				quantity,
 				price,
-				discount, 
+				discount,
-				priceFixed, 
+				priceFixed,
 				isPriceFixed)
 			SELECT vNewTicket,
 					itemFk,
@@ -120,7 +120,7 @@ BEGIN
 		INSERT IGNORE INTO saleCloned(saleOriginalFk, saleClonedFk)
 			SELECT saleOriginal.id, saleClon.id
 				FROM sale saleOriginal
-					JOIN sale saleClon ON saleOriginal.itemFk = saleClon.itemFk 
+					JOIN sale saleClon ON saleOriginal.itemFk = saleClon.itemFk
 						AND saleOriginal.quantity = saleClon.quantity
 				WHERE saleOriginal.ticketFk = vTicketFk
 					AND saleClon.ticketFk = vNewTicket;
@@ -150,43 +150,42 @@ BEGIN
 					buyed,
 					requesterFk,
 					attenderFk,
-					vNewTicket 
+					vNewTicket
 				FROM ticketRequest
 				WHERE ticketFk = vTicketFk;
 
 		INSERT INTO ticketObservation(
 				ticketFk,
 				observationTypeFk,
-				description) 
+				description)
 			VALUES(
 				vNewTicket,
 				vObservationSalesPersonFk,
 				CONCAT('turno desde ticket: ',vTicketFk))
-			ON DUPLICATE KEY UPDATE description = 
+			ON DUPLICATE KEY UPDATE description =
 				CONCAT(ticketObservation.description,VALUES(description),' ');
 
 		INSERT INTO ticketObservation(ticketFk,
 				observationTypeFk,
-				description) 
+				description)
 			VALUES(
 				vNewTicket,
 				vObservationItemPickerFk,
 				'ATENCION: Contiene lineas de TURNO')
-			ON DUPLICATE KEY UPDATE description = 
+			ON DUPLICATE KEY UPDATE description =
 				CONCAT(ticketObservation.description,VALUES(description),' ');
 
 		IF vLanding IS NULL THEN
-			SELECT IFNULL(d.notificationEmail, e.email) INTO vEmail
+
+			SELECT d.notificationEmail INTO vEmail
 				FROM client c
-					JOIN account.emailUser e ON e.userFk = c.salesPersonFk
+					LEFT JOIN department d ON d.id = c.departmentFk
-					LEFT JOIN workerDepartment wd ON wd.workerFk = c.salesPersonFk
-					LEFT JOIN department d ON d.id = wd.departmentFk
 				WHERE c.id = vClientFk;
 
 			SET vSubject = CONCAT('Turnos - No se ha podido clonar correctamente el ticket ',
 						 vTicketFk,' para el dia: ', vShipment);
-			SET vMessage = CONCAT('No se ha podido clonar el ticket ', vTicketFk, 
+			SET vMessage = CONCAT('No se ha podido clonar el ticket ', vTicketFk,
-				' para el dia: ', vShipment, 
+				' para el dia: ', vShipment,
 				' porque no hay una zona de envío disponible. Se ha creado el ticket: ',
 				vNewTicket, ' pero ha que revisar las fechas y la agencia');
 

db/routines/vn/procedures/workerDisable.sql

@@ -1,36 +1,33 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`workerDisable`(vUserId int)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`workerDisable`(vUserFk INT)
-mainLabel:BEGIN
+l:BEGIN
 
-	IF (SELECT COUNT(*) FROM workerDisableExcluded WHERE workerFk = vUserId AND (dated > util.VN_CURDATE() OR dated IS NULL)) > 0 THEN
+	IF (SELECT COUNT(*)
-		LEAVE mainLabel;
+			FROM workerDisableExcluded
+			WHERE workerFk = vUserFk
+				AND (dated > util.VN_CURDATE() OR dated IS NULL)) > 0 THEN
+		LEAVE l;
 	END IF;
 
-	DELETE cp FROM clientProtected cp
+	DELETE FROM account.account WHERE id = vUserFk;
-		JOIN client c ON c.id = cp.clientFk
-		WHERE c.salesPersonFk = vUserId;
 
-	DELETE FROM account.account
+	UPDATE account.user
-		WHERE id = vUserId;
-
-	UPDATE account.user 
 		SET role = 2
-		WHERE id = vUserId;	
+		WHERE id = vUserFk;
 
-	DELETE FROM pbx.sip 
+	DELETE FROM pbx.sip WHERE user_id = vUserFk;
-		WHERE user_id = vUserId;   
 
 	UPDATE `client` c
-		JOIN payMethod p ON p.name = 'CONTADO'
+			JOIN payMethod p ON p.name = 'CONTADO'
-		SET c.credit = 0, c.payMethodFk = p.id, hasCoreVnl = FALSE
+		SET c.credit = 0,
-		WHERE c.id = vUserId;
+			c.payMethodFk = p.id,
-	
+			c.hasCoreVnl = FALSE,
-	UPDATE `client` c
+			c.isActive = FALSE,
-		SET c.salesPersonFk = null
+			c.isTaxDataChecked = FALSE
-		WHERE c.salesPersonFk = vUserId;
+		WHERE c.id = vUserFk;
 
 	UPDATE locker l
 		SET l.workerFk = NULL
-		WHERE l.workerFk = vUserId; 
+		WHERE l.workerFk = vUserId;
 END$$
 DELIMITER ;

db/routines/vn/procedures/zone_getAddresses.sql

@@ -23,21 +23,18 @@ BEGIN
 			WHERE landed BETWEEN vLanded AND util.dayEnd(vLanded)
 				AND NOT isDeleted
 	)
-	SELECT c.id,
+	SELECT c.id clientFk,
 			c.name,
 			c.phone,
 			bt.description,
-			c.salesPersonFk,
+			c.departmentFk,
-			u.name username,
+			d.name departmentName,
 			aai.invoiced,
 			cnb.lastShipped,
 			IF(cwt.clientFk, TRUE, FALSE) hasTicket
 		FROM vn.client c
-			JOIN vn.worker w ON w.id = c.salesPersonFk
-			JOIN vn.workerDepartment wd ON wd.workerFk = w.id
-			JOIN vn.department d ON d.id = wd.departmentFk
 			LEFT JOIN clientWithTicket cwt ON cwt.clientFk = c.id
-			LEFT JOIN account.`user` u ON u.id = c.salesPersonFk
+			LEFT JOIN vn.department d ON d.id = c.departmentFk
 			JOIN vn.`address` a ON a.clientFk = c.id
 			JOIN vn.postCode pc ON pc.code = a.postalCode
 			JOIN vn.town t ON t.id = pc.townFk AND t.provinceFk = a.provinceFk

db/routines/vn/triggers/client_beforeInsert.sql

@@ -5,7 +5,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`client_beforeInsert`
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
 	SET NEW.accountingAccount = 4300000000 + NEW.id;
-    SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
+    SET NEW.lastdepartmentFk = NEW.departmentFk;
 	SET NEW.geoFk = client_getGeo(NEW.id);
 
 	IF (NEW.phone <> '') THEN
@@ -15,5 +15,6 @@ BEGIN
 	IF (NEW.mobile <> '') THEN
 		CALL pbx.phone_isValid(NEW.mobile);
 	END IF;
+
 END$$
 DELIMITER ;

db/routines/vn/triggers/client_beforeUpdate.sql

@@ -45,18 +45,16 @@ BEGIN
 	IF vText IS NOT NULL
 	THEN
 		INSERT INTO mail(receiver, replyTo, `subject`, body)
-			SELECT
+			SELECT IFNULL(d.notificationEmail, 'jgallego@verdnatura.es'),
-					CONCAT(IF(ac.id,u.name, 'jgallego'), '@verdnatura.es'),
 					'administracion@verdnatura.es',
 					CONCAT('Cliente ', NEW.id),
 					CONCAT('Recibida la documentación: ', vText)
-				FROM worker w
+				FROM department d
-					LEFT JOIN account.user u ON w.id = u.id AND u.active
+				WHERE d.id = NEW.departmentFk;
-					LEFT JOIN account.account ac ON ac.id = u.id
-				WHERE w.id = NEW.salesPersonFk;
 	END IF;
 
-	IF NEW.salespersonFk IS NULL AND OLD.salespersonFk IS NOT NULL THEN
+
+	IF NEW.departmentFk IS NULL AND OLD.departmentFk IS NOT NULL THEN
 		IF (SELECT COUNT(clientFk)
 				FROM clientProtected
 				WHERE clientFk = NEW.id
@@ -65,10 +63,6 @@ BEGIN
 		END IF;
 	END IF;
 
-	IF NOT (NEW.salesPersonFk <=> OLD.salesPersonFk) THEN
-		SET NEW.lastSalesPersonFk = IFNULL(NEW.salesPersonFk, OLD.salesPersonFk);
-	END IF;
-
 	IF NOT (NEW.businessTypeFk <=> OLD.businessTypeFk) AND (NEW.businessTypeFk = 'individual' OR OLD.businessTypeFk = 'individual') THEN
 		SET NEW.isTaxDataChecked = 0;
 	END IF;

db/routines/vn/triggers/departmentMana_beforeInsert.sql

@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`departmentMana_beforeInsert`
+	BEFORE INSERT ON `departmentMana`
+	FOR EACH ROW
+BEGIN
+	IF (SELECT EXISTS(SELECT TRUE FROM departmentManaExcluded WHERE departmentFk = NEW.departmentFk)) THEN
+		CALL util.throw('Department is excluded from mana');
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/triggers/departmentMana_beforeUpdate.sql

@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`departmentMana_beforeUpdate`
+	BEFORE UPDATE ON `departmentMana`
+	FOR EACH ROW
+BEGIN
+	IF (SELECT EXISTS(SELECT TRUE FROM departmentManaExcluded WHERE departmentFk = NEW.departmentFk)) THEN
+		CALL util.throw('Department is excluded from mana');
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/triggers/sharingCart_beforeDelete.sql

@@ -1,11 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`sharingCart_beforeDelete`
-	BEFORE DELETE ON `sharingCart`
-	FOR EACH ROW
-BEGIN
-	DELETE sc FROM sharingCartDaily sc  
-		WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND 
-			  sc.ownerFk = OLD.workerFk AND 
-			  sc.substituteFk = OLD.workerSubstitute;
-END$$
-DELIMITER ;

db/routines/vn/triggers/sharingCart_beforeInsert.sql

@@ -1,15 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`sharingCart_beforeInsert`
-	BEFORE INSERT ON `sharingCart`
-	FOR EACH ROW
-BEGIN
-	IF NEW.workerFk = NEW.workerSubstitute THEN
-		CALL util.throw ('worker and workerSubstitute must be different');
-	ELSE
-		 INSERT IGNORE INTO sharingCartDaily (ownerFk, substituteFk, dated) 
-			SELECT NEW.workerFk, NEW.workerSubstitute, dated 
-				FROM time 
-                WHERE dated BETWEEN NEW.started AND NEW.ended;
-    END IF;
-END$$
-DELIMITER ;

db/routines/vn/triggers/sharingCart_beforeUpdate.sql

@@ -1,21 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`sharingCart_beforeUpdate`
-	BEFORE UPDATE ON `sharingCart`
-	FOR EACH ROW
-BEGIN
-	IF NEW.workerFk = NEW.workerSubstitute THEN
-		CALL util.throw ('worker and workerSubstitute must be different');
-	ELSE
-		DELETE sc FROM sharingCartDaily sc  
-			WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND 
-				  sc.ownerFk = OLD.workerFk AND 
-				  sc.substituteFk = OLD.workerSubstitute;
-                  
-        INSERT IGNORE INTO sharingCartDaily (ownerFk, substituteFk, dated) 
-			SELECT NEW.workerFk, NEW.workerSubstitute, dated 
-				FROM time 
-                WHERE dated BETWEEN NEW.started AND NEW.ended;
-
-    END IF;
-END$$
-DELIMITER ;

db/routines/vn/triggers/sharingClient_beforeInsert.sql

@@ -1,9 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`sharingClient_beforeInsert`
-	BEFORE INSERT ON `sharingClient`
-	FOR EACH ROW
-BEGIN
-	SET NEW.ended = GREATEST(util.VN_CURDATE(),NEW.ended);
-	SET NEW.started = GREATEST(util.VN_CURDATE(),NEW.started);
-END$$
-DELIMITER ;

db/routines/vn/triggers/sharingClient_beforeUpdate.sql

@@ -1,9 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`sharingClient_beforeUpdate`
-	BEFORE UPDATE ON `sharingClient`
-	FOR EACH ROW
-BEGIN
-	SET NEW.ended = GREATEST(util.VN_CURDATE(),NEW.ended);
-	SET NEW.started = GREATEST(util.VN_CURDATE(),NEW.started);
-END$$
-DELIMITER ;

db/routines/vn/triggers/workerManaExcluded_beforeInsert.sql

@@ -1,9 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`workerManaExcluded_beforeInsert`
-	BEFORE INSERT ON `workerManaExcluded`
-	FOR EACH ROW
-BEGIN
-	DELETE FROM workerMana
-		WHERE workerFk = NEW.workerFk;
-END$$
-DELIMITER ;

db/routines/vn/triggers/workerManaExcluded_beforeUpdate.sql

@@ -1,9 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`workerManaExcluded_beforeUpdate`
-	BEFORE UPDATE ON `workerManaExcluded`
-	FOR EACH ROW
-BEGIN
-	DELETE FROM workerMana
-		WHERE workerFk = NEW.workerFk;
-END$$
-DELIMITER ;

db/routines/vn/triggers/workerMana_beforeInsert.sql

@@ -1,10 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`workerMana_beforeInsert`
-	BEFORE INSERT ON `workerMana`
-	FOR EACH ROW
-BEGIN
-	IF (SELECT EXISTS(SELECT TRUE FROM workerManaExcluded WHERE workerFk = NEW.workerFk)) THEN
-		CALL util.throw('Worker is excluded from mana');
-	END IF;
-END$$
-DELIMITER ;

db/routines/vn/triggers/workerMana_beforeUpdate.sql

@@ -1,10 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`workerMana_beforeUpdate`
-	BEFORE UPDATE ON `workerMana`
-	FOR EACH ROW
-BEGIN
-	IF (SELECT EXISTS(SELECT TRUE FROM workerManaExcluded WHERE workerFk = NEW.workerFk)) THEN
-		CALL util.throw('Worker is excluded from mana');
-	END IF;
-END$$
-DELIMITER ;

db/routines/vn/views/newBornSales.sql

@@ -1,26 +1,16 @@
 CREATE OR REPLACE DEFINER=`vn`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`newBornSales`
-AS SELECT `v`.`importe` AS `amount`,
+AS SELECT
-	`v`.`Id_Cliente` AS `clientFk`,
+    `s`.`amount` AS `amount`,
-	`c`.`salesPersonFk` AS `userFk`,
+    `s`.`clientFk` AS `clientFk`,
-	`v`.`fecha` AS `dated`,
+    `c`.`departmentFk` AS `departmentFk`,
-	`cn`.`firstShipped` AS `firstShipped`
+    `s`.`dated` AS `dated`,
-FROM (
+    `cn`.`firstShipped` AS `firstShipped`
-		(
+FROM
-			(
+    ((`bs`.`clientNewBorn` `cn`
-				(
+JOIN `bs`.`sale` `s` ON
-					`bs`.`clientNewBorn` `cn`
+    (`cn`.`firstShipped` + interval 1 year > `s`.`dated`
-					JOIN `bs`.`ventas` `v` ON(
+        and `s`.`clientFk` = `cn`.`clientFk`))
-						`cn`.`firstShipped` + INTERVAL 1 year > `v`.`fecha`
+JOIN `vn`.`client` `c` ON
-						AND `v`.`Id_Cliente` = `cn`.`clientFk`
+    (`c`.`id` = `s`.`clientFk`));
-					)
-				)
-				JOIN `vn`.`client` `c` ON(`c`.`id` = `v`.`Id_Cliente`)
-			)
-			JOIN `account`.`user` `u` ON(`u`.`id` = `c`.`salesPersonFk`)
-		)
-		JOIN `account`.`role` `r` ON(`r`.`id` = `u`.`role`)
-	)
-WHERE `r`.`name` = 'salesPerson'
-	AND `u`.`name` NOT IN ('ismaelalcolea', 'ruben')

db/routines/vn/views/salesPersonSince.sql

@@ -1,16 +0,0 @@
-CREATE OR REPLACE DEFINER=`vn`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`salesPersonSince`
-AS SELECT `b`.`workerFk` AS `workerFk`,
-	min(`b`.`started`) AS `started`
-FROM (
-		(
-			`vn`.`business` `b`
-			JOIN `vn`.`worker` `w` ON(`w`.`id` = `b`.`workerFk`)
-		)
-		LEFT JOIN `vn`.`professionalCategory` `pc` ON(
-			`pc`.`id` = `b`.`workerBusinessProfessionalCategoryFk`
-		)
-	)
-WHERE `pc`.`description` = 'Aux ventas'
-GROUP BY `b`.`workerFk`

db/routines/vn/views/ticketDepartment.sql

@@ -0,0 +1,21 @@
+CREATE OR REPLACE DEFINER=`vn`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `ticketDepartment` AS
+	SELECT
+		`t`.`id` AS `ticketFk`,
+		`c`.`departmentFk` AS `departmentFk`,
+		`d`.`name` AS `departmentName`
+	FROM
+	(
+		(
+		`ticket` `t`
+			LEFT JOIN `client` `c` ON
+				(
+					`c`.`id` = `t`.`clientFk`
+				)
+			)
+			LEFT JOIN `department` `d` ON
+				(
+					`d`.`id` = `c`.`departmentFk`
+				)
+	);

db/routines/vn2008/views/Clientes.sql

@@ -39,7 +39,7 @@ AS SELECT `c`.`id` AS `id_cliente`,
 	`c`.`creditInsurance` AS `creditInsurance`,
 	`c`.`isCreatedAsServed` AS `isCreatedAsServed`,
 	`c`.`hasInvoiceSimplified` AS `hasInvoiceSimplified`,
-	`c`.`salesPersonFk` AS `Id_Trabajador`,
+	`c`.`departmentFk` AS `departmentFk`,
 	`c`.`isVies` AS `vies`,
 	`c`.`bankEntityFk` AS `bankEntityFk`,
 	`c`.`typeFk` AS `typeFk`

db/versions/11032-blackRose/00-firstScript.sql

@@ -0,0 +1,117 @@
+ALTER TABLE vn.client
+	ADD IF NOT EXISTS departmentFk INT(11) DEFAULT NULL NULL;
+
+ALTER TABLE vn.client
+	ADD IF NOT EXISTS lastDepartmentFk INT(11) DEFAULT NULL NULL;
+
+ALTER TABLE vn.client
+	ADD CONSTRAINT  client_department_FK FOREIGN KEY IF NOT EXISTS (departmentFk)
+		REFERENCES vn.department(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE vn.client
+	ADD CONSTRAINT  client_lastDepartment_FK FOREIGN KEY IF NOT EXISTS (lastDepartmentFk)
+		REFERENCES vn.department(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+UPDATE vn.client c
+		JOIN vn.worker w ON w.id = c.salesPersonFk
+		JOIN vn.business b ON b.id = w.businessFk
+	SET c.departmentFk = b.departmentFk;
+
+DROP TABLE IF EXISTS vn.departmentMana;
+CREATE OR REPLACE TABLE `vn`.`departmentMana` (
+  `departmentFk` int(10) NOT NULL,
+  `size` int(11) NOT NULL DEFAULT 300,
+  `amount` int(11) NOT NULL DEFAULT 0,
+  `pricesModifierRate` double NOT NULL DEFAULT 0,
+  `isPricesModifierActivated` tinyint(1) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`departmentFk`),
+  KEY `departmentMana_idx` (`departmentFk`),
+  CONSTRAINT `departmentMana_Department_FK` FOREIGN KEY (`departmentFk`)
+  	REFERENCES `vn`.`department` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+DROP TABLE  IF EXISTS bs.salesByClient;
+CREATE OR REPLACE TABLE `bs`.`salesByClient` (
+  `dated` date NOT NULL DEFAULT '0000-00-00',
+  `departmentFk` int(10) DEFAULT NULL,
+  `clientFk` int(11) NOT NULL,
+  `amount` decimal(10,3) NOT NULL DEFAULT 0.000,
+  `equalizationTax` decimal(10,3) NOT NULL DEFAULT 0.000,
+  `amountNewBorn` decimal(10,3) NOT NULL DEFAULT 0.000,
+  PRIMARY KEY (`dated`,`clientFk`),
+  KEY `salesByClient_clientFk` (`clientFk`),
+  KEY `salesByClient_departmentFk` (`departmentFk`),
+  KEY `salesByClient_dated` (`dated`,`clientFk`,`amount`),
+  CONSTRAINT `salesByClient_clientFk_FK`
+  	FOREIGN KEY (`clientFk`) REFERENCES `vn`.`client` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `salesByClient_department_FK`
+  	FOREIGN KEY (`departmentFk`) REFERENCES `vn`.`department` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Ventas diarias por cliente y departamento';
+
+INSERT INTO bs.salesByClient(
+		dated,
+		departmentFk,
+		clientFk,
+		amount,
+		equalizationTax,
+		amountNewBorn)
+	SELECT ss.dated, c.departmentFk, ss.clientFk, ss.amount, ss.equalizationTax, ss.amountNewBorn
+		FROM bs.salesByclientSalesPerson ss
+			JOIN vn.client c ON c.id = ss.clientFk;
+
+DROP TABLE IF EXISTS `vn`.`departmentNoUnassign`;
+
+CREATE OR REPLACE TABLE `vn`.`departmentNoUnassign` (
+  `departmentFk` int(10) NOT NULL,
+  PRIMARY KEY (`departmentFk`),
+  CONSTRAINT `departmentNoUnassign_FK` FOREIGN KEY (`departmentFk`) REFERENCES `vn`.`department` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci
+	COMMENT='Lista de departamentos comerciales que no se desasignarán automáticamente sus clientes';
+
+DROP TABLE  IF EXISTS `bs`.`portfolio`;
+
+CREATE OR REPLACE TABLE `bs`.`portfolio` (
+  `departmentFk` int(10) NOT NULL,
+  `yeared` int(4) NOT NULL,
+  `monthed` int(2) NOT NULL,
+  `amount` decimal(10,2) DEFAULT NULL,
+  PRIMARY KEY (`departmentFk`,`yeared`,`monthed`),
+  KEY `portfolio_departmentFk` (`departmentFk`),
+  CONSTRAINT `portfolio_salesDepartment_department_FK`
+  	FOREIGN KEY (`departmentFk`) REFERENCES `vn`.`department` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+
+CREATE OR REPLACE TABLE `bs`.`salesDepartmentEvolution` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `dated` date NOT NULL DEFAULT '0000-00-00',
+  `departmentFk` int(10) DEFAULT NULL,
+  `amount` decimal(10,3) NOT NULL DEFAULT 0.000,
+  `equalizationTax` decimal(10,3) NOT NULL DEFAULT 0.000,
+  `amountNewBorn` decimal(10,3) NOT NULL DEFAULT 0.000,
+  PRIMARY KEY (`id`),
+  KEY `salesDepartmentEvolution_salesDepartment` (`departmentFk`),
+  CONSTRAINT `salesDepartmentEvolution_salesDepartment_department_FK` FOREIGN KEY (`departmentFk`)
+  	REFERENCES `vn`.`department` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+RENAME TABLE vn.salespersonConfig TO vn.manaConfig;
+
+ALTER TABLE vn.company ADD IF NOT EXISTS phone varchar(15) DEFAULT NULL NULL;
+
+
+CREATE OR REPLACE TABLE `vn`.`departmentManaExcluded` (
+  `departmentFk` int(10) NOT NULL,
+  PRIMARY KEY (`departmentFk`),
+  CONSTRAINT `departmentManaExcluded_FK` FOREIGN KEY (`departmentFk`)
+  	REFERENCES `vn`.`department` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci
+	COMMENT='Departamentos de venta que tienen que estar excluidos del cálculo del maná';
+
+
+RENAME TABLE vn.workerManaExcluded TO vn.workerManaExcluded__;
+ALTER TABLE vn.workerManaExcluded__
+    COMMENT='Usuarios que tienen que estar excluidos del cálculo del maná
+    @deprecated 2024-07-16';
+
+UPDATE `salix`.`ACL` SET property = 'getDepartmentMana' WHERE property = 'getSalesPersonMana';

db/versions/11032-blackRose/01-updateClient.sql

@@ -0,0 +1,6 @@
+UPDATE `vn`.`client` c
+		LEFT JOIN `vn`.workerDepartment wd ON
+			c.salesPersonFk = wd.workerFk
+		LEFT JOIN account.`user` u ON u.id = c.salesPersonFk
+		LEFT JOIN `vn`.department d ON d.id = wd.departmentFk
+	SET c.departmentFk = d.id

db/versions/11032-blackRose/02-deprecateSharing.sql

@@ -0,0 +1,12 @@
+RENAME TABLE vn.sharingCart TO vn.sharingCart__;
+ALTER TABLE vn.sharingCart__
+COMMENT='deprecated 2025-02-18';
+
+RENAME TABLE vn.sharingCartDaily TO vn.sharingCartDaily__;
+ALTER TABLE vn.sharingCartDaily__
+COMMENT='deprecated 2025-02-18';
+
+RENAME TABLE vn.sharingClient TO vn.sharingClient__;
+ALTER TABLE vn.sharingClient__
+COMMENT='deprecated 2025-02-18';
+

db/versions/11396-blueErica/00-firstScript.sql

@@ -1,5 +0,0 @@
-DELETE FROM vn.workerMana
-	WHERE workerFk IN (
-		SELECT workerFk
-			FROM vn.workerManaExcluded
-	);

e2e/helpers/selectors.js

@@ -313,7 +313,7 @@ export default {
     clientDefaulter: {
         anyClient: 'vn-client-defaulter tbody > tr',
         firstClientName: 'vn-client-defaulter tbody > tr:nth-child(2) > td:nth-child(2) > span',
-        firstSalesPersonName: 'vn-client-defaulter tbody > tr:nth-child(2) > td:nth-child(4) > span',
+        departmentName: 'vn-client-defaulter tbody > tr:nth-child(2) > td:nth-child(4)',
         firstObservation: 'vn-client-defaulter tbody > tr:nth-child(2) > td:nth-child(9) > vn-textarea[ng-model="defaulter.observation"]',
         allDefaulterCheckbox: 'vn-client-defaulter thead vn-multi-check',
         addObservationButton: 'vn-client-defaulter vn-button[icon="icon-notes"]',

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

@@ -17,13 +17,6 @@ describe('Ticket Edit sale path', () => {
         await browser.close();
     });
 
-    it(`should click on the first sale claim icon to navigate over there`, async() => {
-        await page.waitToClick(selectors.ticketSales.firstSaleClaimIcon);
-        await page.waitForNavigation();
-        await page.goBack();
-        await page.goBack();
-    });
-
     it('should navigate to the tickets index', async() => {
         await page.waitToClick(selectors.globalItems.applicationsMenuButton);
         await page.waitForSelector(selectors.globalItems.applicationsMenuVisible);

loopback/locale/en.json

@@ -199,7 +199,7 @@
 	"This ticket is already invoiced": "This ticket is already invoiced",
 	"Negative basis of tickets: 23": "Negative basis of tickets: 23",
 	"Booking completed": "Booking complete",
-	"The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the sales person {{salesPersonId}} is in preparation",
+	"The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the department {{departmentId}} is in preparation",
 	"You can only add negative amounts in refund tickets": "You can only add negative amounts in refund tickets",
 	"Bank entity must be specified": "Bank entity must be specified",
 	"Try again": "Try again",

loopback/locale/es.json

@@ -19,7 +19,7 @@
     "That payment method requires a BIC": "El método de pago seleccionado requiere un BIC",
     "State cannot be blank": "El estado no puede estar en blanco",
     "Worker cannot be blank": "El trabajador no puede estar en blanco",
-    "Cannot change the payment method if no salesperson": "No se puede cambiar la forma de pago si no hay comercial asignado",
+    "Cannot change the payment method if no department": "No se puede cambiar la forma de pago si no hay departamento asignado",
     "can't be blank": "El campo no puede estar vacío",
     "Observation type must be unique": "El tipo de observación no puede repetirse",
     "The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero",

loopback/locale/fr.json

@@ -19,7 +19,7 @@
 	"That payment method requires a BIC": "Este método de pagamento requer um BIC",
 	"State cannot be blank": "O estado não pode ficar em branco",
 	"Worker cannot be blank": "O trabalhador não pode ficar em branco",
-	"Cannot change the payment method if no salesperson": "Não é possível alterar o método de pagamento se não houver vendedor",
+	"Cannot change the payment method if no department": "Impossible de changer le mode de paiement s'il n'y a pas de service commercial",
 	"can't be blank": "Não pode ficar em branco",
 	"Observation type must be unique": "O tipo de observação deve ser único",
 	"The credit must be an integer greater than or equal to zero": "O crédito deve ser um inteiro maior ou igual a zero",
@@ -326,7 +326,7 @@
 	"Fill all the fields": "Remplissez tous les champs",
 	"The response is not a PDF": "La réponse n'est pas un PDF",
 	"Booking completed": "Réservation terminée",
-	"The ticket is in preparation": "Le ticket [{{ticketId}}]({{{ticketUrl}}}) du commercial {{salesPersonId}} est en préparation",
+    "The ticket is in preparation": "Le ticket [{{ticketId}}]({{{ticketUrl}}}) du département {{departmentId}} est en préparation",
 	"The notification subscription of this worker cant be modified": "L'abonnement à la notification de ce travailleur ne peut pas être modifié",
 	"User disabled": "Utilisateur désactivé",
 	"The amount cannot be less than the minimum": "La quantité ne peut pas être inférieure à la quantité minimale",
@@ -369,4 +369,4 @@
 	"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}} de la route {{{fullUrl}}} a été livré hors service."
-}
+}

loopback/locale/pt.json

@@ -19,7 +19,7 @@
 	"That payment method requires a BIC": "Esse método de pagamento requer um BIC",
 	"State cannot be blank": "O estado não pode estar em branco",
 	"Worker cannot be blank": "O trabalhador não pode estar em branco",
-	"Cannot change the payment method if no salesperson": "Não é possível alterar o método de pagamento se não houver vendedor",
+	"Cannot change the payment method if no department": "Não é possível alterar o método de pagamento se não houver departamento de vendas",
 	"can't be blank": "não pode estar em branco",
 	"Observation type must be unique": "O tipo de observação deve ser único",
 	"The credit must be an integer greater than or equal to zero": "O crédito deve ser um número inteiro maior ou igual a zero",
@@ -326,7 +326,7 @@
 	"Fill all the fields": "Preencha todos os campos",
 	"The response is not a PDF": "A resposta não é um PDF",
 	"Booking completed": "Reserva concluída",
-	"The ticket is in preparation": "O ticket está em preparação [{{ticketId}}]({{{ticketUrl}}}) comercial {{salesPersonId}}",
+	"The ticket is in preparation": "O ticket está em preparação [{{ticketId}}]({{{ticketUrl}}}) do departamento {{departmentId}}",
 	"The notification subscription of this worker cant be modified": "A inscrição de notificação deste trabalhador não pode ser modificada",
 	"User disabled": "Usuário desativado",
 	"The amount cannot be less than the minimum": "O valor não pode ser menor que o mínimo",
@@ -368,4 +368,4 @@
 	"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}} da rota {{{fullUrl}}} foi entregue fora de ordem."
-}
+}

modules/claim/back/methods/claim-state/specs/isEditable.spec.js

@@ -1,14 +1,12 @@
 const app = require('vn-loopback/server/server');
 
 describe('claimstate isEditable()', () => {
-    const salesPersonId = 18;
     const claimManagerId = 72;
     it('should return false if the given state does not exist', async() => {
         const tx = await app.models.Claim.beginTransaction({});
 
         try {
             const options = {transaction: tx};
-
             const ctx = {req: {accessToken: {userId: claimManagerId}}};
             const result = await app.models.ClaimState.isEditable(ctx, 9999, options);
 
@@ -26,7 +24,7 @@ describe('claimstate isEditable()', () => {
 
         try {
             const options = {transaction: tx};
-
+            const salesPersonId = 18;
             const ctx = {req: {accessToken: {userId: salesPersonId}}};
             const result = await app.models.ClaimState.isEditable(ctx, 3, options);
 

modules/claim/back/methods/claim/claimPickupEmail.js

@@ -44,7 +44,6 @@ module.exports = Self => {
     Self.claimPickupEmail = async ctx => {
         const models = Self.app.models;
         const $t = ctx.req.__; // $translate
-        const url = await Self.app.models.Url.getUrl();
 
         const args = Object.assign({}, ctx.args);
         const params = {
@@ -61,20 +60,27 @@ module.exports = Self => {
             include: {
                 relation: 'client',
                 scope: {
-                    fields: ['name', 'salesPersonFk']
+                    fields: ['name', 'departmentFk'],
+                    include: {
+                        relation: 'department',
+                        scope: {
+                            fields: ['id', 'chatName']
+                        }
+                    }
                 }
             }
         });
 
-        const message = $t('Claim pickup order sent', {
+        const department = claim.client().department();
-            claimId: args.id,
+        if (department) {
-            clientName: claim.client().name,
+            const url = await Self.app.models.Url.getUrl();
-            claimUrl: `${url}claim/${args.id}/summary`,
+            const message = $t('Claim pickup order sent', {
-        });
+                claimId: args.id,
-        const salesPersonId = claim.client().salesPersonFk;
+                clientName: claim.client().name,
-        if (salesPersonId)
+                claimUrl: `${url}claim/${args.id}/summary`,
-            await models.Chat.sendCheckingPresence(ctx, salesPersonId, message);
+            });
-
+            await models.Chat.send(ctx, `#${department.chatName}`, message);
+        }
         const email = new Email('claim-pickup-order', params);
 
         return email.send();

modules/claim/back/methods/claim/createFromSales.js

@@ -47,10 +47,11 @@ module.exports = Self => {
                 include: {
                     relation: 'client',
                     scope: {
+                        fields: ['id', 'departmentFk'],
                         include: {
-                            relation: 'salesPersonUser',
+                            relation: 'department',
                             scope: {
-                                fields: ['id', 'name']
+                                fields: ['id', 'chatName']
                             }
                         }
                     }
@@ -91,8 +92,8 @@ module.exports = Self => {
 
             await Promise.all(promises);
 
-            const salesPerson = ticket.client().salesPersonUser();
+            const department = ticket.client().department();
-            if (salesPerson) {
+            if (department) {
                 const url = await Self.app.models.Url.getUrl();
 
                 const message = $t('Created claim', {
@@ -102,7 +103,7 @@ module.exports = Self => {
                     claimUrl: `${url}claim/${newClaim.id}/summary`,
                     changes: changesMade
                 });
-                await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message);
+                await models.Chat.send(ctx, `#${department.chatName}`, message);
             }
 
             if (tx) await tx.commit();

modules/claim/back/methods/claim/filter.js

@@ -51,9 +51,9 @@ module.exports = Self => {
                 http: {source: 'query'}
             },
             {
-                arg: 'salesPersonFk',
+                arg: 'departmentFk',
                 type: 'number',
-                description: 'The salesPerson id',
+                description: 'The department id',
                 http: {source: 'query'}
             },
             {
@@ -158,8 +158,8 @@ module.exports = Self => {
                 return {'cl.id': {inq: claimIdsByItemFk}};
             case 'claimResponsibleFk':
                 return {'cl.id': {inq: claimIdsByClaimResponsibleFk}};
-            case 'salesPersonFk':
+            case 'departmentFk':
-                return {'c.salesPersonFk': value};
+                return {'c.departmentFk': value};
             case 'attenderFk':
                 return {'cl.workerFk': value};
             case 'created':

modules/claim/back/methods/claim/getSummary.js

@@ -53,9 +53,9 @@ module.exports = Self => {
                 {
                     relation: 'client',
                     scope: {
-                        fields: ['salesPersonFk', 'name'],
+                        fields: ['departmentFk', 'name'],
                         include: {
-                            relation: 'salesPersonUser',
+                            relation: 'department',
                             scope: {
                                 fields: ['id', 'name']
                             }

modules/claim/back/methods/claim/regularizeClaim.js

@@ -41,21 +41,21 @@ module.exports = Self => {
                     relation: 'claimDestination',
                     fields: ['addressFk']
                 },
-                where: {claimFk: claimFk}
+                where: {claimFk}
             }, myOptions);
 
             for (let claimEnd of claimEnds) {
                 const destination = claimEnd.claimDestination();
                 const sale = await getSale(claimEnd.saleFk, myOptions);
-                const addressId = destination && destination.addressFk;
+                const addressId = destination?.addressFk;
 
                 let address;
                 if (addressId)
                     address = await models.Address.findById(addressId, null, myOptions);
 
-                const salesPerson = sale.ticket().client().salesPersonUser();
+                const department = sale.ticket().client().department();
-                if (salesPerson) {
+                if (department) {
-                    const nickname = address && address.nickname || destination.description;
+                    const nickname = address?.nickname || destination.description;
                     const url = await Self.app.models.Url.getUrl();
                     const message = $t('Sent units from ticket', {
                         quantity: sale.quantity,
@@ -66,7 +66,7 @@ module.exports = Self => {
                         ticketUrl: `${url}ticket/${sale.ticketFk}/sale`,
                         itemUrl: `${url}item/${sale.itemFk}/summary`
                     });
-                    await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message);
+                    await models.Chat.send(ctx, `#${department.chatName}`, message);
                 }
 
                 if (!address) continue;
@@ -120,10 +120,11 @@ module.exports = Self => {
                         include: {
                             relation: 'client',
                             scope: {
+                                fields: ['departmentFk'],
                                 include: {
-                                    relation: 'salesPersonUser',
+                                    relation: 'department',
                                     scope: {
-                                        fields: ['id', 'name']
+                                        fields: ['id', 'chatName']
                                     }
                                 }
                             }

modules/claim/back/methods/claim/specs/regularizeClaim.spec.js

@@ -39,7 +39,7 @@ describe('claim regularizeClaim()', () => {
         try {
             const options = {transaction: tx};
 
-            spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
+            spyOn(chatModel, 'send').and.callThrough();
 
             claimEnds = await importTicket(ticketId, claimId, userId, options);
 
@@ -55,8 +55,8 @@ describe('claim regularizeClaim()', () => {
             expect(trashTicket.addressFk).toEqual(trashAddress);
             expect(claimBefore.claimStateFk).toEqual(pendentState);
             expect(claimAfter.claimStateFk).toEqual(resolvedState);
-            expect(chatModel.sendCheckingPresence).toHaveBeenCalledWith(ctx, 18, 'Trash');
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '#es_vip_equipo', 'Trash');
-            expect(chatModel.sendCheckingPresence).toHaveBeenCalledTimes(4);
+            expect(chatModel.send).toHaveBeenCalledTimes(4);
 
             await tx.rollback();
         } catch (e) {
@@ -71,17 +71,17 @@ describe('claim regularizeClaim()', () => {
         try {
             const options = {transaction: tx};
 
-            spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
+            spyOn(chatModel, 'send').and.callThrough();
 
             claimEnds = await importTicket(ticketId, claimId, userId, options);
 
-            for (claimEnd of claimEnds)
+            for (let claimEnd of claimEnds)
                 await claimEnd.updateAttributes({claimDestinationFk: okDestination}, options);
 
             await models.Claim.regularizeClaim(ctx, claimId, options);
 
-            expect(chatModel.sendCheckingPresence).toHaveBeenCalledWith(ctx, 18, 'Bueno');
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '#es_vip_equipo', 'Bueno');
-            expect(chatModel.sendCheckingPresence).toHaveBeenCalledTimes(4);
+            expect(chatModel.send).toHaveBeenCalledTimes(4);
 
             await tx.rollback();
         } catch (e) {
@@ -90,23 +90,23 @@ describe('claim regularizeClaim()', () => {
         }
     });
 
-    it('should send a chat message to the salesPerson when claim isPickUp is enabled', async() => {
+    it('should send a chat message to the department when claim isPickUp is enabled', async() => {
         const tx = await models.Claim.beginTransaction({});
 
         try {
             const options = {transaction: tx};
 
-            spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
+            spyOn(chatModel, 'send').and.callThrough();
 
             claimEnds = await importTicket(ticketId, claimId, userId, options);
 
-            for (claimEnd of claimEnds)
+            for (let claimEnd of claimEnds)
                 await claimEnd.updateAttributes({claimDestinationFk: okDestination}, options);
 
             await models.Claim.regularizeClaim(ctx, claimId, options);
 
-            expect(chatModel.sendCheckingPresence).toHaveBeenCalledWith(ctx, 18, 'Bueno');
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '#es_vip_equipo', 'Bueno');
-            expect(chatModel.sendCheckingPresence).toHaveBeenCalledTimes(4);
+            expect(chatModel.send).toHaveBeenCalledTimes(4);
 
             await tx.rollback();
         } catch (e) {

modules/claim/back/methods/claim/specs/updateClaim.spec.js

@@ -31,11 +31,11 @@ describe('Update Claim', () => {
             const newClaim = await app.models.Claim.create(originalData, options);
 
             const forbiddenState = 3;
-            const salesPersonId = 18;
+            const userId = 18;
             const ctx = {
                 req: {
                     accessToken: {
-                        userId: salesPersonId
+                        userId
                     }
                 },
                 args: {
@@ -63,7 +63,7 @@ describe('Update Claim', () => {
             const newClaim = await app.models.Claim.create(originalData, options);
 
             const chatModel = app.models.Chat;
-            spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
+            spyOn(chatModel, 'send').and.callThrough();
 
             const pendingState = claimStatesMap.pending;
             const ctx = {
@@ -83,7 +83,7 @@ describe('Update Claim', () => {
             let updatedClaim = await app.models.Claim.findById(newClaim.id, null, options);
 
             expect(updatedClaim.observation).toEqual(ctx.args.observation);
-            expect(chatModel.sendCheckingPresence).toHaveBeenCalled();
+            expect(chatModel.send).toHaveBeenCalled();
 
             await tx.rollback();
         } catch (e) {
@@ -101,7 +101,7 @@ describe('Update Claim', () => {
             const newClaim = await app.models.Claim.create(originalData, options);
 
             const chatModel = app.models.Chat;
-            spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
+            spyOn(chatModel, 'send').and.callThrough();
 
             const canceledState = claimStatesMap.canceled;
             const ctx = {
@@ -121,7 +121,7 @@ describe('Update Claim', () => {
             let updatedClaim = await app.models.Claim.findById(newClaim.id, null, options);
 
             expect(updatedClaim.observation).toEqual(ctx.args.observation);
-            expect(chatModel.sendCheckingPresence).toHaveBeenCalledTimes(2);
+            expect(chatModel.send).toHaveBeenCalledTimes(2);
 
             await tx.rollback();
         } catch (e) {
@@ -139,7 +139,7 @@ describe('Update Claim', () => {
             const newClaim = await app.models.Claim.create(originalData, options);
 
             const chatModel = app.models.Chat;
-            spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
+            spyOn(chatModel, 'send').and.callThrough();
 
             const claimManagerId = 72;
             const ctx = {
@@ -162,7 +162,7 @@ describe('Update Claim', () => {
             expect(updatedClaim.observation).toEqual(ctx.args.observation);
             expect(updatedClaim.claimStateFk).toEqual(ctx.args.claimStateFk);
             expect(updatedClaim.workerFk).toEqual(ctx.args.workerFk);
-            expect(chatModel.sendCheckingPresence).toHaveBeenCalled();
+            expect(chatModel.send).toHaveBeenCalled();
 
             await tx.rollback();
         } catch (e) {

modules/claim/back/methods/claim/updateClaim.js

@@ -63,13 +63,19 @@ module.exports = Self => {
                 include: {
                     relation: 'client',
                     scope: {
+                        fields: ['departmentFk'],
                         include: {
-                            relation: 'salesPersonUser'
+                            relation: 'department',
+                            scope: {
+                                fields: ['id', 'chatName']
+                            }
                         }
                     }
                 }
             }, myOptions);
 
+            const department = claim.client().department();
+
             const changedPickup = args.pickup && args.pickup != claim.pickup;
 
             if (args.claimStateFk) {
@@ -84,12 +90,16 @@ module.exports = Self => {
             delete args.ctx;
             const updatedClaim = await claim.updateAttributes(args, myOptions);
 
-            const salesPerson = claim.client().salesPersonUser();
+            if (department) {
-            if (salesPerson && args.claimStateFk) {
+                if (changedPickup && updatedClaim.pickup)
-                const newState = await models.ClaimState.findById(args.claimStateFk, null, myOptions);
+                    await notifyPickUp(ctx, department, claim);
-                await notifyStateChange(ctx, salesPerson.id, claim, newState.description);
+
-                if (newState.code == 'canceled')
+                if (args.claimStateFk) {
-                    await notifyStateChange(ctx, claim.workerFk, claim, newState.description);
+                    const newState = await models.ClaimState.findById(args.claimStateFk, null, myOptions);
+                    await notifyStateChange(ctx, department, claim, newState.description);
+                    if (newState.code == 'canceled')
+                        await notifyStateChange(ctx, claim.workerFk, claim, newState.description);
+                }
             }
 
             if (tx) await tx.commit();
@@ -101,7 +111,7 @@ module.exports = Self => {
         }
     };
 
-    async function notifyStateChange(ctx, workerId, claim, newState) {
+    async function notifyStateChange(ctx, department, claim, newState) {
         const models = Self.app.models;
         const url = await models.Url.getUrl();
         const $t = ctx.req.__;
@@ -112,6 +122,20 @@ module.exports = Self => {
             claimUrl: `${url}claim/${claim.id}/summary`,
             newState
         });
-        await models.Chat.sendCheckingPresence(ctx, workerId, message);
+        await models.Chat.send(ctx, `#${department.chatName}`, message);
+    }
+
+    async function notifyPickUp(ctx, department, claim) {
+        const models = Self.app.models;
+        const url = await models.Url.getUrl();
+        const $t = ctx.req.__; // $translate
+
+        const message = $t('Claim will be picked', {
+            claimId: claim.id,
+            clientName: claim.client().name,
+            claimUrl: `${url}claim/${claim.id}/summary`,
+            claimPickup: $t(claim.pickup)
+        });
+        await models.Chat.send(ctx, `#${department.chatName}`, message);
     }
 };

modules/claim/front/descriptor/index.html

@@ -37,9 +37,9 @@
             <vn-label-value
                 label="Salesperson">
                 <span
-                    ng-click="workerDescriptor.show($event, $ctrl.claim.client.salesPersonFk)"
+                    ng-click="workerDescriptor.show($event, $ctrl.claim.client.departmentFk)"
                     class="link">
-                    {{$ctrl.claim.client.salesPersonUser.name}}
+                    {{$ctrl.claim.client.department.name}}
                 </span>
             </vn-label-value>
             <vn-label-value

modules/client/back/locale/client/en.yml

@@ -35,7 +35,7 @@ columns:
     sageTaxTypeFk: sage tax type
     sageTransactionTypeFk: sage transaction type
     businessTypeFk: business type
-    salesPersonFk: sales person
+    departmentFk: sales department
     hasElectronicInvoice: electronic invoice
     payMethodFk: pay method
     provinceFk: province
@@ -50,6 +50,6 @@ columns:
     isCreatedAsServed: created as served
     hasInvoiceSimplified: simplified invoice
     typeFk: type
-    lastSalesPersonFk: last salesperson
+    lastdepartmentFk: last sales department
     rating: rating
     recommendedCredit: recommended credit

modules/client/back/locale/client/es.yml

@@ -35,7 +35,7 @@ columns:
     sageTaxTypeFk: tipo impuesto sage
     sageTransactionTypeFk: tipo transacción Sage
     businessTypeFk: tipo negocio
-    salesPersonFk: comercial
+    departmentFk: departamento comercial
     hasElectronicInvoice: factura electrónica
     payMethodFk: método pago
     provinceFk: provincia
@@ -50,6 +50,6 @@ columns:
     isCreatedAsServed: creado como servido
     hasInvoiceSimplified: factura simple
     typeFk: tipo
-    lastSalesPersonFk: último comercial
+    lastdepartmentFk: último departmaneto comercial
     rating: clasificación
     recommendedCredit: crédito recomendado

modules/client/back/methods/client/consumptionSendQueued.js

@@ -29,26 +29,26 @@ module.exports = Self => {
 
                 const clients = await Self.rawSql(`
                     SELECT
-                            c.id AS clientFk,
+                            c.id clientFk,
-                            c.email AS clientEmail,
+                            c.email clientEmail,
-                            eu.email salesPersonEmail
+                            d.notificationEmail departmentEmail
-                    FROM client c
+                        FROM client c
-                        JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
+                            JOIN department d ON d.id = c.departmentFk
-                        JOIN ticket t ON t.clientFk = c.id
+                            JOIN ticket t ON t.clientFk = c.id
-                        JOIN sale s ON s.ticketFk = t.id
+                            JOIN sale s ON s.ticketFk = t.id
-                        JOIN item i ON i.id = s.itemFk
+                            JOIN item i ON i.id = s.itemFk
-                        JOIN itemType it ON it.id = i.typeFk
+                            JOIN itemType it ON it.id = i.typeFk
-                    WHERE c.id IN(?)
+                        WHERE c.id IN(?)
-                        AND it.isPackaging = FALSE
+                            AND NOT it.isPackaging
-                        AND DATE(t.shipped) BETWEEN ? AND ?
+                            AND DATE(t.shipped) BETWEEN ? AND ?
-                    GROUP BY c.id`, [params.clients, params.from, params.to]);
+                        GROUP BY c.id`, [params.clients, params.from, params.to]);
 
                 for (const client of clients) {
                     try {
                         const args = {
                             id: client.clientFk,
                             recipient: client.clientEmail,
-                            replyTo: client.salesPersonEmail,
+                            replyTo: client.departmentEmail,
                             from: params.from,
                             to: params.to
                         };

modules/client/back/methods/client/createWithUser.js

@@ -68,7 +68,7 @@ module.exports = function(Self) {
                 fi: data.fi,
                 socialName: data.socialName,
                 email: data.email,
-                salesPersonFk: data.salesPersonFk,
+                departmentFk: data.departmentFk,
                 postcode: data.postcode,
                 street: data.street,
                 city: data.city,

modules/client/back/methods/client/extendedListFilter.js

@@ -23,7 +23,7 @@ module.exports = Self => {
                 description: 'The client name',
             },
             {
-                arg: 'salesPersonFk',
+                arg: 'departmentFk',
                 type: 'number',
             },
             {
@@ -92,7 +92,7 @@ module.exports = Self => {
             case 'sageTransactionTypeFk':
                 return {'stt.CodigoTransaccion': value};
             case 'name':
-            case 'salesPersonFk':
+            case 'departmentFk':
             case 'fi':
             case 'socialName':
             case 'city':
@@ -138,8 +138,8 @@ module.exports = Self => {
                     ct.name country,
                     p.id AS provinceFk,
                     p.name AS province,
-                    u.id AS salesPersonFk,
+                    d.id departmentFk,
-                    u.name AS salesPerson,
+                    d.name salesDeparment,
                     bt.code AS businessTypeFk,
                     bt.description AS businessType,
                     pm.id AS payMethodFk,
@@ -149,7 +149,7 @@ module.exports = Self => {
                     stt.CodigoTransaccion AS sageTransactionTypeFk,
                     stt.Transaccion AS sageTransactionType
                 FROM client c
-                    LEFT JOIN account.user u ON u.id = c.salesPersonFk
+                    LEFT JOIN department d ON d.id = c.departmentFk
                     LEFT JOIN country ct ON ct.id = c.countryFk
                     LEFT JOIN province p ON p.id = c.provinceFk
                     LEFT JOIN businessType bt ON bt.code = c.businessTypeFk

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

@@ -22,7 +22,7 @@ module.exports = Self => {
                 description: 'The client name',
             },
             {
-                arg: 'salesPersonFk',
+                arg: 'salesDeparmentFk',
                 type: 'number',
             },
             {
@@ -126,7 +126,7 @@ module.exports = Self => {
                     {'a.provinceFk': value}
                 ]};
             case 'name':
-            case 'salesPersonFk':
+            case 'departmentFk':
             case 'fi':
             case 'socialName':
             case 'email':
@@ -146,7 +146,6 @@ module.exports = Self => {
                     c.socialName,
                     c.phone,
                     a.phone,
-                    c.mobile,
                     c.city,
                     a.city,
                     c.postcode,
@@ -154,14 +153,14 @@ module.exports = Self => {
                     c.email,
                     c.isActive,
                     c.isFreezed,
-                    p.id AS provinceClientFk,
+                    p.id provinceClientFk,
-                    a.provinceFk AS provinceAddressFk,
+                    a.provinceFk provinceAddressFk,
-                    p.name AS province,
+                    p.name province,
-                    u.id AS salesPersonFk,
+                    d.id departmentFk,
-                    u.name AS salesPerson,
+                    d.name departmentName,
                     co.name AS country
                 FROM client c
-                    LEFT JOIN account.user u ON u.id = c.salesPersonFk
+                    LEFT JOIN department d ON d.id = c.departmentFk
                     LEFT JOIN province p ON p.id = c.provinceFk
                     LEFT JOIN country co ON co.id = c.countryFk
                     JOIN address a ON a.clientFk = c.id

modules/client/back/methods/client/getCard.js

@@ -42,7 +42,7 @@ module.exports = function(Self) {
                     }
                 },
                 {
-                    relation: 'salesPersonUser',
+                    relation: 'department',
                     scope: {
                         fields: ['id', 'name']
                     }

modules/client/back/methods/client/specs/createWithUser.spec.js

@@ -36,7 +36,8 @@ describe('Client Create', () => {
             street: 'WALL STREET',
             city: 'New York',
             businessTypeFk: 'florist',
-            provinceFk: 1
+            provinceFk: 1,
+            departmentFk: 155
         };
 
         try {

modules/client/back/methods/client/specs/extendedListFilter.spec.js

@@ -86,14 +86,14 @@ describe('client extendedListFilter()', () => {
         }
     });
 
-    it('should return the clients matching the "salesPersonFk" argument', async() => {
+    it('should return the clients matching the "salesDepartmementFk" argument', async() => {
         const tx = await models.Client.beginTransaction({});
-        const salesPersonId = 18;
+        const salesDepartmementId = 155;
 
         try {
             const options = {transaction: tx};
 
-            const ctx = {req: {accessToken: {userId: 1}}, args: {salesPersonFk: salesPersonId}};
+            const ctx = {req: {accessToken: {userId: 1}}, args: {departmentFk: salesDepartmementId}};
             const filter = {};
             const result = await models.Client.extendedListFilter(ctx, filter, options);
 
@@ -101,7 +101,7 @@ describe('client extendedListFilter()', () => {
             const randomResultClient = result[randomIndex];
 
             expect(result.length).toBeGreaterThanOrEqual(5);
-            expect(randomResultClient.salesPersonFk).toEqual(salesPersonId);
+            expect(randomResultClient.departmentFk).toEqual(salesDepartmementId);
 
             await tx.rollback();
         } catch (e) {

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

@@ -86,14 +86,14 @@ describe('client filter()', () => {
         }
     });
 
-    it('should return the clients matching the "salesPersonFk" argument', async() => {
+    it('should return the clients matching the "departmentFk" argument', async() => {
         const tx = await models.Client.beginTransaction({});
-        const salesPersonId = 18;
+        const departmentId = 155;
 
         try {
             const options = {transaction: tx};
 
-            const ctx = {req: {accessToken: {userId: 1}}, args: {salesPersonFk: salesPersonId}};
+            const ctx = {req: {accessToken: {userId: 1}}, args: {departmentFk: departmentId}};
             const filter = {};
             const result = await models.Client.filter(ctx, filter, options);
 
@@ -101,7 +101,7 @@ describe('client filter()', () => {
             const randomResultClient = result[randomIndex];
 
             expect(result.length).toBeGreaterThanOrEqual(5);
-            expect(randomResultClient.salesPersonFk).toEqual(salesPersonId);
+            expect(randomResultClient.departmentFk).toEqual(departmentId);
 
             await tx.rollback();
         } catch (e) {

modules/client/back/methods/client/summary.js

@@ -46,7 +46,7 @@ module.exports = Self => {
                     }
                 },
                 {
-                    relation: 'salesPersonUser',
+                    relation: 'department',
                     scope: {
                         fields: ['id', 'name']
                     }

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

@@ -38,8 +38,7 @@ module.exports = Self => {
             Object.assign(myOptions, options);
 
         const where = buildFilter(ctx.args, (param, value) => {
-            switch (param) {
+            if (param === 'search') {
-            case 'search':
                 return {or: [
                     {'c.id': value},
                     {'c.name': {like: `%${value}%`}}
@@ -57,16 +56,17 @@ module.exports = Self => {
 
         let stmt = new ParameterizedSQL(
             `CREATE OR REPLACE TEMPORARY TABLE tmp.defaulters
-                WITH clientObservations AS
+                WITH wClientObservations AS
                 (SELECT clientFk,text, created, workerFk
                     FROM vn.clientObservation
                     GROUP BY clientFk
                     ORDER BY created DESC
                 )SELECT c.id clientFk,
                         c.name clientName,
-                        c.salesPersonFk,
                         c.businessTypeFk = 'worker' isWorker,
-                        u.name salesPersonName,
+                        c.departmentFk,
+                        c.businessTypeFk,
+                        de.name departmentName,
                         d.amount,
                         co.created,
                         co.text observation,
@@ -78,15 +78,13 @@ module.exports = Self => {
                         c.countryFk,
                         pm.name payMethod,
                         r.finished IS NULL hasRecovery,
-                        dp.id departmentFk,
+                        de.notificationEmail departmentEmail
-                        dp.name departmentName,
-                        dp.notificationEmail departmentEmail
                     FROM defaulter d
                         JOIN client c ON c.id = d.clientFk
                         JOIN country cn ON cn.id = c.countryFk
                         JOIN payMethod pm ON pm.id = c.payMethodFk
-                        LEFT JOIN clientObservations co ON co.clientFk = c.id
+                        LEFT JOIN wClientObservations co ON co.clientFk = c.id
-                        LEFT JOIN account.user u ON u.id = c.salesPersonFk
+                        LEFT JOIN department de ON de.id = c.departmentFk
                         LEFT JOIN account.user uw ON uw.id = co.workerFk
                         LEFT JOIN (
                         SELECT r1.started, r1.clientFk, r1.finished
@@ -99,9 +97,7 @@ module.exports = Self => {
                                     AND r1.started = r2.maxStarted
                             WHERE r1.finished
                             GROUP BY r1.clientFk
-                        ) r ON r.clientFk = c.id
+                        ) r ON r.clientFk = c.id`);
-                        LEFT JOIN workerDepartment wd ON wd.workerFk = u.id
-                        LEFT JOIN department dp ON dp.id = wd.departmentFk`);
 
         stmt.merge(conn.makeWhere(filter.where));
         stmts.push(stmt);

modules/client/back/models/client.js

@@ -126,12 +126,12 @@ module.exports = Self => {
         done();
     }
 
-    Self.validate('payMethod', hasSalesMan, {
+    Self.validate('payMethod', hasDepartment, {
-        message: 'Cannot change the payment method if no salesperson'
+        message: 'Cannot change the payment method if no department'
     });
 
-    function hasSalesMan(err) {
+    function hasDepartment(err) {
-        if (this.payMethod && !this.salesPersonUser)
+        if (this.payMethod && !this.department)
             err();
     }
 
@@ -283,9 +283,8 @@ module.exports = Self => {
         const finalState = getFinalState(ctx);
         const payMethodWithIban = 4;
 
-        // Validate socialName format
         const hasChanges = orgData && changes;
-        const socialName = changes && changes.socialName || orgData && orgData.socialName;
+        const socialName = changes?.socialName || orgData?.socialName;
         const isTaxDataChecked = hasChanges && (changes.isTaxDataChecked || orgData.isTaxDataChecked);
 
         const socialNameChanged = hasChanges
@@ -296,7 +295,7 @@ module.exports = Self => {
         if ((socialNameChanged || isTaxDataCheckedChanged) && !isAlpha(socialName))
             throw new UserError(`The social name has an invalid format`);
 
-        if (changes.salesPerson === null) {
+        if (changes.department === null) {
             changes.credit = 0;
             changes.discount = 0;
             changes.payMethodFk = 5; // Credit card
@@ -358,18 +357,17 @@ module.exports = Self => {
             const $t = httpRequest.__;
             const url = await Self.app.models.Url.getUrl();
 
-            const salesPersonId = instance.salesPersonFk;
+            const departmentId = instance.departmentFk;
 
-            if (salesPersonId) {
+            if (departmentId) {
-                // Send email to client
+                const department = await models.Department.findById(departmentId);
                 if (instance.email) {
                     const {Email} = require('vn-print');
-                    const worker = await models.EmailUser.findById(salesPersonId);
                     const params = {
                         id: instance.id,
                         recipientId: instance.id,
                         recipient: instance.email,
-                        replyTo: worker.email
+                        replyTo: department.notificationEmail
                     };
                     const email = new Email('payment-update', params);
                     await email.send();
@@ -381,19 +379,15 @@ module.exports = Self => {
                     clientName: instance.name,
                     url: fullUrl
                 });
-                await models.Chat.sendCheckingPresence(httpCtx, salesPersonId, message);
+                await models.Chat.send(httpCtx, `#${department.chatName}`, message);
             }
         }
 
-        const workerIdBefore = oldInstance.salesPersonFk;
+        if (oldInstance.departmentFk != newInstance.departmentFk)
-        const workerIdAfter = newInstance.salesPersonFk;
+            await Self.notifyAssignment(instance, oldInstance.departmentFk, newInstance.departmentFk);
-        const assignmentChanged = workerIdBefore != workerIdAfter;
-        if (assignmentChanged)
-            await Self.notifyAssignment(instance, workerIdBefore, workerIdAfter);
     });
 
-    // Send notification on client worker assignment
+    Self.notifyAssignment = async function notifyAssignment(client, previousDepartmentId, currentDepartmentId) {
-    Self.notifyAssignment = async function notifyAssignment(client, previousWorkerId, currentWorkerId) {
         const loopBackContext = LoopBackContext.getCurrentContext();
         const httpCtx = {req: loopBackContext.active};
         const httpRequest = httpCtx.req.http.req;
@@ -401,38 +395,38 @@ module.exports = Self => {
         const url = await Self.app.models.Url.getUrl();
         const models = Self.app.models;
 
-        let previousWorker = {name: $t('None')};
+        let previousDepartment = {name: $t('None'), chatName: $t('None')};
-        let currentWorker = {name: $t('None')};
+        let currentDepartment = {name: $t('None'), chatName: $t('None')};
-        if (previousWorkerId) {
+        if (previousDepartmentId) {
-            const worker = await models.Worker.findById(previousWorkerId, {
+            previousDepartment = await models.Department.findOne({
-                include: {relation: 'user'}
+                field: ['name', 'chatName'],
+                where: {
+                    id: previousDepartmentId
+                }
             });
-            previousWorker.user = worker && worker.user().name;
-            previousWorker.name = worker && worker.user().nickname;
         }
-
+        if (currentDepartmentId) {
-        if (currentWorkerId) {
+            currentDepartment = await models.Department.findOne({
-            const worker = await models.Worker.findById(currentWorkerId, {
+                field: ['name', 'chatName'],
-                include: {relation: 'user'}
+                where: {
+                    id: currentDepartmentId
+                }
             });
-            currentWorker.user = worker && worker.user().name;
-            currentWorker.name = worker && worker.user().nickname;
         }
-
         const fullUrl = `${url}client/${client.id}/basic-data`;
         const message = $t('Client assignment has changed', {
             clientId: client.id,
             clientName: client.name,
             url: fullUrl,
-            previousWorkerName: previousWorker.name,
+            previousDepartmentName: previousDepartment.name,
-            currentWorkerName: currentWorker.name
+            currentDepartmentName: currentDepartment.name
         });
 
-        if (previousWorkerId)
+        if (previousDepartmentId)
-            await models.Chat.send(httpCtx, `@${previousWorker.user}`, message);
+            await models.Chat.send(httpCtx, `#${previousDepartment.chatName}`, message);
 
-        if (currentWorkerId)
+        if (currentDepartmentId)
-            await models.Chat.send(httpCtx, `@${currentWorker.user}`, message);
+            await models.Chat.send(httpCtx, `#${currentDepartment.chatName}`, message);
     };
 
     // Credit change validations