back/methods/notification/specs/getList.spec.js

@@ -7,7 +7,7 @@ describe('NotificationSubscription getList()', () => {
         const notifications = await models.Notification.find({});
         const totalAvailable = notifications.length - active.length;
 
-        expect(active.length).toEqual(3);
+        expect(active.length).toEqual(2);
         expect(available.length).toEqual(totalAvailable);
     });
 });

db/dump/fixtures.before.sql

@@ -2809,8 +2809,7 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
         (3, 'not-main-printer-configured', 'A printer distinct than main has been configured'),
         (4, 'supplier-pay-method-update', 'A supplier pay method has been updated'),
         (5, 'modified-entry', 'An entry has been modified'),
-        (6, 'book-entry-deleted', 'accounting entries deleted'),
+        (6, 'book-entry-deleted', 'accounting entries deleted');
-        (7, 'zone-included','An email to notify zoneCollisions');
 
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
     VALUES
@@ -2820,8 +2819,7 @@ INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
         (3, 9),
         (4, 1),
         (5, 9),
-        (6, 9),
+        (6, 9);
-        (7, 9);
 
 INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`)
     VALUES
@@ -2838,8 +2836,8 @@ INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
         (2, 1109),
 	    (1, 9),
         (1, 3),
-        (6, 9),
+        (6, 9);
-        (7, 9);
+
 
 INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`)
     VALUES

db/routines/vn/procedures/ticket_CloneAll.sql

@@ -15,7 +15,7 @@ BEGIN
 	
 	SET vNewShipped = IFNULL(vNewShipped, util.VN_CURDATE());
 
-	CALL ticket_Clone(vTicketFk, vNewTicketFk);
+	CALL ticket_Clone(vTicketFk, vNewTicketFk, vWithWarehouse);
 	
 	UPDATE ticket 
 		SET landed = TIMESTAMPADD(DAY, DATEDIFF(vNewShipped, shipped), landed),

db/routines/vn/procedures/zone_getCollisions.sql

@@ -1,5 +1,4 @@
 DELIMITER $$
-
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getCollisions`()
 BEGIN
 /**
@@ -11,7 +10,6 @@ BEGIN
 	DECLARE vZoneFk INT;
 	DECLARE vIsDone INT DEFAULT FALSE;
 	DECLARE vTableCollisions TEXT;
-    DECLARE json_data JSON;
 	DECLARE cur1 CURSOR FOR SELECT zoneFk from tmp.zoneOption;
 		
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE;
@@ -79,26 +77,45 @@ BEGIN
 	        GROUP BY z.agencyModeFk, zn.geoFk, zw.warehouseFk
 	        HAVING count(*) > 1;
 	
-    -- Recojo los datos de la zona que ha dado conflicto
+	SELECT '<table  cellspacing="10">
-    SELECT JSON_ARRAYAGG(
+				<tr>
-        JSON_OBJECT(
+					<th>C.Postal</th>
-            'zoneFk', zoneFk,
+					<th>Número de zona</th>
-            'zn',  JSON_OBJECT('name', zn.name),
+					<th>Precio</th>
-            'z',  JSON_OBJECT('name', z.name,'price', z.price),
+					<th>Zona</th>
-            'w',  JSON_OBJECT('name', w.name)
+					<th>Almacén</th>
-            )
+					<th>Salix</th>
-    ) FROM tmp.zoneNodes zn
+                 </tr>' INTO vTableCollisions;
-    JOIN zone z ON z.id = zn.zoneFk
-    JOIN geoCollision gc ON gc.agencyModeFk = z.agencyModeFk AND zn.geoFk = gc.geoFk
-    JOIN warehouse w ON w.id = gc.warehouseFk
-    INTO json_data;
                 
-    -- Creo un registro de la notificacion 'zone-included' para reportar via email
+    INSERT INTO mail (receiver,replyTo,subject,body)                
-    SELECT util.notification_send(
+		SELECT 'pepe@verdnatura.es' receiver,
-        'zone-included',
+	           'noreply@verdnatura.es' replyTo,
-            JSON_OBJECT('zoneCollisions',json_data),
+	            CONCAT('Colisiones en zonas ', util.VN_CURDATE()) subject,
-        account.myUser_getId()
+	            CONCAT(vTableCollisions,
-    );
+	            	GROUP_CONCAT(sub.td SEPARATOR ''),
+	            	'</table>') body
+			FROM(SELECT 
+					CONCAT('<tr>
+						<td>', zn.name, '</td>
+						<td>', zoneFk,'</td>
+						<td>', z.price,'</td>
+						<td>', z.name,'</td>
+						<td>', w.name, '</td>
+						<td>', CONCAT('<a href="https://salix.verdnatura.es/#!/zone/', 
+								zoneFk,
+								'/location?q=%7B%22search%22:%22',
+								zn.name, 
+								'%22%7D">'
+								'https://salix.verdnatura.es/#!/zone/', 
+								zoneFk,
+								'/location?q=%7B%22search%22:%22',
+								zn.name, 
+								'%22%7D</a>'),'</td>
+						</tr>') td
+				FROM tmp.zoneNodes zn
+					JOIN zone z ON z.id = zn.zoneFk
+					JOIN geoCollision gc ON gc.agencyModeFk = z.agencyModeFk AND zn.geoFk = gc.geoFk
+					JOIN warehouse w ON w.id = gc.warehouseFk) sub;
 			
 	DROP TEMPORARY TABLE 
 		geoCollision, 

db/routines/vn/triggers/zoneIncluded_afterDelete.sql

@@ -8,6 +8,5 @@ BEGIN
 			`changedModel` = 'zoneIncluded',
 			`changedModelId` = OLD.zoneFk,
 			`userFk` = account.myUser_getId();
-
 END$$
 DELIMITER ;

db/routines/vn/triggers/zoneIncluded_beforeInsert.sql

@@ -4,6 +4,5 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneIncluded_beforeIn
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-
 END$$
 DELIMITER ;

db/routines/vn/triggers/zoneIncluded_beforeUpdate.sql

@@ -4,6 +4,5 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneIncluded_beforeUp
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-
 END$$
 DELIMITER ;

db/versions/10881-greenHydrangea/00-alterTableNotification.sql

@@ -1 +0,0 @@
-ALTER TABLE util.notification MODIFY COLUMN id int(11) auto_increment NOT NULL;

db/versions/10881-greenHydrangea/01-notification.vn.sql

@@ -1,15 +0,0 @@
-INSERT IGNORE INTO util.notification ( `name`,`description`)
-	VALUES
-    ( 'zone-included','An email to notify zoneCollisions');
-
--- Change value if destionation user should be different
-SET @DESTINATION_USER =  "pepe";
-
-SET @MaxId = LAST_INSERT_ID();
-
-INSERT IGNORE INTO util.notificationSubscription (notificationFk,userFk)
-		VALUES(
-            @MaxId,  (SELECT id from `account`.`user` where name = @DESTINATION_USER));
-
-INSERT IGNORE INTO util.notificationAcl (notificationFk,roleFk)
-	SELECT @MaxId, (SELECT role from `account`.`user` where name = @DESTINATION_USER) FROM util.notification WHERE name= "zone-included";

db/versions/10957-goldenAnthurium/00-aclTicketClone.sql

@@ -1,2 +0,0 @@
-INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
-    VALUES('Ticket', 'clone', 'WRITE', 'ALLOW', 'ROLE', 'administrative');

modules/ticket/back/methods/ticket/clone.js

@@ -1,54 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethodCtx('clone', {
-        description: 'clone a ticket and return the new ticket id',
-        accessType: 'WRITE',
-        accepts: [{
-            arg: 'id',
-            type: 'number',
-            required: true,
-            description: 'The ticket id',
-            http: {source: 'path'}
-        }, {
-            arg: 'shipped',
-            type: 'date',
-        }, {
-            arg: 'withWarehouse',
-            type: 'boolean',
-        }
-        ],
-        returns: {
-            type: 'number',
-            root: true
-        },
-        http: {
-            path: `/:id/clone`,
-            verb: 'POST'
-        }
-    });
-
-    Self.clone = async(ctx, id, shipped, withWarehouse, options) => {
-        const myOptions = {userId: ctx.req.accessToken.userId};
-        let tx;
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-
-        try {
-            const [, [{clonedTicketId}]] = await Self.rawSql(`
-                CALL vn.ticket_CloneAll(?, ?, ?, @clonedTicketId); 
-                SELECT @clonedTicketId clonedTicketId;`,
-            [id, shipped, withWarehouse], myOptions);
-
-            if (tx) await tx.commit();
-            return clonedTicketId;
-        } catch (e) {
-            if (tx) await tx.rollback();
-            throw e;
-        }
-    };
-};

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

@@ -46,6 +46,4 @@ module.exports = function(Self) {
     require('../methods/ticket/invoiceTicketsAndPdf')(Self);
     require('../methods/ticket/docuwareDownload')(Self);
     require('../methods/ticket/myLastModified')(Self);
-    require('../methods/ticket/addSaleByCode')(Self);
-    require('../methods/ticket/clone')(Self);
 };

modules/ticket/back/models/ticket.js

@@ -1,4 +1,5 @@
 module.exports = Self => {
     require('./ticket-methods')(Self);
     require('../methods/ticket/state')(Self);
+    require('../methods/ticket/addSaleByCode')(Self);
 };

modules/zone/back/methods/zone/specs/toggleIsIncluded.spec.js

@@ -1,5 +1,6 @@
 const models = require('vn-loopback/server/server').models;
 const LoopBackContext = require('loopback-context');
+
 describe('zone toggleIsIncluded()', () => {
     beforeAll(async() => {
         const activeCtx = {
@@ -57,7 +58,7 @@ describe('zone toggleIsIncluded()', () => {
 
             await models.Zone.toggleIsIncluded(1, 20, false, options);
 
-            const result = await models.Zone.toggleIsIncluded(1, 20, undefined, options);
+            let result = await models.Zone.toggleIsIncluded(1, 20, undefined, options);
 
             expect(result).toEqual({count: 1});
 

modules/zone/back/model-config.json

@@ -3,10 +3,10 @@
         "dataSource": "vn"
     },
     "AgencyMode": {
-        "dataSource": "vn"
+       "dataSource": "vn"
     },
     "DeliveryMethod": {
-        "dataSource": "vn"
+       "dataSource": "vn"
     },
     "Zone": {
         "dataSource": "vn"

print/templates/email/zone-included/assets/css/import.js

@@ -1,11 +0,0 @@
-const Stylesheet = require(`vn-print/core/stylesheet`);
-
-const path = require('path');
-const vnPrintPath = path.resolve('print');
-
-module.exports = new Stylesheet([
-    `${vnPrintPath}/common/css/spacing.css`,
-    `${vnPrintPath}/common/css/misc.css`,
-    `${vnPrintPath}/common/css/layout.css`,
-    `${vnPrintPath}/common/css/email.css`])
-    .mergeStyles();

print/templates/email/zone-included/locale/es.yml

@@ -1,7 +0,0 @@
-subject: Colisiones en zonas
-title: "La zona {0}  y localización {1} ha sido registrada en más de un sitio"
-postalCode: C. Postal
-zoneFk: Número de zona
-price: Precio
-zone: Zona
-warehouse: Almacén

print/templates/email/zone-included/zone-included.html

@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width" />
-        <meta name="format-detection" content="telephone=no" />
-    </head>
-
-    <body>
-        <table class="grid column-oriented">
-            <thead>
-                <tr>
-                    <th>{{ $t('postalCode') }}</th>
-                    <th>{{ $t('zoneFk') }}</th>
-                    <th>{{ $t('price') }}</th>
-                    <th>{{ $t('zone') }}</th>
-                    <th>{{ $t('warehouse') }}</th>
-                    <th></th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr v-for="zone in zoneCollisions">
-                    <td>{{ zone.zn.name }}</td>
-                    <td>{{ zone.zoneFk }}</td>
-                    <td>{{ zone.z.price }}</td>
-                    <td>{{ zone.z.name }}</td>
-                    <td>{{ zone.w.name }}</td>
-                    <td>
-                        <a v-bind:href="'https://salix.verdnatura.es/#!/zone/'+
-                        zone.zoneFk+
-                        '/location?q=%7B%22search%22:%22'+
-                        zone.zn.name+
-                        '%22%7D'">
-                        https://salix.verdnatura.es/#!/zone/
-                        {{zone.zoneFk}}
-                        /location?q=%7B%22search%22:%22
-                        {{zone.zn.name}}
-                        %22%7D</a></td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

print/templates/email/zone-included/zone-included.js

@@ -1,12 +0,0 @@
-const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
-
-module.exports = {
-    name: 'zone-included',
-    components: {
-        'email-header': emailHeader.build(),
-    },
-    props: {
-        zoneCollisions: {type: Array, required: true}
-    }
-};