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

Reviewed-on: #2020
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2414.01] - 2024-04-04
+
+### Added
+
+### Changed
+
+### Fixed
+
 ## [2408.01] - 2024-02-22
 
 ### Added

back/methods/dms/downloadFile.js

@@ -29,7 +29,8 @@ module.exports = Self => {
         http: {
             path: `/:id/downloadFile`,
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.downloadFile = async function(ctx, id) {

back/methods/docuware/download.js

@@ -42,7 +42,8 @@ module.exports = Self => {
         http: {
             path: `/:id/download`,
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.download = async function(id, fileCabinet, filter) {

back/methods/image/download.js

@@ -47,7 +47,8 @@ module.exports = Self => {
         http: {
             path: `/:collection/:size/:id/download`,
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.download = async function(ctx, collection, size, id) {

back/methods/mrw-config/specs/createShipment.spec.js

@@ -49,6 +49,7 @@ describe('MRWConfig createShipment()', () => {
 
         await models.MrwConfig.create(
             {
+                'id': 1,
                 'url': 'https://url.com',
                 'user': 'user',
                 'password': 'password',

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(2);
+        expect(active.length).toEqual(3);
         expect(available.length).toEqual(totalAvailable);
     });
 });

back/methods/vn-user/share-token.js

@@ -0,0 +1,27 @@
+
+module.exports = Self => {
+    Self.remoteMethodCtx('shareToken', {
+        description: 'Returns token to view files or images and share it',
+        accessType: 'WRITE',
+        accepts: [],
+        returns: {
+            type: 'Object',
+            root: true
+        },
+        http: {
+            path: `/shareToken`,
+            verb: 'GET'
+        }
+    });
+
+    Self.shareToken = async function(ctx) {
+        const {accessToken: token} = ctx.req;
+
+        const user = await Self.findById(token.userId);
+        const multimediaToken = await user.accessTokens.create({
+            scopes: ['read:multimedia']
+        });
+
+        return {multimediaToken};
+    };
+};

back/methods/vn-user/specs/share-token.spec.js

@@ -0,0 +1,27 @@
+const {models} = require('vn-loopback/server/server');
+describe('Share Token', () => {
+    let ctx = null;
+    beforeAll(async() => {
+        const unAuthCtx = {
+            req: {
+                headers: {},
+                connection: {
+                    remoteAddress: '127.0.0.1'
+                },
+                getLocale: () => 'en'
+            },
+            args: {}
+        };
+        let login = await models.VnUser.signIn(unAuthCtx, 'salesAssistant', 'nightmare');
+        let accessToken = await models.AccessToken.findById(login.token);
+        ctx = {req: {accessToken: accessToken}};
+    });
+
+    it('should renew token', async() => {
+        const multimediaToken = await models.VnUser.shareToken(ctx);
+
+        expect(Object.keys(multimediaToken).length).toEqual(1);
+        expect(multimediaToken.multimediaToken.userId).toEqual(ctx.req.accessToken.userId);
+        expect(multimediaToken.multimediaToken.scopes[0]).toEqual('read:multimedia');
+    });
+});

back/models/mrw-config.json

@@ -9,6 +9,7 @@
 	"properties": {
 		"id": {
 			"type": "number",
+			"id": true,
 			"required": true
 		},
 		"url": {

back/models/vn-user.js

@@ -13,6 +13,7 @@ module.exports = function(Self) {
     require('../methods/vn-user/privileges')(Self);
     require('../methods/vn-user/validate-auth')(Self);
     require('../methods/vn-user/renew-token')(Self);
+    require('../methods/vn-user/share-token')(Self);
     require('../methods/vn-user/update-user')(Self);
 
     Self.definition.settings.acls = Self.definition.settings.acls.filter(acl => acl.property !== 'create');

back/models/vn-user.json

@@ -1,129 +1,140 @@
 {
-	"name": "VnUser",
-	"base": "User",
-	"validateUpsert": true,
-	"options": {
-		"mysql": {
-			"table": "account.user"
-		}
-	},
+    "name": "VnUser",
+    "base": "User",
+    "validateUpsert": true,
+    "options": {
+        "mysql": {
+            "table": "account.user"
+        }
+    },
     "mixins": {
         "Loggable": true
     },
     "resetPasswordTokenTTL": "604800",
-	"properties": {
-		"id": {
-			"type": "number",
-			"id": true
-		},
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
         "name": {
-			"type": "string",
-			"required": true
-		},
-		"username": {
-			"type": "string"
-		},
-		"roleFk": {
-			"type": "number",
-			"mysql": {
-				"columnName": "role"
-			}
-		},
-		"nickname": {
-			"type": "string"
-		},
-		"lang": {
-			"type": "string"
-		},
-		"active": {
-			"type": "boolean"
-		},
-		"email": {
-			"type": "string"
-		},
-		"emailVerified": {
-			"type": "boolean"
-		},
-		"created": {
-			"type": "date"
-		},
-		"updated": {
-			"type": "date"
-		},
-		"image": {
-			"type": "string"
-		},
-		"hasGrant": {
-			"type": "boolean"
-		},
+            "type": "string",
+            "required": true
+        },
+        "username": {
+            "type": "string"
+        },
+        "roleFk": {
+            "type": "number",
+            "mysql": {
+                "columnName": "role"
+            }
+        },
+        "nickname": {
+            "type": "string"
+        },
+        "lang": {
+            "type": "string"
+        },
+        "active": {
+            "type": "boolean"
+        },
+        "email": {
+            "type": "string"
+        },
+        "emailVerified": {
+            "type": "boolean"
+        },
+        "created": {
+            "type": "date"
+        },
+        "updated": {
+            "type": "date"
+        },
+        "image": {
+            "type": "string"
+        },
+        "hasGrant": {
+            "type": "boolean"
+        },
         "passExpired": {
             "type": "date"
         },
-		"twoFactor": {
-			"type": "string"
-		}
-	},
-	"relations": {
-		"role": {
-			"type": "belongsTo",
-			"model": "VnRole",
-			"foreignKey": "roleFk"
-		},
-		"roles": {
-			"type": "hasMany",
-			"model": "RoleRole",
-			"foreignKey": "role",
-			"primaryKey": "roleFk"
-		},
-		"emailUser": {
-			"type": "hasOne",
-			"model": "EmailUser",
-			"foreignKey": "userFk"
-		},
-		"worker": {
-			"type": "hasOne",
-			"model": "Worker",
-			"foreignKey": "id"
-		},
-		"userConfig": {
-			"type": "hasOne",
-			"model": "UserConfig",
-			"foreignKey": "userFk"
-		}
-	},
-	"acls": [
-		{
-			"property": "signIn",
-			"accessType": "EXECUTE",
-			"principalType": "ROLE",
-			"principalId": "$everyone",
-			"permission": "ALLOW"
-		}, {
-			"property": "recoverPassword",
-			"accessType": "EXECUTE",
-			"principalType": "ROLE",
-			"principalId": "$everyone",
-			"permission": "ALLOW"
-		}, {
-			"property": "validateAuth",
-			"accessType": "EXECUTE",
-			"principalType": "ROLE",
-			"principalId": "$everyone",
-			"permission": "ALLOW"
-		}, {
-			"property": "privileges",
-			"accessType": "*",
-			"principalType": "ROLE",
-			"principalId": "$authenticated",
-			"permission": "ALLOW"
-		}, {
-			"property": "renewToken",
-			"accessType": "WRITE",
-			"principalType": "ROLE",
-			"principalId": "$authenticated",
-			"permission": "ALLOW"
-		}
-	],
+        "twoFactor": {
+            "type": "string"
+        }
+    },
+    "relations": {
+        "role": {
+            "type": "belongsTo",
+            "model": "VnRole",
+            "foreignKey": "roleFk"
+        },
+        "roles": {
+            "type": "hasMany",
+            "model": "RoleRole",
+            "foreignKey": "role",
+            "primaryKey": "roleFk"
+        },
+        "emailUser": {
+            "type": "hasOne",
+            "model": "EmailUser",
+            "foreignKey": "userFk"
+        },
+        "worker": {
+            "type": "hasOne",
+            "model": "Worker",
+            "foreignKey": "id"
+        },
+        "userConfig": {
+            "type": "hasOne",
+            "model": "UserConfig",
+            "foreignKey": "userFk"
+        }
+    },
+    "acls": [
+        {
+            "property": "signIn",
+            "accessType": "EXECUTE",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        },
+        {
+            "property": "recoverPassword",
+            "accessType": "EXECUTE",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        },
+        {
+            "property": "validateAuth",
+            "accessType": "EXECUTE",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        },
+        {
+            "property": "privileges",
+            "accessType": "*",
+            "principalType": "ROLE",
+            "principalId": "$authenticated",
+            "permission": "ALLOW"
+        },
+        {
+            "property": "renewToken",
+            "accessType": "WRITE",
+            "principalType": "ROLE",
+            "principalId": "$authenticated",
+            "permission": "ALLOW"
+        },
+        {
+            "property": "shareToken",
+            "accessType": "WRITE",
+            "principalType": "ROLE",
+            "principalId": "$authenticated",
+            "permission": "ALLOW"
+        }
+    ],
     "scopes": {
         "preview": {
             "fields": [
@@ -140,7 +151,7 @@
                 "hasGrant",
                 "realm",
                 "email",
-				"emailVerified"
+                "emailVerified"
             ]
         }
     }

db/dump/fixtures.after.sql

@@ -7,8 +7,8 @@ SET foreign_key_checks = 0;
 
 -- XXX: vn-database
 
-INSERT INTO util.config (environment, mockTime, mockUtcTime, mockEnabled)
-    VALUES ('local', '2001-01-01 12:00:00', '2001-01-01 11:00:00', TRUE);
+INSERT INTO util.config (id, environment, mockTime, mockUtcTime, mockEnabled)
+    VALUES (1, 'local', '2001-01-01 12:00:00', '2001-01-01 11:00:00', TRUE);
 /* #5483
 INSERT INTO vn.entryConfig (defaultEntry, mailToNotify, inventorySupplierFk, maxLockTime, defaultSupplierFk)
     VALUES(1, NULL, 1, 300, 1);
@@ -70,7 +70,7 @@ UPDATE vn.supplier
 
 UPDATE `vn`.`claimRatio` SET `claimAmount` = '10' WHERE (`clientFk` = '1101');
 
-INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `isOwn`, `isAnyVolumeAllowed`) 
+INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `isOwn`, `isAnyVolumeAllowed`)
     VALUES
     ('Agencia', '1', '1', '1'),
     ('Otra agencia ', '1', '0', '0');

db/dump/fixtures.before.sql

@@ -60,13 +60,13 @@ INSERT INTO `vn`.`ticketConfig` (`id`, `scopeDays`)
     VALUES
         ('1', '6');
 
-INSERT INTO `vn`.`bionicConfig` (`generalInflationCoeficient`, `minimumDensityVolumetricWeight`, `verdnaturaVolumeBox`, `itemCarryBox`)
+INSERT INTO `vn`.`bionicConfig` (`id`, `generalInflationCoeficient`, `minimumDensityVolumetricWeight`, `verdnaturaVolumeBox`, `itemCarryBox`)
     VALUES
-        (1.30, 167.00, 138000, 71);
+        (1, 1.30, 167.00, 138000, 71);
 
-INSERT INTO `vn`.`chatConfig` (`host`, `api`)
+INSERT INTO `vn`.`chatConfig` (`id`, `host`, `api`)
     VALUES
-        ('https://chat.verdnatura.es', 'https://chat.verdnatura.es/api/v1');
+        (1, 'https://chat.verdnatura.es', 'https://chat.verdnatura.es/api/v1');
 
 INSERT IGNORE INTO `vn`.`greugeConfig`(`id`, `freightPickUpPrice`)
     VALUES
@@ -592,13 +592,13 @@ INSERT INTO `vn`.`supplierAccount`(`id`, `supplierFk`, `iban`, `bankEntityFk`)
     VALUES
          (241, 442, 'ES111122333344111122221111', 128);
 
-INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `sage200Company`, `expired`, `companyGroupFk`, `phytosanitary` , `clientFk`)
+INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `expired`, `companyGroupFk`, `phytosanitary` , `clientFk`)
     VALUES
-        (69  , 'CCs', NULL, 30,  NULL, 0, NULL,         1, NULL                             , NULL),
-        (442 , 'VNL', 241,  30,  2   , 1, NULL,         2, 'VNL Company - Plant passport'   , 1101),
-        (567 , 'VNH', NULL, 30,  NULL, 4, NULL,         1, 'VNH Company - Plant passport'   , NULL),
-        (791 , 'FTH', NULL, 30,  NULL, 3, '2015-11-30', 1, NULL                             , NULL),
-        (1381, 'ORN', NULL, 30,  NULL, 7, NULL,         1, 'ORN Company - Plant passport'   , NULL);
+        (69  , 'CCs', NULL, 30, 0, NULL,         1, NULL                             , NULL),
+        (442 , 'VNL', 241,  30, 1, NULL,         2, 'VNL Company - Plant passport'   , 1101),
+        (567 , 'VNH', NULL, 30, 4, NULL,         1, 'VNH Company - Plant passport'   , NULL),
+        (791 , 'FTH', NULL, 30, 3, '2015-11-30', 1, NULL                             , NULL),
+        (1381, 'ORN', NULL, 30, 7, NULL,         1, 'ORN Company - Plant passport'   , NULL);
 
 INSERT INTO `vn`.`taxArea` (`code`, `claveOperacionFactura`, `CodigoTransaccion`)
     VALUES
@@ -608,7 +608,8 @@ INSERT INTO `vn`.`taxArea` (`code`, `claveOperacionFactura`, `CodigoTransaccion`
         ('WORLD',    2, 15);
 
 INSERT INTO vn.invoiceOutConfig
-    SET parallelism = 8;
+    SET id = 1,
+        parallelism = 8;
 
 INSERT INTO `vn`.`invoiceOutSerial` (`code`, `description`, `isTaxed`, `taxAreaFk`, `isCEE`, `type`)
     VALUES
@@ -714,7 +715,7 @@ INSERT INTO `vn`.`zoneClosure` (`zoneFk`, `dated`, `hour`)
         (12,    util.VN_CURDATE(), '23:59'),
         (13,    util.VN_CURDATE(), '23:59');
 
-INSERT INTO `vn`.`zoneConfig` (`scope`) VALUES ('1');
+INSERT INTO `vn`.`zoneConfig` (`id`, `scope`) VALUES (1, '1');
 
 INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agencyModeFk`, `description`, `m3`, `cost`, `started`, `finished`, `zoneFk`)
     VALUES
@@ -983,9 +984,9 @@ INSERT INTO `vn`.`packaging`(`id`, `volume`, `width`, `height`, `depth`, `isPack
         ('cc',          1640038.00, 56.00,  220.00, 128.00, 1, util.VN_CURDATE(), 15,   90.00),
         ('pallet 100',  2745600.00, 100.00, 220.00, 120.00, 1, util.VN_CURDATE(), 16,   0.00);
 
-INSERT INTO `vn`.`packagingConfig`(`upperGap`, `defaultSmallPackageFk`, `defaultBigPackageFk`)
+INSERT INTO `vn`.`packagingConfig`(`id`, `upperGap`, `defaultSmallPackageFk`, `defaultBigPackageFk`)
     VALUES
-        ('10', 1, 'pallet 100');
+        (1, '10', 1, 'pallet 100');
 
 INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`)
     VALUES
@@ -1868,8 +1869,7 @@ INSERT INTO `vn`.`claimEnd`(`id`, `saleFk`, `claimFk`, `workerFk`, `claimDestina
 
 INSERT INTO `vn`.`claimConfig`(`id`, `maxResponsibility`)
     VALUES
-        (1, 50),
-        (2, 30);
+        (1, 50);
 
 INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRate`, `priceIncreasing`, `packingRate`)
     VALUES
@@ -2504,9 +2504,9 @@ INSERT INTO `hedera`.`imageCollectionSize`(`id`, `collectionFk`,`width`, `height
     VALUES
         (1, 4, 160, 160);
 
-INSERT INTO `vn`.`rateConfig`(`rate0`, `rate1`, `rate2`, `rate3`)
+INSERT INTO `vn`.`rateConfig`(`id`, `rate0`, `rate1`, `rate2`, `rate3`)
     VALUES
-        (36, 31, 25, 21);
+        (1, 36, 31, 25, 21);
 
 INSERT INTO `vn`.`rate`(`dated`, `warehouseFk`, `rate0`, `rate1`, `rate2`, `rate3`)
     VALUES
@@ -2697,9 +2697,9 @@ INSERT INTO `bs`.`sale` (`saleFk`, `amount`, `dated`,  `typeFk`, `clientFk`)
         (4,     33.8,      util.VN_CURDATE(),    1,  1101),
         (30,    34.4,      util.VN_CURDATE(),    1,  1108);
 
-INSERT INTO `vn`.`docuwareConfig` (`url`)
+INSERT INTO `vn`.`docuwareConfig` (`id`, `url`)
     VALUES
-        ('http://docuware.url/');
+        (1, 'http://docuware.url/');
 
 INSERT INTO `vn`.`calendarHolidaysName` (`id`, `name`)
     VALUES
@@ -2796,11 +2796,12 @@ INSERT INTO `vn`.`packingSite` (`id`, `code`, `hostFk`, `monitorId`)
     VALUES
         (1, 'h1', 1, '');
 
-INSERT INTO `vn`.`packingSiteConfig` (`shinobiUrl`, `shinobiToken`, `shinobiGroupKey`, `avgBoxingTime`)
+INSERT INTO `vn`.`packingSiteConfig` (`id`, `shinobiUrl`, `shinobiToken`, `shinobiGroupKey`, `avgBoxingTime`)
     VALUES
-        ('', 'SHINNOBI_TOKEN', 'GROUP_TOKEN', 6000);
+        (1, '', 'SHINNOBI_TOKEN', 'GROUP_TOKEN', 6000);
 INSERT INTO `util`.`notificationConfig`
-	SET `cleanDays` = 90;
+	SET `id` = 1,
+        `cleanDays` = 90;
 
 INSERT INTO `util`.`notification` (`id`, `name`, `description`)
     VALUES
@@ -2809,7 +2810,8 @@ 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
@@ -2819,7 +2821,8 @@ 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
@@ -2836,8 +2839,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
@@ -2853,7 +2856,7 @@ INSERT INTO `vn`.`collection` (`id`, `created`, `workerFk`, `stateFk`, `itemPack
 
 INSERT INTO `vn`.`itemConfig` (`id`, `isItemTagTriggerDisabled`, `monthToDeactivate`, `wasteRecipients`, `validPriorities`, `defaultPriority`, `defaultTag`, `warehouseFk`)
     VALUES
-        (0, 0, 24, '', '[1,2,3]', 2, 56, 60);
+        (1, 0, 24, '', '[1,2,3]', 2, 56, 60);
 
 INSERT INTO `vn`.`ticketCollection` (`ticketFk`, `collectionFk`, `created`, `level`, `wagon`, `smartTagFk`, `usedShelves`, `itemCount`, `liters`)
     VALUES
@@ -2890,7 +2893,7 @@ INSERT INTO `vn`.`ticketLog` (originFk, userFk, `action`, creationDate, changedM
         (1,   18, 'insert', '1999-05-09 10:00:00', 'Ticket',    45, 'Super Man'  , NULL, '{"id":45,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}', NULL);
 INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`)
     VALUES
-        (0, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', '1,6', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all');
+        (1, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', '1,6', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all');
 
 INSERT INTO `vn`.`mdbApp` (`app`, `baselineBranchFk`, `userFk`, `locked`)
     VALUES
@@ -3068,18 +3071,16 @@ INSERT INTO `vn`.`cmr` (id,truckPlate,observations,senderInstruccions,paymentIns
 UPDATE vn.department
     SET workerFk = null;
 
--- NEW WAREHOUSE
-
 INSERT INTO vn.packaging
     VALUES('--', 2745600.00, 100.00, 120.00, 220.00, 0.00, 1, '2001-01-01 00:00:00.000', NULL, NULL, NULL, 0.00, 16, 0.00, 0, NULL, 0.00, NULL, NULL, 0, NULL, 0, 0);
 
 
 INSERT IGNORE INTO vn.intrastat
-	SET id = 44219999, 
-		description = 'Manufacturas de madera', 
-		taxClassFk = 1, 
+	SET id = 44219999,
+		description = 'Manufacturas de madera',
+		taxClassFk = 1,
 		taxCodeFk = 1;
-	
+
 INSERT IGNORE INTO vn.warehouse
 	SET id = 999,
 		name = 'TestingWarehouse',
@@ -3090,33 +3091,33 @@ INSERT IGNORE INTO vn.warehouse
 		hasProduction = TRUE;
 
 INSERT IGNORE INTO vn.sector
-	SET id = 9991, 
-		description = 'NormalSector', 
-		warehouseFk = 999, 
-		code = 'NS', 
-		isPackagingArea = FALSE, 
-		sonFk = NULL, 
-		isMain = TRUE, 
+	SET id = 9991,
+		description = 'NormalSector',
+		warehouseFk = 999,
+		code = 'NS',
+		isPackagingArea = FALSE,
+		sonFk = NULL,
+		isMain = TRUE,
 		itemPackingTypeFk = NULL;
 
 INSERT IGNORE INTO vn.sector
-	SET id = 9992, 
-		description = 'PreviousSector', 
-		warehouseFk = 999, 
-		code = 'PS', 
-		isPackagingArea = FALSE, 
-		sonFk = NULL, 
-		isMain = TRUE, 
+	SET id = 9992,
+		description = 'PreviousSector',
+		warehouseFk = 999,
+		code = 'PS',
+		isPackagingArea = FALSE,
+		sonFk = NULL,
+		isMain = TRUE,
 		itemPackingTypeFk = NULL;
 
 INSERT IGNORE INTO vn.sector
-	SET id = 9993, 
-		description = 'MezaninneSector', 
-		warehouseFk = 999, 
-		code = 'MS', 
-		isPackagingArea = FALSE, 
-		sonFk = 9991, 
-		isMain = TRUE, 
+	SET id = 9993,
+		description = 'MezaninneSector',
+		warehouseFk = 999,
+		code = 'MS',
+		isPackagingArea = FALSE,
+		sonFk = 9991,
+		isMain = TRUE,
 		itemPackingTypeFk = NULL;
 
 
@@ -3150,58 +3151,58 @@ INSERT IGNORE INTO vn.itemType
 	SET id = 999,
 		code = 'WOO',
 		name = 'Wood Objects',
-		categoryFk = 3, 
+		categoryFk = 3,
 		workerFk = 103,
 		isInventory = TRUE,
 		life = 10,
 		density = 250,
-		itemPackingTypeFk = NULL, 
+		itemPackingTypeFk = NULL,
 		temperatureFk = 'warm';
 
 INSERT IGNORE INTO vn.travel
-	SET id = 99, 
-		shipped = CURDATE(), 
+	SET id = 99,
+		shipped = CURDATE(),
 		landed = CURDATE(),
-		warehouseInFk = 999, 
-		warehouseOutFk = 1, 
+		warehouseInFk = 999,
+		warehouseOutFk = 1,
 		isReceived = TRUE;
 
 INSERT INTO vn.entry
 	SET id = 999,
 		supplierFk = 791,
-		isConfirmed = TRUE, 
+		isConfirmed = TRUE,
 		dated = CURDATE(),
-		travelFk = 99, 
+		travelFk = 99,
 		companyFk = 442;
 
 INSERT INTO vn.ticket
-	SET id = 999999, 
+	SET id = 999999,
 		clientFk = 2,
 		warehouseFk = 999,
 		shipped = CURDATE(),
-		nickname = 'Cliente', 
+		nickname = 'Cliente',
 		addressFk = 1,
-		companyFk = 442, 
-		agencyModeFk = 10, 
+		companyFk = 442,
+		agencyModeFk = 10,
 		landed = CURDATE();
 
 INSERT INTO vn.collection
-	SET id = 10101010, 
+	SET id = 10101010,
 		workerFk = 9;
-	
+
 INSERT IGNORE INTO vn.ticketCollection
-	SET id = 10101010, 
-		ticketFk = 999999, 
+	SET id = 10101010,
+		ticketFk = 999999,
 		collectionFk = 10101010;
-	
+
 INSERT INTO vn.item
 	SET id = 999991,
-		name = 'Palito para pinchos', 
+		name = 'Palito para pinchos',
 		`size` = 25,
-		stems = NULL, 
-		category = 'EXT', 
-		typeFk = 999, 
-		longName = 'Palito para pinchos', 
+		stems = NULL,
+		category = 'EXT',
+		typeFk = 999,
+		longName = 'Palito para pinchos',
 		itemPackingTypeFk = NULL,
 		originFk = 1,
 		weightByPiece = 6,
@@ -3228,19 +3229,19 @@ INSERT INTO vn.sale
 	SET id = 99991,
 		itemFk = 999991,
 		ticketFk = 999999,
-		concept = 'Palito para pinchos', 
-		quantity = 3, 
-		price = 1, 
+		concept = 'Palito para pinchos',
+		quantity = 3,
+		price = 1,
 		discount = 0;
 
 INSERT INTO vn.item
 	SET id = 999992,
-		name = 'Madera verde', 
+		name = 'Madera verde',
 		`size` = 10,
-		stems = NULL, 
-		category = 'EXT', 
-		typeFk = 999, 
-		longName = 'Madera verde', 
+		stems = NULL,
+		category = 'EXT',
+		typeFk = 999,
+		longName = 'Madera verde',
 		itemPackingTypeFk = NULL,
 		originFk = 1,
 		weightByPiece = 50,
@@ -3267,19 +3268,19 @@ INSERT INTO vn.sale
 	SET id = 99992,
 		itemFk = 999992,
 		ticketFk = 999999,
-		concept = 'Madera Verde', 
-		quantity = 10, 
-		price = 1, 
+		concept = 'Madera Verde',
+		quantity = 10,
+		price = 1,
 		discount = 0;
 
 INSERT INTO vn.item
 	SET id = 999993,
-		name = 'Madera Roja/Morada', 
+		name = 'Madera Roja/Morada',
 		`size` = 12,
-		stems = 2, 
-		category = 'EXT', 
-		typeFk = 999, 
-		longName = 'Madera Roja/Morada', 
+		stems = 2,
+		category = 'EXT',
+		typeFk = 999,
+		longName = 'Madera Roja/Morada',
 		itemPackingTypeFk = NULL,
 		originFk = 1,
 		weightByPiece = 35,
@@ -3303,30 +3304,30 @@ INSERT INTO vn.buy
 		weight = 25;
 
 INSERT INTO vn.itemShelving
-	SET id = 9931, 
-		itemFk = 999993, 
-		shelvingFk = 'NCC', 
-		visible = 10, 
-		`grouping` = 5, 
+	SET id = 9931,
+		itemFk = 999993,
+		shelvingFk = 'NCC',
+		visible = 10,
+		`grouping` = 5,
 		packing = 10;
-	
+
 INSERT INTO vn.sale
 	SET id = 99993,
 		itemFk = 999993,
 		ticketFk = 999999,
-		concept = 'Madera Roja/Morada', 
-		quantity = 15, 
-		price = 1, 
+		concept = 'Madera Roja/Morada',
+		quantity = 15,
+		price = 1,
 		discount = 0;
 
 INSERT INTO vn.item
 	SET id = 999994,
-		name = 'Madera Naranja', 
+		name = 'Madera Naranja',
 		`size` = 18,
-		stems = 1, 
-		category = 'EXT', 
-		typeFk = 999, 
-		longName = 'Madera Naranja', 
+		stems = 1,
+		category = 'EXT',
+		typeFk = 999,
+		longName = 'Madera Naranja',
 		itemPackingTypeFk = NULL,
 		originFk = 1,
 		weightByPiece = 160,
@@ -3353,19 +3354,19 @@ INSERT INTO vn.sale
 	SET id = 99994,
 		itemFk = 999994,
 		ticketFk = 999999,
-		concept = 'Madera Naranja', 
-		quantity = 4, 
-		price = 1, 
+		concept = 'Madera Naranja',
+		quantity = 4,
+		price = 1,
 		discount = 0;
-	
+
 INSERT INTO vn.item
 	SET id = 999995,
-		name = 'Madera Amarilla', 
+		name = 'Madera Amarilla',
 		`size` = 11,
-		stems = 5, 
-		category = 'EXT', 
-		typeFk = 999, 
-		longName = 'Madera Amarilla', 
+		stems = 5,
+		category = 'EXT',
+		typeFk = 999,
+		longName = 'Madera Amarilla',
 		itemPackingTypeFk = NULL,
 		originFk = 1,
 		weightByPiece = 78,
@@ -3392,20 +3393,20 @@ INSERT INTO vn.sale
 	SET id = 99995,
 		itemFk = 999995,
 		ticketFk = 999999,
-		concept = 'Madera Amarilla', 
-		quantity = 5, 
-		price = 1, 
+		concept = 'Madera Amarilla',
+		quantity = 5,
+		price = 1,
 		discount = 0;
-	
+
 -- Palito naranja
 INSERT INTO vn.item
 	SET id = 999998,
-		name = 'Palito naranja', 
+		name = 'Palito naranja',
 		`size` = 11,
-		stems = 1, 
-		category = 'EXT', 
-		typeFk = 999, 
-		longName = 'Palito naranja', 
+		stems = 1,
+		category = 'EXT',
+		typeFk = 999,
+		longName = 'Palito naranja',
 		itemPackingTypeFk = NULL,
 		originFk = 1,
 		weightByPiece = 78,
@@ -3432,20 +3433,20 @@ INSERT INTO vn.sale
 	SET id = 99998,
 		itemFk = 999998,
 		ticketFk = 999999,
-		concept = 'Palito naranja', 
-		quantity = 60, 
-		price = 1, 
+		concept = 'Palito naranja',
+		quantity = 60,
+		price = 1,
 		discount = 0;
 
 -- Palito amarillo
 INSERT INTO vn.item
 	SET id = 999999,
-		name = 'Palito amarillo', 
+		name = 'Palito amarillo',
 		`size` = 11,
-		stems = 1, 
-		category = 'EXT', 
-		typeFk = 999, 
-		longName = 'Palito amarillo', 
+		stems = 1,
+		category = 'EXT',
+		typeFk = 999,
+		longName = 'Palito amarillo',
 		itemPackingTypeFk = NULL,
 		originFk = 1,
 		weightByPiece = 78,
@@ -3472,20 +3473,20 @@ INSERT INTO vn.sale
 	SET id = 99999,
 		itemFk = 999999,
 		ticketFk = 999999,
-		concept = 'Palito amarillo', 
-		quantity = 50, 
-		price = 1, 
+		concept = 'Palito amarillo',
+		quantity = 50,
+		price = 1,
 		discount = 0;
 
 -- Palito azul
 INSERT INTO vn.item
 	SET id = 1000000,
-		name = 'Palito azul', 
+		name = 'Palito azul',
 		`size` = 10,
-		stems = 1, 
-		category = 'EXT', 
-		typeFk = 999, 
-		longName = 'Palito azul', 
+		stems = 1,
+		category = 'EXT',
+		typeFk = 999,
+		longName = 'Palito azul',
 		itemPackingTypeFk = NULL,
 		originFk = 1,
 		weightByPiece = 78,
@@ -3512,20 +3513,20 @@ INSERT INTO vn.sale
 	SET id = 100000,
 		itemFk = 1000000,
 		ticketFk = 999999,
-		concept = 'Palito azul', 
-		quantity = 50, 
-		price = 1, 
+		concept = 'Palito azul',
+		quantity = 50,
+		price = 1,
 		discount = 0;
 
 -- Palito rojo
 INSERT INTO vn.item
 	SET id = 1000001,
-		name = 'Palito rojo', 
+		name = 'Palito rojo',
 		`size` = 10,
-		stems = NULL, 
-		category = 'EXT', 
-		typeFk = 999, 
-		longName = 'Palito rojo', 
+		stems = NULL,
+		category = 'EXT',
+		typeFk = 999,
+		longName = 'Palito rojo',
 		itemPackingTypeFk = NULL,
 		originFk = 1,
 		weightByPiece = 78,
@@ -3553,20 +3554,20 @@ INSERT INTO vn.sale
 	SET id = 100001,
 		itemFk = 1000001,
 		ticketFk = 999999,
-		concept = 'Palito rojo', 
-		quantity = 10, 
-		price = 1, 
+		concept = 'Palito rojo',
+		quantity = 10,
+		price = 1,
 		discount = 0;
-	
+
 -- Previa
 INSERT IGNORE INTO vn.item
 	SET id = 999996,
-		name = 'Bolas de madera', 
+		name = 'Bolas de madera',
 		`size` = 2,
-		stems = 4, 
-		category = 'EXT', 
-		typeFk = 999, 
-		longName = 'Bolas de madera', 
+		stems = 4,
+		category = 'EXT',
+		typeFk = 999,
+		longName = 'Bolas de madera',
 		itemPackingTypeFk = NULL,
 		originFk = 1,
 		weightByPiece = 20,
@@ -3593,20 +3594,20 @@ INSERT vn.sale
 	SET id = 99996,
 		itemFk = 999996,
 		ticketFk = 999999,
-		concept = 'Bolas de madera', 
-		quantity = 4, 
-		price = 7, 
+		concept = 'Bolas de madera',
+		quantity = 4,
+		price = 7,
 		discount = 0,
 		isPicked = TRUE;
 
 INSERT IGNORE INTO vn.item
 	SET id = 999997,
-		name = 'Palitos de polo MIX', 
+		name = 'Palitos de polo MIX',
 		`size` = 14,
-		stems = NULL, 
-		category = 'EXT', 
-		typeFk = 999, 
-		longName = 'Palitos de polo MIX', 
+		stems = NULL,
+		category = 'EXT',
+		typeFk = 999,
+		longName = 'Palitos de polo MIX',
 		itemPackingTypeFk = NULL,
 		originFk = 1,
 		weightByPiece = 20,
@@ -3633,9 +3634,9 @@ INSERT vn.sale
 	SET id = 99997,
 		itemFk = 999997,
 		ticketFk = 999999,
-		concept = 'Palitos de polo MIX', 
-		quantity = 5, 
-		price = 7, 
+		concept = 'Palitos de polo MIX',
+		quantity = 5,
+		price = 7,
 		discount = 0;
 
 USE vn;
@@ -3668,38 +3669,38 @@ VALUES
 
 -- Previous for Bolas de madera
 INSERT IGNORE INTO vn.sectorCollection
-	SET id = 99, 
-	userFk = 1, 
+	SET id = 99,
+	userFk = 1,
 	sectorFk = 9992;
 
 INSERT IGNORE INTO vn.saleGroup
-	SET id = 4, 
-		userFk = 1, 
-		parkingFk = 9, 
+	SET id = 4,
+		userFk = 1,
+		parkingFk = 9,
 		sectorFk = 9992;
 
 INSERT IGNORE INTO vn.sectorCollectionSaleGroup
 	SET id = 9999,
-		sectorCollectionFk = 99, 
+		sectorCollectionFk = 99,
 		saleGroupFk = 999;
 
 INSERT vn.saleGroupDetail
-	SET id = 99991, 
-		saleFk = 99996, 
+	SET id = 99991,
+		saleFk = 99996,
 		saleGroupFk = 999;
-	
+
 INSERT INTO vn.saleTracking
 	SET id = 7,
-        saleFk = 99996, 
+        saleFk = 99996,
 		isChecked = TRUE,
 		workerFk = 103,
 		stateFk = 28;
-	
+
 INSERT IGNORE INTO vn.itemShelvingSale
-	SET id = 991, 
-		itemShelvingFk = 9962, 
-		saleFk = 99996, 
-		quantity = 5, 
+	SET id = 991,
+		itemShelvingFk = 9962,
+		saleFk = 99996,
+		quantity = 5,
 		userFk = 1;
 
 UPDATE vn.ticket
@@ -3713,8 +3714,8 @@ UPDATE vn.collection
 UPDATE vn.sale
 	SET isPicked =FALSE;
 
-INSERT INTO vn.machineWorkerConfig(maxHours)
-	VALUES(12);
+INSERT INTO vn.machineWorkerConfig(id, maxHours)
+	VALUES(1, 12);
 
 INSERT INTO vn.workerAppTester(workerFk) VALUES(66);
 
@@ -3732,4 +3733,7 @@ UPDATE vn.saleTracking SET stateFk = 26 WHERE id = 5;
 INSERT INTO vn.report (name) VALUES ('LabelCollection');
 
 INSERT INTO vn.parkingLog(originFk, userFk, `action`, creationDate, description, changedModel,oldInstance, newInstance, changedModelId, changedModelValue)
-	VALUES(1, 18, 'update', util.VN_CURDATE(), NULL, 'SaleGroup', '{"parkingFk":null}', '{"parkingFk":1}', 1, NULL);
+	VALUES(1, 18, 'update', util.VN_CURDATE(), NULL, 'SaleGroup', '{"parkingFk":null}', '{"parkingFk":1}', 1, NULL);
+
+INSERT INTO vn.ticketLog (originFk,userFk,`action`,creationDate,changedModel,newInstance,changedModelId,changedModelValue)
+	VALUES (18,9,'insert','2001-01-01 11:01:00.000','Ticket','{"isDeleted":true}',45,'Super Man');

db/routines/vn/procedures/inventory_repair.sql

@@ -37,7 +37,7 @@ BEGIN
 				LEFT JOIN origin o ON o.id = i.originFk
 				) ON it.id = i.typeFk
 		LEFT JOIN edi.ekt ek ON b.ektFk = ek.id
-		WHERE (b.packagingFk = "--" OR b.price2 = 0 OR b.packing = 0 OR b.buyingValue = 0) AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())) AND s.name = 'INVENTARIO';
+		WHERE (b.packagingFk = "--" OR b.price2 = 0 OR b.buyingValue = 0) AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())) AND s.name = 'INVENTARIO';
 	  
 	DROP TEMPORARY TABLE IF EXISTS tmp.lastEntryOk;
 	CREATE TEMPORARY TABLE tmp.lastEntryOk  
@@ -94,11 +94,6 @@ BEGIN
 		JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk
 		 SET b.price2 = eo.price2 WHERE  b.price2 = 0 ;
 		
-		UPDATE buy b
-		JOIN tmp.lastEntry lt ON lt.buyFk = b.id
-		JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk
-		SET b.packing = eo.packing WHERE b.packing = 0;
-		
 		UPDATE buy b
 		JOIN tmp.lastEntry lt ON lt.buyFk = b.id
 		JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk

db/routines/vn/procedures/zone_getCollisions.sql

@@ -1,8 +1,9 @@
 DELIMITER $$
+
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getCollisions`()
 BEGIN
 /**
- * Calcula si para un mismo codigo postal y dia 
+ * Calcula si para un mismo codigo postal y dia
  * hay mas de una zona configurada y manda correo
  *
  */
@@ -10,17 +11,18 @@ 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;
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.zone;
 	CREATE TEMPORARY TABLE tmp.zone
-		SELECT z.id 
+		SELECT z.id
 			FROM zone z
 				JOIN agencyMode am ON am.id = z.agencyModeFk
 				JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
-			WHERE dm.code IN ('AGENCY','DELIVERY'); 
+			WHERE dm.code IN ('AGENCY','DELIVERY');
 
 	CALL zone_getOptionsForShipment(util.VN_CURDATE(),FALSE);
 
@@ -35,7 +37,7 @@ BEGIN
 			PRIMARY KEY zoneFkk (zoneFk, geoFk),
 			INDEX(geoFk))
 			ENGINE = MyISAM;
-		
+
 	OPEN cur1;
 	cur1Loop: LOOP
 		SET vIsDone = FALSE;
@@ -43,82 +45,63 @@ BEGIN
 		IF vIsDone THEN
 			LEAVE cur1Loop;
 	    END IF;
-	   
+
 		CALL zone_getLeaves(vZoneFk, NULL, NULL, TRUE);
 
-		myLoop: LOOP	
+		myLoop: LOOP
 			SET vGeoFk = NULL;
-			SELECT geoFk INTO vGeoFk 
+			SELECT geoFk INTO vGeoFk
 				FROM tmp.zoneNodes zn
 				WHERE NOT isChecked
 				LIMIT 1;
-			
+
 			IF vGeoFk IS NULL THEN
 				LEAVE myLoop;
 			END IF;
-		
+
 			CALL zone_getLeaves(vZoneFk, vGeoFk, NULL, TRUE);
 			UPDATE tmp.zoneNodes
-				SET isChecked = TRUE 
+				SET isChecked = TRUE
 				WHERE geoFk = vGeoFk;
 		END LOOP;
 
 	END LOOP;
 	CLOSE cur1;
-	DELETE FROM tmp.zoneNodes 
+	DELETE FROM tmp.zoneNodes
 		WHERE sons > 0;
-	
+
 	DROP TEMPORARY TABLE IF EXISTS geoCollision;
 	CREATE TEMPORARY TABLE geoCollision
 		SELECT z.agencyModeFk, zn.geoFk, zw.warehouseFk
 			FROM tmp.zoneNodes zn
 				JOIN zone z ON z.id = zn.zoneFk
-				JOIN zoneWarehouse zw ON z.id = zw.zoneFk 
+				JOIN zoneWarehouse zw ON z.id = zw.zoneFk
 	        GROUP BY z.agencyModeFk, zn.geoFk, zw.warehouseFk
 	        HAVING count(*) > 1;
-	
-	SELECT '<table  cellspacing="10">
-				<tr>
-					<th>C.Postal</th>
-					<th>Número de zona</th>
-					<th>Precio</th>
-					<th>Zona</th>
-					<th>Almacén</th>
-					<th>Salix</th>
-                 </tr>' INTO vTableCollisions;
-                
-    INSERT INTO mail (receiver,replyTo,subject,body)                
-		SELECT 'pepe@verdnatura.es' receiver,
-	           'noreply@verdnatura.es' replyTo,
-	            CONCAT('Colisiones en zonas ', util.VN_CURDATE()) subject,
-	            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, 
+
+    -- Recojo los datos de la zona que ha dado conflicto
+    SELECT JSON_ARRAYAGG(
+        JSON_OBJECT(
+            'zoneFk', zoneFk,
+            'zn',  JSON_OBJECT('name', zn.name),
+            'z',  JSON_OBJECT('name', z.name,'price', z.price),
+            'w',  JSON_OBJECT('name', w.name)
+            )
+    ) 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
+    INTO json_data;
+
+    -- Creo un registro de la notificacion 'zone-included' para reportar via email
+    SELECT util.notification_send(
+        'zone-included',
+            JSON_OBJECT('zoneCollisions',json_data),
+        account.myUser_getId()
+    );
+
+	DROP TEMPORARY TABLE
+		geoCollision,
 		tmp.zone,
 		tmp.zoneNodes;
 END$$

db/routines/vn/triggers/buy_beforeInsert.sql

@@ -9,6 +9,7 @@ trig: BEGIN
 	DECLARE vGroupingMode TINYINT;
 	DECLARE vGenericFk INT;
 	DECLARE vGenericInDate BOOL;
+	DECLARE vBuyerFk INT;
 
 	IF @isModeInventory THEN
 		LEAVE trig;
@@ -20,6 +21,13 @@ trig: BEGIN
 
 	SET NEW.editorFk = account.myUser_getId();
 
+	SELECT it.workerFk INTO vBuyerFk
+		FROM item i
+			JOIN itemType it ON it.id = i.typeFk
+		WHERE i.id = NEW.itemFk;
+
+	SET NEW.buyerFk = vBuyerFk;
+
 	CALL buy_checkGrouping(NEW.`grouping`);
 
 	SELECT t.warehouseInFk, t.landed

db/routines/vn/triggers/buy_beforeUpdate.sql

@@ -7,6 +7,7 @@ trig:BEGIN
 	DECLARE vGenericInDate BOOL;
 	DECLARE vIsInventory BOOL;
 	DECLARE vDefaultEntry INT;
+	DECLARE vBuyerFk INT;
 
 	IF @isTriggerDisabled THEN
 		LEAVE trig;
@@ -65,6 +66,15 @@ trig:BEGIN
 		SET	NEW.isIgnored = TRUE;
 	END IF;
 
+	IF NOT (NEW.itemFk <=> OLD.itemFk) THEN
+		SELECT it.workerFk INTO vBuyerFk
+			FROM item i
+				JOIN itemType it ON it.id = i.typeFk
+			WHERE i.id = NEW.itemFk;
+
+		SET NEW.buyerFk = vBuyerFk;
+	END IF;
+
 	IF NOT (NEW.itemFk <=> OLD.itemFk) OR 
 		NOT (OLD.entryFk <=> NEW.entryFk) THEN		
 		CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck

db/routines/vn/triggers/zoneIncluded_afterDelete.sql

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

db/routines/vn/triggers/zoneIncluded_beforeInsert.sql

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

db/versions/10880-salmonHydrangea/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.buy ADD buyerFk int(10) unsigned DEFAULT NULL NULL;

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

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

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

@@ -0,0 +1,15 @@
+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/10892-yellowGerbera/00-firstScript.sql

@@ -0,0 +1,19 @@
+SET @isTriggerDisabled := TRUE;
+
+UPDATE vn.buy 
+	SET packing = 1
+	WHERE packing IS NULL
+		OR packing <= 0;
+
+UPDATE vn.itemShelving 
+	SET packing = 1
+	WHERE packing IS NULL
+		OR NOT packing;
+
+SET @isTriggerDisabled := FALSE;
+
+ALTER TABLE vn.buy MODIFY COLUMN packing int(11) NOT NULL DEFAULT 1 CHECK(packing > 0);
+ALTER TABLE vn.itemShelving MODIFY COLUMN packing int(11) NOT NULL DEFAULT 1 CHECK(packing > 0);
+
+-- Antes tenia '0=sin obligar 1=groping 2=packing' (groping → grouping)
+ALTER TABLE vn.buy MODIFY COLUMN groupingMode tinyint(4) DEFAULT 0 NOT NULL COMMENT '0=sin obligar 1=grouping 2=packing';

db/versions/10893-limeFern/00-sage.sql

@@ -0,0 +1,73 @@
+--  Auto-generated SQL script #202403061303
+UPDATE vn.company
+	SET companyCode=0
+	WHERE id=69;
+UPDATE vn.company
+	SET companyCode=1
+	WHERE id=442;
+UPDATE vn.company
+	SET companyCode=4
+	WHERE id=567;
+UPDATE vn.company
+	SET companyCode=2
+	WHERE id=791;
+UPDATE vn.company
+	SET companyCode=3
+	WHERE id=792;
+UPDATE vn.company
+	SET companyCode=5
+	WHERE id=965;
+UPDATE vn.company
+	SET companyCode=7
+	WHERE id=1381;
+UPDATE vn.company
+	SET companyCode=3
+	WHERE id=1463;
+UPDATE vn.company
+	SET companyCode=8
+	WHERE id=2142;
+UPDATE vn.company
+	SET companyCode=6
+	WHERE id=2393;
+UPDATE vn.company
+	SET companyCode=9
+	WHERE id=3869;
+
+--  Auto-generated SQL script #202403061311
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=69;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=442;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=567;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=791;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=792;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=965;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=1381;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=1463;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=2142;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=2393;
+UPDATE vn.company
+	SET sage200Company=NULL
+	WHERE id=3869;
+
+
+ALTER TABLE vn.company CHANGE sage200Company sage200Company__ int(2) DEFAULT NULL NULL COMMENT '@deprecated 06/03/2024';
+ALTER TABLE vn.company MODIFY COLUMN sage200Company__ int(2) DEFAULT NULL NULL COMMENT '@deprecated 06/03/2024';

db/versions/10919-brownMoss/00-firstScript.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+
+

db/versions/10953-redChico/00-account.sql

@@ -0,0 +1,23 @@
+-- account.accountConfig
+ALTER TABLE account.accountConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE account.accountConfig ADD CONSTRAINT accountConfig_check CHECK (id = 1);
+
+-- account.ldapConfig
+ALTER TABLE account.ldapConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE account.ldapConfig ADD CONSTRAINT ldapConfig_check CHECK (id = 1);
+
+-- account.mailConfig
+ALTER TABLE account.mailConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE account.mailConfig ADD CONSTRAINT mailConfig_check CHECK (id = 1);
+
+-- account.roleConfig
+ALTER TABLE account.roleConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE account.roleConfig ADD CONSTRAINT roleConfig_check CHECK (id = 1);
+
+-- account.sambaConfig
+ALTER TABLE account.sambaConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE account.sambaConfig ADD CONSTRAINT sambaConfig_check CHECK (id = 1);
+
+-- account.userConfig
+ALTER TABLE account.userConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE account.userConfig ADD CONSTRAINT userConfig_check CHECK (id = 1);

db/versions/10953-redChico/01-bs.sql

@@ -0,0 +1,7 @@
+-- bs.nightTaskConfig
+ALTER TABLE bs.nightTaskConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE bs.nightTaskConfig ADD CONSTRAINT nightTaskConfig_check CHECK (id = 1);
+
+-- bs.workerProductivityConfig
+ALTER TABLE bs.workerProductivityConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE bs.workerProductivityConfig ADD CONSTRAINT workerProductivityConfig_check CHECK (id = 1);

db/versions/10953-redChico/02-edi.sql

@@ -0,0 +1,15 @@
+-- edi.exchangeConfig
+ALTER TABLE edi.exchangeConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE edi.exchangeConfig ADD CONSTRAINT exchangeConfig_check CHECK (id = 1);
+
+-- edi.ftpConfig
+ALTER TABLE edi.ftpConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE edi.ftpConfig ADD CONSTRAINT ftpConfig_check CHECK (id = 1);
+
+-- edi.imapConfig (Tiene más de 1 registro en producción)
+-- ALTER TABLE edi.imapConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+-- ALTER TABLE edi.imapConfig ADD CONSTRAINT imapConfig_check CHECK (id = 1);
+
+-- edi.offerRefreshConfig
+ALTER TABLE edi.offerRefreshConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE edi.offerRefreshConfig ADD CONSTRAINT offerRefreshConfig_check CHECK (id = 1);

db/versions/10953-redChico/03-hedera.sql

@@ -0,0 +1,27 @@
+-- hedera.config
+ALTER TABLE hedera.config MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE hedera.config ADD CONSTRAINT config_check CHECK (id = 1);
+
+-- hedera.imageConfig
+ALTER TABLE hedera.imageConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE hedera.imageConfig ADD CONSTRAINT imageConfig_check CHECK (id = 1);
+
+-- hedera.mailConfig
+ALTER TABLE hedera.mailConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE hedera.mailConfig ADD CONSTRAINT mailConfig_check CHECK (id = 1);
+
+-- hedera.orderConfig
+ALTER TABLE hedera.orderConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE hedera.orderConfig ADD CONSTRAINT orderConfig_check CHECK (id = 1);
+
+-- hedera.shelfConfig (Tiene más de 1 registro en producción)
+-- ALTER TABLE hedera.shelfConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+-- ALTER TABLE hedera.shelfConfig ADD CONSTRAINT shelfConfig_check CHECK (id = 1);
+
+-- hedera.tpvConfig
+ALTER TABLE hedera.tpvConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE hedera.tpvConfig ADD CONSTRAINT tpvConfig_check CHECK (id = 1);
+
+-- hedera.tpvImapConfig
+ALTER TABLE hedera.tpvImapConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE hedera.tpvImapConfig ADD CONSTRAINT tpvImapConfig_check CHECK (id = 1);

db/versions/10953-redChico/04-pbx.sql

@@ -0,0 +1,15 @@
+-- pbx.config
+ALTER TABLE pbx.config MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE pbx.config ADD CONSTRAINT config_check CHECK (id = 1);
+
+-- pbx.followmeConfig
+ALTER TABLE pbx.followmeConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE pbx.followmeConfig ADD CONSTRAINT followmeConfig_check CHECK (id = 1);
+
+-- pbx.queueConfig (Tiene más de 1 registro en producción)
+-- ALTER TABLE pbx.queueConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+-- ALTER TABLE pbx.queueConfig ADD CONSTRAINT queueConfig_check CHECK (id = 1);
+
+-- pbx.sipConfig
+ALTER TABLE pbx.sipConfig MODIFY COLUMN id mediumint(8) unsigned NOT NULL;
+ALTER TABLE pbx.sipConfig ADD CONSTRAINT sipConfig_check CHECK (id = 1);

db/versions/10953-redChico/05-sage.sql

@@ -0,0 +1,3 @@
+-- sage.config
+ALTER TABLE sage.config MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE sage.config ADD CONSTRAINT config_check CHECK (id = 1);

db/versions/10953-redChico/06-salix.sql

@@ -0,0 +1,7 @@
+-- salix.accessTokenConfig
+ALTER TABLE salix.accessTokenConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE salix.accessTokenConfig ADD CONSTRAINT accessTokenConfig_check CHECK (id = 1);
+
+-- salix.printConfig
+ALTER TABLE salix.printConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE salix.printConfig ADD CONSTRAINT printConfig_check CHECK (id = 1);

db/versions/10953-redChico/06-srt.sql

@@ -0,0 +1,3 @@
+-- srt.config
+ALTER TABLE srt.config MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE srt.config ADD CONSTRAINT config_check CHECK (id = 1);

db/versions/10953-redChico/07-util.sql

@@ -0,0 +1,11 @@
+-- util.config
+ALTER TABLE util.config MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE util.config ADD CONSTRAINT config_check CHECK (id = 1);
+
+-- util.notificationConfig
+ALTER TABLE util.notificationConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE util.notificationConfig ADD CONSTRAINT notificationConfig_check CHECK (id = 1);
+
+-- util.versionConfig
+ALTER TABLE util.versionConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE util.versionConfig ADD CONSTRAINT versionConfig_check CHECK (id = 1);

db/versions/10953-redChico/08-vn.sql

@@ -0,0 +1,87 @@
+-- vn.accountingConfig
+ALTER TABLE vn.accountingConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.accountingConfig ADD CONSTRAINT accountingConfig_check CHECK (id = 1);
+
+-- vn.auctionConfig
+ALTER TABLE vn.auctionConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.auctionConfig ADD CONSTRAINT auctionConfig_check CHECK (id = 1);
+
+-- vn.autoRadioConfig
+ALTER TABLE vn.autoRadioConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.autoRadioConfig ADD CONSTRAINT autoRadioConfig_check CHECK (id = 1);
+
+-- vn.bankEntityConfig
+ALTER TABLE vn.bankEntityConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.bankEntityConfig ADD CONSTRAINT bankEntityConfig_check CHECK (id = 1);
+
+-- vn.bionicConfig
+ALTER TABLE vn.bionicConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.bionicConfig ADD CONSTRAINT bionicConfig_check CHECK (id = 1);
+
+-- vn.buyConfig
+ALTER TABLE vn.buyConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.buyConfig ADD CONSTRAINT buyConfig_check CHECK (id = 1);
+
+-- vn.chatConfig
+ALTER TABLE vn.chatConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.chatConfig ADD CONSTRAINT chatConfig_check CHECK (id = 1);
+
+-- vn.claimConfig
+ALTER TABLE vn.claimConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.claimConfig ADD CONSTRAINT claimConfig_check CHECK (id = 1);
+
+-- vn.clientConfig
+ALTER TABLE vn.clientConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.clientConfig ADD CONSTRAINT clientConfig_check CHECK (id = 1);
+
+-- vn.comparativeAddConfig
+ALTER TABLE vn.comparativeAddConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.comparativeAddConfig ADD CONSTRAINT comparativeAddConfig_check CHECK (id = 1);
+
+-- vn.comparativeConfig
+ALTER TABLE vn.comparativeConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.comparativeConfig ADD CONSTRAINT comparativeConfig_check CHECK (id = 1);
+
+-- vn.config
+ALTER TABLE vn.config MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.config ADD CONSTRAINT config_check CHECK (id = 1);
+
+-- vn.conveyorConfig (Tiene más de 1 registro en producción)
+-- ALTER TABLE vn.conveyorConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+-- ALTER TABLE vn.conveyorConfig ADD CONSTRAINT conveyorConfig_check CHECK (id = 1);
+
+-- vn.deviceProductionConfig
+ALTER TABLE vn.deviceProductionConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.deviceProductionConfig ADD CONSTRAINT deviceProductionConfig_check CHECK (id = 1);
+
+-- vn.docuwareConfig
+ALTER TABLE vn.docuwareConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.docuwareConfig ADD CONSTRAINT docuwareConfig_check CHECK (id = 1);
+
+-- vn.floramondoConfig
+ALTER TABLE vn.floramondoConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.floramondoConfig ADD CONSTRAINT floramondoConfig_check CHECK (id = 1);
+
+-- vn.franceExpressConfig
+ALTER TABLE vn.franceExpressConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.franceExpressConfig ADD CONSTRAINT franceExpressConfig_check CHECK (id = 1);
+
+-- vn.glsConfig
+ALTER TABLE vn.glsConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.glsConfig ADD CONSTRAINT glsConfig_check CHECK (id = 1);
+
+-- vn.greugeConfig
+ALTER TABLE vn.greugeConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.greugeConfig ADD CONSTRAINT greugeConfig_check CHECK (id = 1);
+
+-- vn.inventoryConfig
+ALTER TABLE vn.inventoryConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.inventoryConfig ADD CONSTRAINT inventoryConfig_check CHECK (id = 1);
+
+-- vn.invoiceInConfig
+ALTER TABLE vn.invoiceInConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.invoiceInConfig ADD CONSTRAINT invoiceInConfig_check CHECK (id = 1);
+
+-- vn.invoiceOutConfig
+ALTER TABLE vn.invoiceOutConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.invoiceOutConfig ADD CONSTRAINT invoiceOutConfig_check CHECK (id = 1);

db/versions/10953-redChico/08-vn2.sql

@@ -0,0 +1,91 @@
+-- vn.invoiceOutTaxConfig (Tiene más de 1 registro en producción)
+-- ALTER TABLE vn.invoiceOutTaxConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+-- ALTER TABLE vn.invoiceOutTaxConfig ADD CONSTRAINT invoiceOutTaxConfig_check CHECK (id = 1);
+
+-- vn.itemConfig
+ALTER TABLE vn.itemConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.itemConfig ADD CONSTRAINT itemConfig_check CHECK (id = 1);
+
+-- vn.machineWorkerConfig
+ALTER TABLE vn.machineWorkerConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.machineWorkerConfig ADD CONSTRAINT machineWorkerConfig_check CHECK (id = 1);
+
+-- vn.mdbConfig
+ALTER TABLE vn.mdbConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.mdbConfig ADD CONSTRAINT mdbConfig_check CHECK (id = 1);
+
+-- vn.mrwConfig
+ALTER TABLE vn.mrwConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.mrwConfig ADD CONSTRAINT mrwConfig_check CHECK (id = 1);
+
+-- vn.osTicketConfig
+ALTER TABLE vn.osTicketConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.osTicketConfig ADD CONSTRAINT osTicketConfig_check CHECK (id = 1);
+
+-- vn.packagingConfig
+ALTER TABLE vn.packagingConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.packagingConfig ADD CONSTRAINT packagingConfig_check CHECK (id = 1);
+
+-- vn.packingSiteConfig
+ALTER TABLE vn.packingSiteConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.packingSiteConfig ADD CONSTRAINT packingSiteConfig_check CHECK (id = 1);
+
+-- vn.productionConfig
+ALTER TABLE vn.productionConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.productionConfig ADD CONSTRAINT productionConfig_check CHECK (id = 1);
+
+-- vn.rateConfig
+ALTER TABLE vn.rateConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.rateConfig ADD CONSTRAINT rateConfig_check CHECK (id = 1);
+
+-- vn.routeConfig
+ALTER TABLE vn.routeConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.routeConfig ADD CONSTRAINT routeConfig_check CHECK (id = 1);
+
+-- vn.salespersonConfig
+ALTER TABLE vn.salespersonConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.salespersonConfig ADD CONSTRAINT salespersonConfig_check CHECK (id = 1);
+
+-- vn.sendingConfig
+ALTER TABLE vn.sendingConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.sendingConfig ADD CONSTRAINT sendingConfig_check CHECK (id = 1);
+
+-- vn.smsConfig
+ALTER TABLE vn.smsConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.smsConfig ADD CONSTRAINT smsConfig_check CHECK (id = 1);
+
+-- vn.ticketConfig
+ALTER TABLE vn.ticketConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.ticketConfig ADD CONSTRAINT ticketConfig_check CHECK (id = 1);
+
+-- vn.tillConfig
+ALTER TABLE vn.tillConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.tillConfig ADD CONSTRAINT tillConfig_check CHECK (id = 1);
+
+-- vn.travelConfig
+ALTER TABLE vn.travelConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.travelConfig ADD CONSTRAINT travelConfig_check CHECK (id = 1);
+
+-- vn.viaexpressConfig
+ALTER TABLE vn.viaexpressConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.viaexpressConfig ADD CONSTRAINT viaexpressConfig_check CHECK (id = 1);
+
+-- vn.wagonConfig
+ALTER TABLE vn.wagonConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.wagonConfig ADD CONSTRAINT wagonConfig_check CHECK (id = 1);
+
+-- vn.workerConfig
+ALTER TABLE vn.workerConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.workerConfig ADD CONSTRAINT workerConfig_check CHECK (id = 1);
+
+-- vn.workerTimeControlConfig
+ALTER TABLE vn.workerTimeControlConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.workerTimeControlConfig ADD CONSTRAINT workerTimeControlConfig_check CHECK (id = 1);
+
+-- vn.zipConfig
+ALTER TABLE vn.zipConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.zipConfig ADD CONSTRAINT zipConfig_check CHECK (id = 1);
+
+-- vn.zoneConfig
+ALTER TABLE vn.zoneConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.zoneConfig ADD CONSTRAINT zoneConfig_check CHECK (id = 1);

front/core/services/auth.js

@@ -83,22 +83,27 @@ export default class Auth {
     }
 
     onLoginOk(json, now, remember) {
-        this.vnToken.set(json.data.token, now, json.data.ttl, remember);
-
-        return this.loadAcls().then(() => {
-            let continueHash = this.$state.params.continue;
-            if (continueHash)
-                this.$window.location = continueHash;
-            else
-                this.$state.go('home');
-        });
+        return this.$http.get('VnUsers/ShareToken', {
+            headers: {Authorization: json.data.token}
+        }).then(({data}) => {
+            this.vnToken.set(json.data.token, data.multimediaToken.id, now, json.data.ttl, remember);
+            this.loadAcls().then(() => {
+                let continueHash = this.$state.params.continue;
+                if (continueHash)
+                    this.$window.location = continueHash;
+                else
+                    this.$state.go('home');
+            });
+        }).catch(() => {});
     }
 
     logout() {
+        this.$http.post('Accounts/logout', null, {headers: {'Authorization': this.vnToken.tokenMultimedia},
+        }).catch(() => {});
+
         let promise = this.$http.post('VnUsers/logout', null, {
             headers: {Authorization: this.vnToken.token}
         }).catch(() => {});
-
         this.vnToken.unset();
         this.loggedIn = false;
         this.vnModules.reset();

front/core/services/interceptor.js

@@ -19,7 +19,7 @@ function interceptor($q, vnApp, $translate) {
 
             if (config.url.charAt(0) !== '/' && apiPath)
                 config.url = `${apiPath}${config.url}`;
-            if (token)
+            if (token && !config.headers.Authorization)
                 config.headers.Authorization = token;
             if ($translate.use())
                 config.headers['Accept-Language'] = $translate.use();

front/core/services/token.js

@@ -24,21 +24,22 @@ export default class Token {
         } catch (e) {}
     }
 
-    set(token, created, ttl, remember) {
+    set(token, tokenMultimedia, created, ttl, remember) {
         this.unset();
 
         Object.assign(this, {
             token,
+            tokenMultimedia,
             created,
             ttl,
             remember
         });
-        this.vnInterceptor.setToken(token);
+        this.vnInterceptor.setToken(token, tokenMultimedia);
         try {
             if (remember)
-                this.setStorage(localStorage, token, created, ttl);
+                this.setStorage(localStorage, token, tokenMultimedia, created, ttl);
             else
-                this.setStorage(sessionStorage, token, created, ttl);
+                this.setStorage(sessionStorage, token, tokenMultimedia, created, ttl);
         } catch (err) {
             console.error(err);
         }
@@ -46,6 +47,7 @@ export default class Token {
 
     unset() {
         this.token = null;
+        this.tokenMultimedia = null;
         this.created = null;
         this.ttl = null;
         this.remember = null;
@@ -57,13 +59,15 @@ export default class Token {
 
     getStorage(storage) {
         this.token = storage.getItem('vnToken');
+        this.tokenMultimedia = storage.getItem('vnTokenMultimedia');
         if (!this.token) return;
         const created = storage.getItem('vnTokenCreated');
         this.created = created && new Date(created);
         this.ttl = storage.getItem('vnTokenTtl');
     }
 
-    setStorage(storage, token, created, ttl) {
+    setStorage(storage, token, tokenMultimedia, created, ttl) {
+        storage.setItem('vnTokenMultimedia', tokenMultimedia);
         storage.setItem('vnToken', token);
         storage.setItem('vnTokenCreated', created.toJSON());
         storage.setItem('vnTokenTtl', ttl);
@@ -71,6 +75,7 @@ export default class Token {
 
     removeStorage(storage) {
         storage.removeItem('vnToken');
+        storage.removeItem('vnTokenMultimedia');
         storage.removeItem('vnTokenCreated');
         storage.removeItem('vnTokenTtl');
     }

front/salix/components/layout/index.js

@@ -23,8 +23,7 @@ export class Layout extends Component {
         if (!this.$.$root.user) return;
 
         const userId = this.$.$root.user.id;
-        const token = this.vnToken.token;
-        return `/api/Images/user/160x160/${userId}/download?access_token=${token}`;
+        return `/api/Images/user/160x160/${userId}/download?access_token=${this.vnToken.tokenMultimedia}`;
     }
 
     refresh() {

front/salix/components/log/index.html

@@ -31,7 +31,7 @@
                     ng-click="$ctrl.showDescriptor($event, userLog)">
                     <img
                         ng-if="::userLog.user.image"
-                        ng-src="/api/Images/user/160x160/{{::userLog.userFk}}/download?access_token={{::$ctrl.vnToken.token}}">
+                        ng-src="/api/Images/user/160x160/{{::userLog.userFk}}/download?access_token={{::$ctrl.vnToken.tokenMultimedia}}">
                     </img>
                 </vn-avatar>
                 </div>
@@ -181,7 +181,7 @@
                         val="{{::nickname}}">
                         <img
                             ng-if="::image"
-                            ng-src="/api/Images/user/160x160/{{::id}}/download?access_token={{::$ctrl.vnToken.token}}">
+                            ng-src="/api/Images/user/160x160/{{::id}}/download?access_token={{::$ctrl.vnToken.tokenMultimedia}}">
                         </img>
                     </vn-avatar>
                     <div>

front/salix/module.js

@@ -13,7 +13,7 @@ export function run($window, $rootScope, vnAuth, vnApp, vnToken, $state) {
         if (!collection || !size || !id) return;
 
         const basePath = `/api/Images/${collection}/${size}/${id}`;
-        return `${basePath}/download?access_token=${vnToken.token}`;
+        return `${basePath}/download?access_token=${vnToken.tokenMultimedia}`;
     };
 
     $window.validations = {};

loopback/locale/en.json

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

loopback/locale/es.json

@@ -346,5 +346,7 @@
     "CountryFK cannot be empty": "El país no puede estar vacío",
     "Cmr file does not exist": "El archivo del cmr no existe",
     "You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
-    "The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas"
-}
+    "The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas",
+    "This password can only be changed by the user themselves": "Esta contraseña solo puede ser modificada por el propio usuario",
+    "They're not your subordinate": "No es tu subordinado/a."
+}

modules/account/back/methods/account/logout.js

@@ -15,7 +15,8 @@ module.exports = Self => {
         http: {
             path: `/logout`,
             verb: 'POST'
-        }
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.logout = async ctx => Self.app.models.VnUser.logout(ctx.req.accessToken.id);

modules/account/back/models/account.js

@@ -1,4 +1,7 @@
 
+const ForbiddenError = require('vn-loopback/util/forbiddenError');
+const {models} = require('vn-loopback/server/server');
+
 module.exports = Self => {
     require('../methods/account/sync')(Self);
     require('../methods/account/sync-by-id')(Self);
@@ -7,4 +10,11 @@ module.exports = Self => {
     require('../methods/account/logout')(Self);
     require('../methods/account/change-password')(Self);
     require('../methods/account/set-password')(Self);
+
+    Self.setUnverifiedPassword = async(id, pass, options) => {
+        const {emailVerified} = await models.VnUser.findById(id, {fields: ['emailVerified']}, options);
+        if (emailVerified) throw new ForbiddenError('This password can only be changed by the user themselves');
+
+        await models.VnUser.setPassword(id, pass, options);
+    };
 };

modules/claim/back/methods/claim/downloadFile.js

@@ -32,7 +32,8 @@ module.exports = Self => {
         http: {
             path: `/:id/downloadFile`,
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.downloadFile = async function(ctx, id) {

modules/client/front/balance/index/index.html

@@ -114,7 +114,7 @@
                     <vn-td center shrink>
                         <a ng-show="balance.hasPdf"
                             target="_blank"
-                            href="api/InvoiceOuts/{{::balance.id}}/download?access_token={{::$ctrl.vnToken.token}}">
+                            href="api/InvoiceOuts/{{::balance.id}}/download?access_token={{::$ctrl.vnToken.tokenMultimedia}}">
                             <vn-icon-button
                                 icon="cloud_download"
                                 title="{{'Download PDF' | translate}}">

modules/invoiceOut/back/methods/invoiceOut/download.js

@@ -31,7 +31,8 @@ module.exports = Self => {
         http: {
             path: '/:id/download',
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.download = async function(ctx, id, options) {

modules/invoiceOut/back/methods/invoiceOut/downloadZip.js

@@ -31,7 +31,8 @@ module.exports = Self => {
         http: {
             path: '/downloadZip',
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.downloadZip = async function(ctx, ids, options) {

modules/invoiceOut/front/descriptor-menu/index.html

@@ -37,7 +37,7 @@
             <vn-menu vn-id="showInvoiceMenu">
                 <vn-list>
                     <a class="vn-item"
-                        href="api/InvoiceOuts/{{$ctrl.id}}/download?access_token={{$ctrl.vnToken.token}}"
+                        href="api/InvoiceOuts/{{$ctrl.id}}/download?access_token={{$ctrl.vnToken.tokenMultimedia}}"
                         target="_blank"
                         name="showInvoicePdf"
                         translate>
@@ -102,7 +102,7 @@
         </vn-item>
         <vn-item class="dropdown"
             vn-click-stop="refundMenu.show($event, 'left')"
-            vn-tooltip="Create a single ticket with all the content of the current invoice"
+            vn-tooltip="Create a refund ticket for each ticket on the current invoice"
             vn-acl="invoicing, claimManager, salesAssistant"
             vn-acl-action="remove"
             translate>

modules/invoiceOut/front/descriptor-menu/index.js

@@ -118,11 +118,14 @@ class Controller extends Section {
         const query = 'InvoiceOuts/refund';
         const params = {ref: this.invoiceOut.ref, withWarehouse: withWarehouse};
         this.$http.post(query, params).then(res => {
-            const refundTicket = res.data;
-            this.vnApp.showSuccess(this.$t('The following refund ticket have been created', {
-                ticketId: refundTicket.id
+            const tickets = res.data;
+            const refundTickets = tickets.map(ticket => ticket.id);
+
+            this.vnApp.showSuccess(this.$t('The following refund tickets have been created', {
+                ticketId: refundTickets.join(',')
             }));
-            this.$state.go('ticket.card.sale', {id: refundTicket.id});
+            if (refundTickets.length == 1)
+                this.$state.go('ticket.card.sale', {id: refundTickets[0]});
         });
     }
 

modules/invoiceOut/front/descriptor-menu/locale/es.yml

@@ -15,7 +15,7 @@ Are you sure you want to clone this invoice?: Estas seguro de clonar esta factur
 InvoiceOut booked: Factura asentada
 Are you sure you want to book this invoice?: Estas seguro de querer asentar esta factura?
 Are you sure you want to refund this invoice?: Estas seguro de querer abonar esta factura?
-Create a single ticket with all the content of the current invoice: Crear un ticket unico con todo el contenido de la factura actual
+Create a refund ticket for each ticket on the current invoice: Crear un ticket abono por cada ticket de la factura actual
 Regenerate PDF invoice: Regenerar PDF factura
 The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
 The email can't be empty: El correo no puede estar vacío

modules/invoiceOut/front/index/index.js

@@ -25,7 +25,7 @@ export default class Controller extends Section {
     openPdf() {
         if (this.checked.length <= 1) {
             const [invoiceOutId] = this.checked;
-            const url = `api/InvoiceOuts/${invoiceOutId}/download?access_token=${this.vnToken.token}`;
+            const url = `api/InvoiceOuts/${invoiceOutId}/download?access_token=${this.vnToken.tokenMultimedia}`;
             window.open(url, '_blank');
         } else {
             const invoiceOutIds = this.checked;

modules/item/back/methods/item-image-queue/download.js

@@ -11,6 +11,7 @@ module.exports = Self => {
             path: `/download`,
             verb: 'POST',
         },
+        accessScopes: ['read:multimedia']
     });
 
     Self.download = async() => {

modules/route/back/methods/route/downloadCmrsZip.js

@@ -29,7 +29,8 @@ module.exports = Self => {
         http: {
             path: '/downloadCmrsZip',
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.downloadCmrsZip = async function(ctx, ids, options) {

modules/route/back/methods/route/downloadZip.js

@@ -29,7 +29,8 @@ module.exports = Self => {
         http: {
             path: '/downloadZip',
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.downloadZip = async function(ctx, id, options) {

modules/route/back/methods/route/driverRoutePdf.js

@@ -34,7 +34,9 @@ module.exports = Self => {
         http: {
             path: '/:id/driver-route-pdf',
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
+
     });
 
     Self.driverRoutePdf = (ctx, id) => Self.printReport(ctx, id, 'driver-route');

modules/route/back/models/route.js

@@ -30,9 +30,11 @@ module.exports = Self => {
     });
 
     function validateDistance(err) {
-        const routeTotalKm = this.kmEnd - this.kmStart;
-        const routeMaxKm = 4000;
-        if (routeTotalKm > routeMaxKm || this.kmStart > this.kmEnd)
-            err();
+        if (this.kmEnd) {
+            const routeTotalKm = this.kmEnd - this.kmStart;
+            const routeMaxKm = 4000;
+            if (routeTotalKm > routeMaxKm || this.kmStart > this.kmEnd)
+                err();
+        }
     }
 };

modules/route/front/index/index.js

@@ -40,7 +40,7 @@ export default class Controller extends Section {
         const stringRoutesIds = routesIds.join(',');
 
         if (this.checked.length <= 1) {
-            const url = `api/Routes/${stringRoutesIds}/driver-route-pdf?access_token=${this.vnToken.token}`;
+            const url = `api/Routes/${stringRoutesIds}/driver-route-pdf?access_token=${this.vnToken.tokenMultimedia}`;
             window.open(url, '_blank');
         } else {
             const serializedParams = this.$httpParamSerializer({

modules/ticket/back/methods/ticket-log/specs/getChanges.spec.js

@@ -9,8 +9,8 @@ describe('ticketLog getChanges()', () => {
     it('should return the changes in the sales of a ticket', async() => {
         const ticketId = 16;
 
-        const changues = await models.TicketLog.getChanges(ctx, ticketId);
+        const changes = await models.TicketLog.getChanges(ctx, ticketId);
 
-        expect(changues).toContain(`Change quantity`);
+        expect(changes).toContain(`Change quantity`);
     });
 });

modules/ticket/back/methods/ticket/restore.js

@@ -29,6 +29,15 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
+        const ticketLog = await models.TicketLog.findOne({
+            fields: ['originFk', 'creationDate', 'newInstance'],
+            where: {
+                originFk: id,
+                newInstance: {like: '%"isDeleted":true%'}
+            },
+            order: 'creationDate DESC'
+        }, myOptions);
+
         const ticket = await models.Ticket.findById(id, {
             include: [{
                 relation: 'client',
@@ -39,10 +48,9 @@ module.exports = Self => {
         }, myOptions);
 
         const now = Date.vnNew();
-        const maxDate = new Date(ticket.updated);
+        const maxDate = new Date(ticketLog?.creationDate);
         maxDate.setHours(maxDate.getHours() + 1);
-
-        if (now > maxDate)
+        if (!ticketLog || now > maxDate)
             throw new UserError(`You can only restore a ticket within the first hour after deletion`);
 
         // Send notification to salesPerson

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

@@ -4,7 +4,7 @@ const models = app.models;
 
 describe('ticket restore()', () => {
     const employeeUser = 1110;
-    const ticketId = 18;
+    const ticketId = 9;
     const activeCtx = {
         accessToken: {userId: employeeUser},
         headers: {
@@ -30,10 +30,21 @@ describe('ticket restore()', () => {
         try {
             const options = {transaction: tx};
             const ticket = await models.Ticket.findById(ticketId, null, options);
+
             await ticket.updateAttributes({
                 isDeleted: true,
                 updated: now
             }, options);
+
+            await models.TicketLog.create({
+                originFk: ticketId,
+                userFk: employeeUser,
+                action: 'update',
+                changedModel: 'Ticket',
+                creationDate: new Date('2001-01-01 10:59:00'),
+                newInstance: '{"isDeleted":true}'
+            }, options);
+
             await app.models.Ticket.restore(ctx, ticketId, options);
             await tx.rollback();
         } catch (e) {
@@ -52,11 +63,21 @@ describe('ticket restore()', () => {
             const options = {transaction: tx};
 
             const ticketBeforeUpdate = await models.Ticket.findById(ticketId, null, options);
+
             await ticketBeforeUpdate.updateAttributes({
                 isDeleted: true,
                 updated: now
             }, options);
 
+            await models.TicketLog.create({
+                originFk: ticketId,
+                userFk: employeeUser,
+                action: 'update',
+                changedModel: 'Ticket',
+                creationDate: new Date('2001-01-01 11:01:00'),
+                newInstance: '{"isDeleted":true}'
+            }, options);
+
             const ticketAfterUpdate = await models.Ticket.findById(ticketId, null, options);
 
             expect(ticketAfterUpdate.isDeleted).toBeTruthy();
@@ -65,7 +86,9 @@ describe('ticket restore()', () => {
             const ticketAfterRestore = await models.Ticket.findById(ticketId, null, options);
 
             const fullYear = now.getFullYear();
+
             const shippedFullYear = ticketAfterRestore.shipped.getFullYear();
+
             const landedFullYear = ticketAfterRestore.landed.getFullYear();
 
             expect(ticketAfterRestore.isDeleted).toBeFalsy();

modules/ticket/back/models/ticket-log.json

@@ -5,5 +5,40 @@
 		"mysql": {
 			"table": "ticketLog"
 		}
-	}
+	},
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "originFk": {
+            "type": "number"
+        },
+        "userFk": {
+            "type":"number"
+        },
+        "action": {
+            "type": "string"
+        },
+        "creationDate": {
+            "type": "date"
+        },
+        "description": {
+            "type": "string"
+        },
+        "changedModel": {
+            "type": "string"
+        },
+        "oldInstance": {
+            "type": "any"
+        },
+        "newInstance": {
+            "type": "any"
+        },
+        "changedModelId": {
+            "type": "string"
+        },
+        "changedModelValue": {
+            "type": "string"
+        }
+    }
 }

modules/ticket/front/descriptor-menu/index.js

@@ -35,6 +35,29 @@ class Controller extends Section {
                 });
             }
         });
+
+        const filter = {
+            fields: ['originFk', 'creationDate', 'newInstance'],
+            where: {
+                originFk: value,
+                newInstance: {like: '%"isDeleted":true%'}
+            },
+            order: 'creationDate DESC'
+        };
+        this.$http.get(`TicketLogs/findOne`, {filter})
+            .then(res => {
+                if (res && res.data) {
+                    const now = Date.vnNew();
+                    const maxDate = new Date(res.data.creationDate);
+                    maxDate.setHours(maxDate.getHours() + 1);
+                    if (now <= maxDate)
+                        return this.canRestoreTicket = true;
+                }
+                this.canRestoreTicket = false;
+            })
+            .catch(() => {
+                this.canRestoreTicket = false;
+            });
     }
 
     get isInvoiced() {
@@ -171,15 +194,6 @@ class Controller extends Section {
             });
     }
 
-    get canRestoreTicket() {
-        const isDeleted = this.ticket.isDeleted;
-        const now = Date.vnNew();
-        const maxDate = new Date(this.ticket.updated);
-        maxDate.setHours(maxDate.getHours() + 1);
-
-        return isDeleted && (now <= maxDate);
-    }
-
     restoreTicket() {
         return this.$http.post(`Tickets/${this.id}/restore`)
             .then(() => this.reload())

modules/ticket/front/descriptor-menu/index.spec.js

@@ -40,29 +40,6 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
         controller.ticket = ticket;
     }));
 
-    describe('canRestoreTicket() getter', () => {
-        it('should return true for a ticket deleted within the last hour', () => {
-            controller.ticket.isDeleted = true;
-            controller.ticket.updated = Date.vnNew();
-
-            const result = controller.canRestoreTicket;
-
-            expect(result).toBeTruthy();
-        });
-
-        it('should return false for a ticket deleted more than one hour ago', () => {
-            const pastHour = Date.vnNew();
-            pastHour.setHours(pastHour.getHours() - 2);
-
-            controller.ticket.isDeleted = true;
-            controller.ticket.updated = pastHour;
-
-            const result = controller.canRestoreTicket;
-
-            expect(result).toBeFalsy();
-        });
-    });
-
     describe('addTurn()', () => {
         it('should make a query and call $.addTurn.hide() and vnApp.showSuccess()', () => {
             controller.$.addTurn = {hide: () => {}};
@@ -105,20 +82,6 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
         });
     });
 
-    describe('restoreTicket()', () => {
-        it('should make a query to restore the ticket and call vnApp.showSuccess()', () => {
-            jest.spyOn(controller, 'reload').mockReturnThis();
-            jest.spyOn(controller.vnApp, 'showSuccess');
-
-            $httpBackend.expectPOST(`Tickets/${ticket.id}/restore`).respond();
-            controller.restoreTicket();
-            $httpBackend.flush();
-
-            expect(controller.reload).toHaveBeenCalled();
-            expect(controller.vnApp.showSuccess).toHaveBeenCalled();
-        });
-    });
-
     describe('showPdfDeliveryNote()', () => {
         it('should open a new window showing a delivery note PDF document', () => {
             jest.spyOn(window, 'open').mockReturnThis();

modules/ticket/front/descriptor-menu/locale/es.yml

@@ -14,7 +14,8 @@ Refund all...: Abonar todo...
 with warehouse: con almacén
 without warehouse: sin almacén
 Invoice sent: Factura enviada
-The following refund ticket have been created: "Se ha creado siguiente ticket de abono: {{ticketId}}"
+The following refund ticket have been created: "Se ha creado el siguiente ticket de abono: {{ticketId}}"
+The following refund tickets have been created: "Se han creado los siguientes tickets de abono: {{ticketId}}"
 Transfer client: Transferir cliente
 Send SMS...: Enviar SMS...
 Notify changes: Notificar cambios

modules/worker/back/methods/worker-dms/downloadFile.js

@@ -29,7 +29,8 @@ module.exports = Self => {
         http: {
             path: `/:id/downloadFile`,
             verb: 'GET'
-        }
+        },
+        accessScopes: ['read:multimedia']
     });
 
     Self.downloadFile = async function(ctx, id) {

modules/worker/back/methods/worker/setPassword.js

@@ -1,31 +1,29 @@
-const UserError = require('vn-loopback/util/user-error');
+const ForbiddenError = require('vn-loopback/util/forbiddenError');
 module.exports = Self => {
     Self.remoteMethodCtx('setPassword', {
         description: 'Set a new password',
-        accepts: [
-            {
-                arg: 'workerFk',
-                type: 'number',
-                required: true,
-                description: 'The worker id',
-            },
-            {
-                arg: 'newPass',
-                type: 'String',
-                required: true,
-                description: 'The new worker password'
-            }
-        ],
+        accepts: [{
+            arg: 'id',
+            type: 'number',
+            required: true,
+            description: 'The worker id',
+            http: {source: 'path'}
+        }, {
+            arg: 'newPass',
+            type: 'String',
+            required: true,
+            description: 'The new worker password'
+        }],
         http: {
             path: `/:id/setPassword`,
             verb: 'PATCH'
         }
     });
-    Self.setPassword = async(ctx, options) => {
+    Self.setPassword = async(ctx, id, newPass, options) => {
         const models = Self.app.models;
         const myOptions = {};
-        const {args} = ctx;
         let tx;
+
         if (typeof options == 'object')
             Object.assign(myOptions, options);
         if (!myOptions.transaction) {
@@ -33,11 +31,10 @@ module.exports = Self => {
             myOptions.transaction = tx;
         }
         try {
-            const isSubordinate = await models.Worker.isSubordinate(ctx, args.workerFk, myOptions);
-            if (!isSubordinate) throw new UserError('You don\'t have enough privileges.');
+            const isSubordinate = await Self.isSubordinate(ctx, id, myOptions);
+            if (!isSubordinate) throw new ForbiddenError('They\'re not your subordinate');
 
-            await models.VnUser.setPassword(args.workerFk, args.newPass, myOptions);
-            await models.VnUser.updateAll({id: args.workerFk}, {emailVerified: true}, myOptions);
+            await models.Account.setUnverifiedPassword(id, newPass, myOptions);
 
             if (tx) await tx.commit();
         } catch (e) {

modules/worker/back/methods/worker/specs/setPassword.spec.js

@@ -1,31 +1,30 @@
-const UserError = require('vn-loopback/util/user-error');
-
-const models = require('vn-loopback/server/server').models;
+const {models} = require('vn-loopback/server/server');
 
 describe('worker setPassword()', () => {
     let ctx;
+    const newPass = 'H3rn4d3z#';
+    const employeeId = 1;
+    const managerId = 20;
+    const administrativeId = 5;
+
     beforeAll(() => {
         ctx = {
             req: {
-                accessToken: {},
+                accessToken: {userId: managerId},
                 headers: {origin: 'http://localhost'}
             },
-            args: {workerFk: 9}
         };
     });
 
-    beforeEach(() => {
-        ctx.req.accessToken.userId = 20;
-        ctx.args.newPass = 'H3rn4d3z#';
-    });
-
-    it('should change the password', async() => {
+    it('should change the password if it is a subordinate and the email is not verified', async() => {
         const tx = await models.Worker.beginTransaction({});
 
         try {
             const options = {transaction: tx};
-            await models.Worker.setPassword(ctx, options);
+            await models.Worker.setPassword(ctx, employeeId, newPass, options);
+            const isNewPass = await passHasBeenChanged(employeeId, newPass, options);
 
+            expect(isNewPass).toBeTrue();
             await tx.rollback();
         } catch (e) {
             await tx.rollback();
@@ -33,29 +32,48 @@ describe('worker setPassword()', () => {
         }
     });
 
-    it('should throw an error: Password does not meet requirements', async() => {
-        const tx = await models.Collection.beginTransaction({});
-        ctx.args.newPass = 'Hi';
+    it('should not change the password if it is a subordinate and the email is verified', async() => {
+        const tx = await models.Worker.beginTransaction({});
+
         try {
             const options = {transaction: tx};
-            await models.Worker.setPassword(ctx, options);
+            await models.VnUser.updateAll({id: employeeId}, {emailVerified: true}, options);
+            await models.Worker.setPassword(ctx, employeeId, newPass, options);
+
+            await tx.rollback();
+        } catch (e) {
+            expect(e.message).toEqual(`This password can only be changed by the user themselves`);
+            await tx.rollback();
+        }
+    });
+
+    it('should not change the password if it is not a subordinate', async() => {
+        const tx = await models.Worker.beginTransaction({});
+        try {
+            const options = {transaction: tx};
+            await models.Worker.setPassword(ctx, administrativeId, newPass, options);
+            await tx.rollback();
+        } catch (e) {
+            expect(e.message).toEqual(`They're not your subordinate`);
+            await tx.rollback();
+        }
+    });
+
+    it('should throw an error: Password does not meet requirements', async() => {
+        const tx = await models.Worker.beginTransaction({});
+        const newPass = 'Hi';
+        try {
+            const options = {transaction: tx};
+            await models.Worker.setPassword(ctx, employeeId, newPass, options);
             await tx.rollback();
         } catch (e) {
             expect(e.sqlMessage).toEqual('Password does not meet requirements');
             await tx.rollback();
         }
     });
-
-    it('should throw an error: You don\'t have enough privileges.', async() => {
-        ctx.req.accessToken.userId = 5;
-        const tx = await models.Collection.beginTransaction({});
-        try {
-            const options = {transaction: tx};
-            await models.Worker.setPassword(ctx, options);
-            await tx.rollback();
-        } catch (e) {
-            expect(e).toEqual(new UserError(`You don't have enough privileges.`));
-            await tx.rollback();
-        }
-    });
 });
+
+const passHasBeenChanged = async(userId, pass, options) => {
+    const user = await models.VnUser.findById(userId, null, options);
+    return user.hasPassword(pass);
+};

modules/worker/front/descriptor/index.html

@@ -11,8 +11,8 @@
                 ? 'Click to allow the user to be disabled'
                 : 'Click to exclude the user from getting disabled'}}
           </vn-item>
-          <vn-item ng-if="!$ctrl.worker.user.emailVerified" ng-click="setPassword.show()" translate>
-            Change password
+          <vn-item ng-if="!$ctrl.worker.user.emailVerified && $ctrl.vnConfig.storage.currentUserWorkerId !=$ctrl.worker.id" ng-click="setPassword.show()" translate>
+            Change password 
           </vn-item>
     </slot-menu>
     <slot-body>

modules/worker/front/descriptor/index.js

@@ -69,6 +69,7 @@ class Controller extends Descriptor {
                 }
             ]
         };
+
         return this.getData(`Workers/${this.id}`, {filter})
             .then(res => this.entity = res.data);
     }
@@ -86,15 +87,14 @@ class Controller extends Descriptor {
         if (this.newPassword != this.repeatPassword)
             throw new UserError(`Passwords don't match`);
         this.$http.patch(
-            `Workers/${this.entity.id}/setPassword`,
-            {workerFk: this.entity.id, newPass: this.newPassword}
+            `Workers/${this.entity.id}/setPassword`, {newPass: this.newPassword}
         ) .then(() => {
             this.vnApp.showSuccess(this.$translate.instant('Password changed!'));
-        });
+        }).then(() => this.loadData());
     }
 }
 
-Controller.$inject = ['$element', '$scope', '$rootScope'];
+Controller.$inject = ['$element', '$scope', '$rootScope', 'vnConfig'];
 
 ngModule.vnComponent('vnWorkerDescriptor', {
     template: require('./index.html'),

modules/worker/front/descriptor/index.spec.js

@@ -16,6 +16,7 @@ describe('vnWorkerDescriptor', () => {
             const id = 1;
             const response = 'foo';
 
+            $httpBackend.whenGET('UserConfigs/getUserConfig').respond({});
             $httpBackend.expectRoute('GET', `Workers/${id}`).respond(response);
             controller.id = id;
             $httpBackend.flush();

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

@@ -1,6 +1,5 @@
 const models = require('vn-loopback/server/server').models;
 const LoopBackContext = require('loopback-context');
-
 describe('zone toggleIsIncluded()', () => {
     beforeAll(async() => {
         const activeCtx = {
@@ -58,7 +57,7 @@ describe('zone toggleIsIncluded()', () => {
 
             await models.Zone.toggleIsIncluded(1, 20, false, options);
 
-            let result = await models.Zone.toggleIsIncluded(1, 20, undefined, options);
+            const 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"

package.json

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

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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,42 @@
+<!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

@@ -0,0 +1,12 @@
+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}
+    }
+};