From 3fd34e08618fe9ea1b260f8103bddb9b6d9421fd Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 25 Jul 2022 14:49:39 +0200
Subject: [PATCH 01/71] feat(claim_pickup_order): modify email

---
 db/dump/fixtures.sql                          | 256 +++++++++---------
 modules/claim/front/basic-data/index.html     |   4 +-
 modules/claim/front/basic-data/locale/es.yml  |   4 +-
 modules/claim/front/descriptor/index.js       |   5 +-
 modules/claim/front/summary/index.html        |  47 ++--
 .../claim-pickup-order.html                   |   9 +-
 .../claim-pickup-order/claim-pickup-order.js  |  12 +
 .../email/claim-pickup-order/locale/es.yml    |  13 +-
 .../claim-pickup-order.html                   |   9 +-
 .../claim-pickup-order/claim-pickup-order.js  |   4 -
 .../reports/claim-pickup-order/locale/es.yml  |   4 -
 .../claim-pickup-order/sql/claimConfig.sql    |   2 -
 12 files changed, 192 insertions(+), 177 deletions(-)
 delete mode 100644 print/templates/reports/claim-pickup-order/sql/claimConfig.sql

diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 0609a6a6ab..746e77ffd7 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -1,7 +1,7 @@
 CREATE SCHEMA IF NOT EXISTS `vn2008`;
 CREATE SCHEMA IF NOT EXISTS `tmp`;
 
-UPDATE `util`.`config` 
+UPDATE `util`.`config`
     SET `environment`= 'test';
 
 ALTER TABLE `vn`.`itemTaxCountry` AUTO_INCREMENT = 1;
@@ -9,11 +9,11 @@ ALTER TABLE `vn`.`address` AUTO_INCREMENT = 1;
 ALTER TABLE `vn`.`zoneGeo` AUTO_INCREMENT = 1;
 ALTER TABLE `vn`.`ticket` AUTO_INCREMENT = 1;
 
-INSERT INTO `salix`.`AccessToken` (`id`, `ttl`, `created`, `userId`) 
-    VALUES 
+INSERT INTO `salix`.`AccessToken` (`id`, `ttl`, `created`, `userId`)
+    VALUES
         ('DEFAULT_TOKEN', '1209600', util.VN_CURDATE(), 66);
 
-INSERT INTO `vn`.`ticketConfig` (`id`, `scopeDays`) 
+INSERT INTO `vn`.`ticketConfig` (`id`, `scopeDays`)
     VALUES
         ('1', '6');
 
@@ -22,11 +22,11 @@ INSERT INTO `vn`.`bionicConfig` (`generalInflationCoeficient`, `minimumDensityVo
         (1.30, 167.00, 138000, 71);
 
 INSERT INTO `vn`.`chatConfig` (`host`, `api`)
-    VALUES    
+    VALUES
         ('https://chat.verdnatura.es', 'https://chat.verdnatura.es/api/v1');
 
-INSERT IGNORE INTO `vn`.`greugeConfig`(`id`, `freightPickUpPrice`) 
-    VALUES 
+INSERT IGNORE INTO `vn`.`greugeConfig`(`id`, `freightPickUpPrice`)
+    VALUES
         ('1', '11');
 
 INSERT INTO `vn`.`packagingConfig`(`upperGap`)
@@ -52,11 +52,11 @@ INSERT INTO `account`.`account`(`id`)
 INSERT INTO `vn`.`educationLevel` (`id`, `name`)
 	VALUES
 		(1, 'ESTUDIOS PRIMARIOS COMPLETOS'),
-		(2, 'ENSEÑANZAS DE BACHILLERATO');    
+		(2, 'ENSEÑANZAS DE BACHILLERATO');
 
 INSERT INTO `vn`.`worker`(`id`,`code`, `firstName`, `lastName`, `userFk`, `bossFk`)
     SELECT id,UPPER(LPAD(role, 3, '0')), name, name, id, 9
-        FROM `vn`.`user`;      
+        FROM `vn`.`user`;
 
 UPDATE `vn`.`worker` SET bossFk = NULL WHERE id = 20;
 UPDATE `vn`.`worker` SET bossFk = 20 WHERE id = 1 OR id = 9;
@@ -69,7 +69,7 @@ INSERT INTO `hedera`.`tpvConfig`(`id`, `currency`, `terminal`, `transactionType`
         (1,	978, 1, 0, 2000, 9, 0);
 
 INSERT INTO `account`.`user`(`id`,`name`,`nickname`, `password`,`role`,`active`,`email`,`lang`, `image`)
-    VALUES 
+    VALUES
         (1101, 'BruceWayne',         'Bruce Wayne',          'ac754a330530832ba1bf7687f577da91', 2, 1, 'BruceWayne@mydomain.com',         'es', 'e7723f0b24ff05b32ed09d95196f2f29'),
         (1102, 'PetterParker',       'Petter Parker',        'ac754a330530832ba1bf7687f577da91', 2, 1, 'PetterParker@mydomain.com',       'en', 'e7723f0b24ff05b32ed09d95196f2f29'),
         (1103, 'ClarkKent',          'Clark Kent',           'ac754a330530832ba1bf7687f577da91', 2, 1, 'ClarkKent@mydomain.com',          'fr', 'e7723f0b24ff05b32ed09d95196f2f29'),
@@ -113,7 +113,7 @@ INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`, `userFk`,`bossF
         (1107, 'ANT', 'Hank'         , 'Pym'   , 1107, 19, 432978107, NULL, 1),
         (1108, 'DCX', 'Charles'      , 'Xavier', 1108, 19, 432978108, 1,    NULL),
         (1109, 'HLK', 'Bruce'        , 'Banner', 1109, 19, 432978109, 1,    2),
-        (1110, 'JJJ', 'Jessica'      , 'Jones' , 1110, 19, 432978110, 2,    1); 
+        (1110, 'JJJ', 'Jessica'      , 'Jones' , 1110, 19, 432978110, 2,    1);
 
 INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`)
     VALUES
@@ -123,7 +123,7 @@ INSERT INTO `vn`.`currency`(`id`, `code`, `name`, `ratio`)
         (4, 'JPY', 'Yen Japones',   1);
 
 INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`, `politicalCountryFk`, `ibanLength`, `continentFk`, `hasDailyInvoice`, `CEE`)
-    VALUES 
+    VALUES
         (1, 'España',   1, 'ES', 1, 1,  24, 4, 0, 1),
         (2, 'Italia',   1, 'IT', 1, 2,  27, 4, 0, 1),
         (3, 'Alemania', 1, 'DE', 1, 3,  22, 4, 0, 1),
@@ -153,19 +153,19 @@ INSERT INTO `vn`.`sector`(`id`, `description`, `warehouseFk`, `isPreviousPrepare
         (1, 'First sector',     1, 1, 'FIRST'),
         (2, 'Second sector',    2, 0, 'SECOND');
 
-INSERT INTO `vn`.`parking` (`id`, `column`, `row`, `sectorFk`, `code`, `pickingOrder`) 
-    VALUES 
+INSERT INTO `vn`.`parking` (`id`, `column`, `row`, `sectorFk`, `code`, `pickingOrder`)
+    VALUES
         ('1', '700', '01', '1', '700-01', '70001'),
         ('2', '700', '02', '2', '700-02', '70002');
 
-INSERT INTO `vn`.`shelving` (`code`, `parkingFk`, `isPrinted`, `priority`, `parked`, `userFk`) 
-    VALUES 
+INSERT INTO `vn`.`shelving` (`code`, `parkingFk`, `isPrinted`, `priority`, `parked`, `userFk`)
+    VALUES
         ('GVC', 1, 0, 1, 0, 1106),
         ('HEJ', 2, 0, 1, 0, 1106),
         ('UXN', 1, 0, 1, 0, 1106);
 
 INSERT INTO `vn`.`accountingType`(`id`, `description`, `receiptDescription`,`code`, `maxAmount`, `daysInFuture`)
-    VALUES 
+    VALUES
         (1,     'CC and credit policies',   'Transfers',        'wireTransfer', NULL, 1),
         (2,     'Cash',                     'Cash',             'cash',         1000, 0),
         (3,     'Credit card',              'Credit Card',      'creditCard',   NULL, 0),
@@ -180,8 +180,8 @@ INSERT INTO `vn`.`bankEntity`(`id`, `countryFk`, `name`, `bic`)
         (128,  1, 'The Best Bank', 'BBKKESMMMMMM'),
         (2100, 1, 'Caixa Bank',    'CAIXESBB');
 
-INSERT INTO `vn`.`bank`(`id`, `bank`, `account`, `cash`, `entityFk`, `isActive`, `currencyFk`) 
-    VALUES 
+INSERT INTO `vn`.`bank`(`id`, `bank`, `account`, `cash`, `entityFk`, `isActive`, `currencyFk`)
+    VALUES
         (1,     'Pay on receipt',           '5720000001', 3, 128,     1, 1),
         (2,     'Cash',                     '5700000001', 2, 128,     1, 1),
         (3,     'Compensation',             '4000000000', 8, 128,     1, 1),
@@ -235,7 +235,7 @@ UPDATE `vn`.`agencyMode` SET `web` = 1, `reportMail` = 'no-reply@gothamcity.com'
 UPDATE `vn`.`agencyMode` SET `code` = 'refund' WHERE  `id` = 23;
 
 INSERT INTO `vn`.`payMethod`(`id`,`code`,  `name`, `graceDays`, `outstandingDebt`, `isIbanRequiredForClients`, `isIbanRequiredForSuppliers`, `hasVerified`)
-    VALUES 
+    VALUES
         (1, NULL,           'PayMethod one',            0,  001,    0, 0, 0),
         (2, NULL,           'PayMethod two',            10, 001,    0, 0, 1),
         (3, 'compensation', 'PayMethod three',          0,  001,    0, 0, 0),
@@ -244,7 +244,7 @@ INSERT INTO `vn`.`payMethod`(`id`,`code`,  `name`, `graceDays`, `outstandingDebt
         (8,'wireTransfer',  'WireTransfer',             5,  001,    1, 1, 0);
 
 INSERT INTO `vn`.`payDem`(`id`, `payDem`)
-    VALUES 
+    VALUES
         (1, 10),
         (2, 20);
 
@@ -273,7 +273,7 @@ INSERT INTO `vn`.`town`(`id`, `name`, `provinceFk`)
         (5, 'Quito',        5);
 
 INSERT INTO `vn`.`postCode`(`code`, `townFk`, `geoFk`)
-    VALUES 
+    VALUES
         ('46000', 1, 6),
         ('46460', 2, 6),
         ('46680', 3, 6),
@@ -481,7 +481,7 @@ INSERT INTO `vn`.`supplierActivity`(`code`, `name`)
         ('complements',  'Other complements'),
         ('flowerPlants',  'Wholesale of flowers and plants'),
         ('vegetablesFruits', 'Fruit and vegetable trade');
-        
+
 INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`, `healthRegister`)
     VALUES
         (1,   'Plants SL',             'Plants nick',   4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, 4,  1, 1, 18, 'flowerPlants',  1, '400664487V'),
@@ -498,7 +498,7 @@ INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`,
         (442 , 'VNL', 241,  30,  2   , 1, NULL,         2, 'VNL Company - Plant passport'),
         (567 , 'VNH', NULL, 30,  NULL, 4, NULL,         1, 'VNH Company - Plant passport'),
         (791 , 'FTH', NULL, 30,  NULL, 3, '2015-11-30', 1, NULL),
-        (1381, 'ORN', NULL, 30,  NULL, 7, NULL,         1, 'ORN Company - Plant passport');  
+        (1381, 'ORN', NULL, 30,  NULL, 7, NULL,         1, 'ORN Company - Plant passport');
 
 INSERT INTO `vn`.`taxArea` (`code`, `claveOperacionFactura`, `CodigoTransaccion`)
     VALUES
@@ -519,7 +519,7 @@ INSERT INTO `vn`.`invoiceOutSerial` (`code`, `description`, `isTaxed`, `taxAreaF
 INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`)
     VALUES
         (1, 'T', 1014.24,   util.VN_CURDATE(),                              1101, util.VN_CURDATE(),                              442, util.VN_CURDATE(),                              util.VN_CURDATE(), 1, 0),
-        (2, 'T', 121.36,    util.VN_CURDATE(),                              1102, util.VN_CURDATE(),                              442, util.VN_CURDATE(),                              util.VN_CURDATE(), 1, 0), 
+        (2, 'T', 121.36,    util.VN_CURDATE(),                              1102, util.VN_CURDATE(),                              442, util.VN_CURDATE(),                              util.VN_CURDATE(), 1, 0),
         (3, 'T', 8.88,      util.VN_CURDATE(),                              1103, util.VN_CURDATE(),                              442, util.VN_CURDATE(),                              util.VN_CURDATE(), 1, 0),
         (4, 'T', 8.88,      util.VN_CURDATE(),                              1103, util.VN_CURDATE(),                              442, util.VN_CURDATE(),                              util.VN_CURDATE(), 1, 0),
         (5, 'A', 8.88,      DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1103, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 442, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 0);
@@ -531,7 +531,7 @@ UPDATE `vn`.`invoiceOut` SET ref = 'T4444444' WHERE id = 4;
 UPDATE `vn`.`invoiceOut` SET ref = 'A1111111' WHERE id = 5;
 
 INSERT INTO `vn`.`invoiceOutTax` (`invoiceOutFk`, `taxableBase`, `vat`, `pgcFk`)
-    VALUES 
+    VALUES
         (1, 895.76, 89.58,  4722000010),
         (1, 33.80,  7.10,   4722000021),
         (2, 110.33, 11.03,  4770000010),
@@ -552,7 +552,7 @@ INSERT INTO `vn`.`expence`(`id`, `taxTypeFk`, `name`, `isWithheld`)
         (7001000000, 1, 'Mercaderia',                       0),
         (7050000000, 1, 'Prestacion de servicios',          1);
 
-        
+
 INSERT INTO `vn`.`invoiceOutExpence`(`id`, `invoiceOutFk`, `amount`, `expenceFk`, `created`)
     VALUES
         (1, 1, 813.06,  2000000000, util.VN_CURDATE()),
@@ -564,7 +564,7 @@ INSERT INTO `vn`.`invoiceOutExpence`(`id`, `invoiceOutFk`, `amount`, `expenceFk`
         (7, 5, 8.07,    2000000000, util.VN_CURDATE());
 
 INSERT INTO `vn`.`zone` (`id`, `name`, `hour`, `agencyModeFk`, `travelingDays`, `price`, `bonus`, `itemMaxSize`)
-    VALUES 
+    VALUES
         (1,  'Zone pickup A',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 0,    0, 100),
         (2,  'Zone pickup B',       CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1,  0, 0,    0, 100),
         (3,  'Zone 247 A',          CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 7,  1, 2,    0, 100),
@@ -580,7 +580,7 @@ INSERT INTO `vn`.`zone` (`id`, `name`, `hour`, `agencyModeFk`, `travelingDays`,
         (13, 'Zone quantum break',  CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 5,  0, 0,    0, 100);
 
 INSERT INTO `vn`.`zoneWarehouse` (`id`, `zoneFk`, `warehouseFk`)
-    VALUES 
+    VALUES
         (1, 1, 1),
         (2, 2, 2),
         (3, 3, 1),
@@ -596,7 +596,7 @@ INSERT INTO `vn`.`zoneWarehouse` (`id`, `zoneFk`, `warehouseFk`)
         (13, 13, 5);
 
 INSERT INTO `vn`.`zoneClosure` (`zoneFk`, `dated`, `hour`)
-    VALUES 
+    VALUES
         (1,     util.VN_CURDATE(), '23:59'),
         (2,     util.VN_CURDATE(), '23:59'),
         (3,     util.VN_CURDATE(), '23:59'),
@@ -668,7 +668,7 @@ INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `des
         (11, 24, 4, 'Reclama ticket: 7'),
         (12, 11, 3, 'Delivery after 10am');
 
--- FIX for state hours on local, inter_afterInsert 
+-- FIX for state hours on local, inter_afterInsert
 UPDATE vncontrol.inter SET odbc_date = DATE_ADD(util.VN_CURDATE(), INTERVAL -10 SECOND);
 
 INSERT INTO `vn`.`ticketTracking`(`ticketFk`, `stateFk`, `workerFk`, `created`)
@@ -764,7 +764,7 @@ INSERT INTO `vn`.`itemCategory`(`id`, `name`, `display`, `color`, `icon`, `code`
 INSERT INTO `vn`.`temperature`(`code`, `name`, `description`)
     VALUES
         ('warm', 'Warm', 'Warm'),
-        ('cool', 'Cool', 'Cool');        
+        ('cool', 'Cool', 'Cool');
 
 INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `warehouseFk`, `life`,`workerFk`, `isPackaging`, `temperatureFk`)
     VALUES
@@ -818,7 +818,7 @@ INSERT INTO `vn`.`taxClassCode`(`taxClassFk`, `effectived`, `taxCodeFk`)
         (1, util.VN_CURDATE(), 1),
         (1, util.VN_CURDATE(), 21),
         (2, util.VN_CURDATE(), 2);
-      
+
 INSERT INTO `vn`.`intrastat`(`id`, `description`, `taxClassFk`, `taxCodeFk`)
     VALUES
         (05080000, 'Coral y materiales similares',        2, 2),
@@ -830,7 +830,7 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`)
         ('SER', 'Services'),
         ('VT',  'Sales');
 
-INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenceFk`, 
+INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenceFk`,
     `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`, `isFloramondo`, `genericFk`, `itemPackingTypeFk`, `hasMinPrice`, `packingShelve`)
     VALUES
         (1,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 1, 'VT',   0,  NULL,   'V',  0, 15),
@@ -966,7 +966,7 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
         (3,     39, 0.994),
         (4,     28, 1.25),
         (4,     29, 0.42),
-        (4,     39, 0.017),     
+        (4,     39, 0.017),
         (5,     17, 9.94),
         (5,     28, 50),
         (5,     29, 49.4),
@@ -988,8 +988,8 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
         (9,     15, 3.0949),
         (9,     21, 0.001),
         (9,     28, 53),
-        (9,     29, 46.4), 
-        (9,     39, 0.994), 
+        (9,     29, 46.4),
+        (9,     39, 0.994),
         (10,    15, 0.0199),
         (10,    28, 7),
         (10,    29, 0),
@@ -1088,14 +1088,14 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
         (32,    36, -92.324),
         (32,    39, 0.994);
 
-INSERT INTO `vn`.`itemShelving` (`itemFk`, `shelvingFk`, `shelve`, `visible`, `grouping`, `packing`, `userFk`) 
-    VALUES 
+INSERT INTO `vn`.`itemShelving` (`itemFk`, `shelvingFk`, `shelve`, `visible`, `grouping`, `packing`, `userFk`)
+    VALUES
         (2, 'GVC', 'A', 1, 1, 1, 1106),
         (4, 'HEJ', 'A', 1, 1, 1, 1106),
         (1, 'UXN', 'A', 2, 12, 12, 1106);
 
-INSERT INTO `vn`.`itemShelvingSale` (`itemShelvingFk`, `saleFk`, `quantity`, `created`, `userFk`) 
-    VALUES 
+INSERT INTO `vn`.`itemShelvingSale` (`itemShelvingFk`, `saleFk`, `quantity`, `created`, `userFk`)
+    VALUES
         ('1', '1', '1', '', '1106'),
         ('2', '2', '5', '', '1106'),
         ('1', '7', '1', '', '1106'),
@@ -1137,8 +1137,8 @@ INSERT INTO `vn`.`ticketCollection`(`ticketFk`, `collectionFk`, `level`)
         (3, 2, NULL),
         (23, 1, NULL);
 
-INSERT INTO `vn`.`parking` (`column`, `row`, `sectorFk`, `code`, `pickingOrder`) 
-    VALUES 
+INSERT INTO `vn`.`parking` (`column`, `row`, `sectorFk`, `code`, `pickingOrder`)
+    VALUES
         ('100', '01', 1, '100-01', 1);
 
 INSERT INTO `vn`.`genus`(`id`, `name`)
@@ -1292,7 +1292,7 @@ INSERT INTO `vn`.`itemTypeTag`(`id`, `itemTypeFk`, `tagFk`, `priority`)
 CALL `vn`.`itemRefreshTags`(NULL);
 
 INSERT INTO `vn`.`itemLog` (`id`, `originFk`, `userFk`, `action`, `description`)
-    VALUES 
+    VALUES
         ('1', '1', '1', 'insert', 'We made a change!');
 
 INSERT INTO `vn`.`recovery`(`id`, `clientFk`, `started`, `finished`, `amount`, `period`)
@@ -1484,8 +1484,8 @@ INSERT INTO `hedera`.`orderRowComponent`(`rowFk`, `componentFk`, `price`)
         (4,     21, -0.001),
         (4,     28, 20.72),
         (4,     29, -19.72),
-        (4,     37, 2),  
-        (4,     39, 0.01),  
+        (4,     37, 2),
+        (4,     39, 0.01),
         (5,     15, 0.58),
         (5,     23, 6.5),
         (5,     28, 20.72),
@@ -1704,7 +1704,7 @@ INSERT INTO `vn`.`workerManaExcluded`(`workerFk`)
  La otra manera es poner el calculo con los 2 trabajadores que utilizamos ahora mismo para los tickets
 */
 
-call vn.manaSpellersRequery(19);  
+call vn.manaSpellersRequery(19);
 call vn.manaSpellersRequery(18);
 
 INSERT INTO `vn`.`clientSample`(`id`, `clientFk`, `typeFk`, `created`, `workerFk`, `userFk`, `companyFk`)
@@ -1772,8 +1772,8 @@ INSERT INTO `hedera`.`tpvMerchant`(`id`, `description`, `companyFk`, `bankFk`, `
         (1, 'Arkham Bank',  442, 1, 'h12387193H10238'),
         (2, 'NewYork Bank', 442, 1, '7981ugsgd1hsdad');
 
-INSERT INTO `hedera`.`tpvTransaction`(`id`,`merchantFk`, `clientFk`,`receiptFk`, `amount`, `response`, `errorCode`, `status`, `created`) 
-    VALUES 
+INSERT INTO `hedera`.`tpvTransaction`(`id`,`merchantFk`, `clientFk`,`receiptFk`, `amount`, `response`, `errorCode`, `status`, `created`)
+    VALUES
         (1, 1, 1101, NULL, 2000, NULL, 'SIS0042',    'ok',       util.VN_CURDATE()),
         (2, 1, 1101, NULL, 1000, NULL, 'SIS0051',    'started',  util.VN_CURDATE()),
         (3, 2, 1101, NULL, 7268, NULL, NULL,         'ok',       util.VN_CURDATE()),
@@ -1787,32 +1787,32 @@ INSERT INTO `vn`.`orderTicket`(`orderFk`, `ticketFk`)
         (2,  2),
         (3,  3),
         (4,  4),
-        (5,  5), 
-        (6,  6), 
-        (7,  7), 
-        (8,  8), 
-        (9,  9), 
-        (10, 10), 
-        (11, 11), 
-        (12, 12), 
-        (13, 13), 
-        (14, 14), 
+        (5,  5),
+        (6,  6),
+        (7,  7),
+        (8,  8),
+        (9,  9),
+        (10, 10),
+        (11, 11),
+        (12, 12),
+        (13, 13),
+        (14, 14),
         (15, 15),
         (16, 16),
         (17, 17),
         (18, 18),
         (19, 19),
-        (20, 20), 
-        (21, 21), 
+        (20, 20),
+        (21, 21),
         (22, 22);
 
-INSERT INTO `vn`.`userConfig` (`userFk`, `warehouseFk`, `companyFk`) 
+INSERT INTO `vn`.`userConfig` (`userFk`, `warehouseFk`, `companyFk`)
     VALUES
         (1,  1, 69),
-        (5,  1, 442), 
+        (5,  1, 442),
         (9,  1, 442),
         (18, 3, 567);
- 
+
 INSERT INTO `vn`.`receipt`(`id`, `invoiceFk`, `amountPaid`, `payed`, `workerFk`, `bankFk`, `clientFk`, `created`, `companyFk`, `isConciliate`)
     VALUES
         (1, 'Cobro web',            100.50, util.VN_CURDATE(),                             9, 1, 1101, util.VN_CURDATE(),                             442, 1),
@@ -1895,14 +1895,14 @@ INSERT INTO `postgresql`.`business_labour` (`business_id`, `notes`, `department_
     VALUES
         (1111, NULL, 23, 1, 0.0, 1, 1, 1, 1);
 
-UPDATE `postgresql`.`business_labour` bl 
+UPDATE `postgresql`.`business_labour` bl
     JOIN `postgresql`.`business` b ON b.business_id = bl.business_id
     JOIN `postgresql`.`profile` pr ON pr.profile_id = b.client_id
     JOIN `postgresql`.`person` p ON p.person_id = pr.person_id
     SET bl.`professional_category_id` = 31
     WHERE p.`Id_trabajador` = 1110;
 
-UPDATE `postgresql`.`business_labour` bl 
+UPDATE `postgresql`.`business_labour` bl
     SET bl.`department_id` = 43
 WHERE business_id IN(18, 19);
 
@@ -1917,18 +1917,18 @@ INSERT INTO `postgresql`.`profile_media`(`profile_media_id`, `profile_id`, `medi
         (2, 1107, 2);
 
 INSERT INTO `vn`.`workCenterHoliday` (`workCenterFk`, `days`, `year`)
-    VALUES 
+    VALUES
         ('1', '27.5', YEAR(util.VN_CURDATE())),
         ('5', '22', YEAR(util.VN_CURDATE())),
-        ('1', '24.5', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR))), 
+        ('1', '24.5', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR))),
         ('5', '23', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)));
 
-INSERT INTO `vn`.`absenceType` (`id`, `name`, `rgb`, `code`, `holidayEntitlementRate`, `discountRate`) 
-    VALUES 
+INSERT INTO `vn`.`absenceType` (`id`, `name`, `rgb`, `code`, `holidayEntitlementRate`, `discountRate`)
+    VALUES
         (1,  'Holidays',            '#FF4444', 'holiday',       0,      0),
         (2,  'Leave of absence',    '#C71585', 'absence',       0,      1),
         (6,  'Half holiday',        '#E65F00', 'halfHoliday',   0,      0.5),
-        (15, 'Half Paid Leave',     '#5151c0', 'halfPaidLeave', 0,      1),        
+        (15, 'Half Paid Leave',     '#5151c0', 'halfPaidLeave', 0,      1),
         (20, 'Furlough',            '#97B92F', 'furlough',      1,      1),
         (21, 'Furlough half day',   '#778899', 'halfFurlough',  0.5,    1);
 
@@ -1945,10 +1945,10 @@ INSERT INTO `postgresql`.`business_labour_payroll` (`business_id`, `cod_tarifa`,
         (1, 7, 12, 100, 900.50),
         (1106, 7, 12, 100, 1263.03),
         (1107, 7, 12, 100, 2000),
-        (1108, 7, 12, 100, 1500);       
+        (1108, 7, 12, 100, 1500);
 
-INSERT INTO `postgresql`.`calendar_employee` (`business_id`, `calendar_state_id`, `date`) 
-    VALUES 
+INSERT INTO `postgresql`.`calendar_employee` (`business_id`, `calendar_state_id`, `date`)
+    VALUES
         (1,    6, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 10 DAY))),
         (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 10 DAY))),
         (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -11 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 11 DAY))),
@@ -1966,8 +1966,8 @@ INSERT INTO `postgresql`.`calendar_employee` (`business_id`, `calendar_state_id`
         (1107, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 7  DAY))),
         (1107, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL - 16 DAY));
 
-INSERT INTO `vn`.`smsConfig` (`id`, `uri`, `title`, `apiKey`) 
-    VALUES 
+INSERT INTO `vn`.`smsConfig` (`id`, `uri`, `title`, `apiKey`)
+    VALUES
         ('1', 'https://api.gateway360.com/api/3.0/sms/send', 'Verdnatura', '5715476da95b46d686a5a255e6459523');
 
 INSERT INTO `vn`.`sharingClient`(`id`, `workerFk`, `started`, `ended`, `clientFk`)
@@ -1983,37 +1983,37 @@ CALL `vn`.zoneGeo_calcTree(); -- this is an auto calculate for table vn.zoneGeo,
 
 INSERT INTO `vn`.`zoneIncluded` (`zoneFk`, `geoFk`, `isIncluded`)
     VALUES
-        (1, 3,   0), 
-        (1, 4,   0), 
-        (1, 5,   0), 
+        (1, 3,   0),
+        (1, 4,   0),
+        (1, 5,   0),
         (1, 1,   1),
-        (2, 3,   0), 
-        (2, 4,   0), 
-        (2, 5,   0), 
+        (2, 3,   0),
+        (2, 4,   0),
+        (2, 5,   0),
         (2, 1,   1),
-        (3, 3,   0), 
-        (3, 4,   0), 
-        (3, 5,   0),  
+        (3, 3,   0),
+        (3, 4,   0),
+        (3, 5,   0),
         (3, 1,   1),
-        (4, 3,   0), 
-        (4, 4,   0), 
-        (4, 5,   0),  
+        (4, 3,   0),
+        (4, 4,   0),
+        (4, 5,   0),
         (4, 1,   1),
-        (5, 3,   1), 
-        (5, 4,   0), 
-        (5, 5,   1), 
+        (5, 3,   1),
+        (5, 4,   0),
+        (5, 5,   1),
         (5, 1,   1),
-        (6, 3,   1), 
-        (6, 4,   0), 
-        (6, 5,   1), 
+        (6, 3,   1),
+        (6, 4,   0),
+        (6, 5,   1),
         (6, 1,   1),
-        (7, 3,   0), 
-        (7, 4,   0), 
-        (7, 5,   0), 
+        (7, 3,   0),
+        (7, 4,   0),
+        (7, 5,   0),
         (7, 1,   1),
-        (8, 3,   0), 
-        (8, 4,   0), 
-        (8, 5,   0), 
+        (8, 3,   0),
+        (8, 4,   0),
+        (8, 5,   0),
         (8, 1,   1),
         (10, 14, 1);
 
@@ -2226,12 +2226,12 @@ INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `dated`)
         (7, 'day', DATE_ADD(util.VN_CURDATE(), INTERVAL +6 DAY));
 
 INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `weekDays`)
-    VALUES 
+    VALUES
         (8, 'indefinitely', 'mon,tue,wed,thu,fri,sat,sun'),
         (10, 'indefinitely', 'mon,tue,wed,thu,fri,sat,sun');
 
 INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `started`, `ended`)
-    VALUES 
+    VALUES
         (9, 'range', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR));
 
 INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`)
@@ -2294,8 +2294,8 @@ INSERT INTO `vn`.`workerDocument`(`id`, `worker`, `document`,`isReadableByWorker
         (1, 1106, 4, TRUE),
         (2, 1107, 3, FALSE);
 
-INSERT INTO `vn`.`device` (`sn`, `model`, `userFk`) 
-    VALUES 
+INSERT INTO `vn`.`device` (`sn`, `model`, `userFk`)
+    VALUES
         ('aaa', 'android', '9');
 
 INSERT INTO `vn`.`queuePriority`(`id`, `priority`)
@@ -2309,7 +2309,7 @@ INSERT INTO `vn`.`workerTimeControlParams` (`id`, `dayBreak`, `weekBreak`, `week
         (1, 43200, 129600, 734400, 43200, 50400, 259200, 1296000, 36000);
 
 INSERT IGNORE INTO `vn`.`greugeConfig` (`id`, `freightPickUpPrice`) VALUES ('1', '11');
-        
+
 INSERT INTO `vn`.`thermograph`(`id`, `model`)
     VALUES
         ('TMM190901395',    'TEMPMATE'),
@@ -2327,21 +2327,21 @@ INSERT INTO `vn`.`travelThermograph`(`thermographFk`, `created`, `warehouseFk`,
         ('138350-0',        DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1,       'WARM', NULL,                           5),
         ('138350-0',        util.VN_CURDATE(),                              1, NULL,    'COOL', NULL,                           NULL);
 
-REPLACE INTO `vn`.`incoterms`(`code`, `name`) 
-    VALUES 
+REPLACE INTO `vn`.`incoterms`(`code`, `name`)
+    VALUES
         ('FAS', 'Free Alongside Ship');
 
-REPLACE INTO `vn`.`customsAgent`(`id`, `fiscalName`, `street`, `nif`, `phone`, `email`) 
-    VALUES 
+REPLACE INTO `vn`.`customsAgent`(`id`, `fiscalName`, `street`, `nif`, `phone`, `email`)
+    VALUES
         (1, 'Agent one', '1007 Mountain Drive, Gotham', 'N1111111111', '111111111', 'agentone@gotham.com'),
         (2, 'Agent two', '1007 Mountain Drive, Gotham', 'N2222222222', '222222222', 'agenttwo@gotham.com');
 
-INSERT INTO `vn`.`tablet`(`uuid`, `name`, `place`, `macwifi`) 
-    VALUES 
+INSERT INTO `vn`.`tablet`(`uuid`, `name`, `place`, `macwifi`)
+    VALUES
         ('1', 'TEST', 'ON THE FIXTURES', '0'),
         ('2', 'DEV', 'OTHER TABLET', '0');
 
-INSERT INTO `vn`.`tabletDepartment`(`tabletFk`, `departmentFk`) 
+INSERT INTO `vn`.`tabletDepartment`(`tabletFk`, `departmentFk`)
     VALUES
         (1, 23),
         (2, 1);
@@ -2374,8 +2374,8 @@ INSERT INTO `vn`.`rate`(`dated`, `warehouseFk`, `rate0`, `rate1`, `rate2`, `rate
         (DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), 1, 10, 15, 20, 25),
         (util.VN_CURDATE(), 1, 12, 17, 22, 27);
 
-INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk, taxFk) 
-    VALUES 
+INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk, taxFk)
+    VALUES
         (1,     '07546501420', 67,  671,    util.VN_CURDATE(),  1761, 1, 1),
         (2,     '07546491421', 252, 2769,   util.VN_CURDATE(),  5231, 1, 1),
         (3,     '07546500823', 102, 1495,   util.VN_CURDATE(),  3221, 1, 1),
@@ -2387,8 +2387,8 @@ INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk
         (9,     '99610289193', 302, 2972,   util.VN_CURDATE(),  3871, 442, 1),
         (10,    '07546500856', 185, 2364,   util.VN_CURDATE(),  5321, 442, 1);
 
-INSERT INTO `vn`.`dua` (id, code, awbFk, issued, operated, booked, bookEntried, gestdocFk, customsValue, companyFk) 
-    VALUES 
+INSERT INTO `vn`.`dua` (id, code, awbFk, issued, operated, booked, bookEntried, gestdocFk, customsValue, companyFk)
+    VALUES
         (1,  '19ES0028013A481523', 1,  util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 11276.95,   442),
         (2,  '21ES00280136115760', 2,  util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 1376.20,    442),
         (3,  '19ES00280131956004', 3,  util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 3, 14268.50,   442),
@@ -2435,8 +2435,8 @@ INSERT INTO `vn`.`duaInvoiceIn`(`id`, `duaFk`, `invoiceInFk`)
         (4,  4,  4),
         (5,  5,  5),
         (6,  6,  6),
-        (7,  7,  7),	
-        (8,  8,  8),	
+        (7,  7,  7),
+        (8,  8,  8),
         (9,  9,  9),
         (10, 10, 10);
 
@@ -2446,7 +2446,7 @@ INSERT INTO `vn`.`invoiceInTax` (`invoiceInFk`, `taxableBase`, `expenceFk`, `for
         (2, 999.99, '2000000000', null, null, null),
         (3, 1000.50, '2000000000', null, null, null),
         (4, 0.50, '2000000000', null, null, null),
-        (5, 150.50, '2000000000', null, null, null),    
+        (5, 150.50, '2000000000', null, null, null),
         (1, 252.25, '4751000000', NULL, 7, 61),
         (2, 223.17, '6210000567', NULL, 8, 20),
         (3, 95.60,  '7001000000', NULL, 8, 35),
@@ -2461,9 +2461,9 @@ INSERT INTO `vn`.`invoiceInIntrastat` (`invoiceInFk`, `net`, `intrastatFk`, `amo
         (1, 10,    6021010, 20.00, 205, 5),
         (2, 13.20, 5080000, 15.00, 580, 5),
         (2, 16.10, 6021010, 25.00, 80,  5);
-   
+
 INSERT INTO `vn`.`ticketRecalc`(`ticketFk`)
-    SELECT `id` 
+    SELECT `id`
         FROM `vn`.`ticket` t
             LEFT JOIN vn.ticketRecalc tr ON tr.ticketFk = t.id
         WHERE tr.ticketFk IS NULL;
@@ -2478,7 +2478,7 @@ INSERT INTO `vn`.`zoneAgencyMode`(`id`, `agencyModeFk`, `zoneFk`)
         (4,  7,  1);
 
 INSERT INTO `vn`.`expeditionTruck` (`id`, `ETD`, `description`)
-    VALUES 
+    VALUES
         (1, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL +3 YEAR))), 'Best truck in fleet');
 
 INSERT INTO `vn`.`expeditionPallet` (`id`, `truckFk`, `built`, `position`, `isPrint`)
@@ -2486,7 +2486,7 @@ INSERT INTO `vn`.`expeditionPallet` (`id`, `truckFk`, `built`, `position`, `isPr
         (1, 1, util.VN_CURDATE(), 1, 1);
 
 INSERT INTO `vn`.`expeditionScan` (`id`, `expeditionFk`, `scanned`, `palletFk`)
-    VALUES 
+    VALUES
         (1,     1,  util.VN_CURDATE(), 1),
         (2,     2,  util.VN_CURDATE(), 1),
         (3,     3,  util.VN_CURDATE(), 1),
@@ -2521,7 +2521,7 @@ UPDATE `vn`.`route`
 INSERT INTO `bs`.`salesPerson` (`workerFk`, `year`, `month`, `portfolioWeight`)
     VALUES
         (18,     YEAR(util.VN_CURDATE()),    MONTH(util.VN_CURDATE()),  807.23),
-        (19,     YEAR(util.VN_CURDATE()),    MONTH(util.VN_CURDATE()),  34.40);      
+        (19,     YEAR(util.VN_CURDATE()),    MONTH(util.VN_CURDATE()),  34.40);
 
 INSERT INTO `bs`.`sale` (`saleFk`, `amount`, `dated`,  `typeFk`, `clientFk`)
     VALUES
@@ -2550,14 +2550,14 @@ INSERT INTO `vn`.`calendarHolidaysType` (`id`, `name`, `hexColour`)
 INSERT INTO `vn`.`calendarHolidays` (`id`, `calendarHolidaysTypeFk`, `dated`, `calendarHolidaysNameFk`, `workCenterFk`)
     VALUES
         (1,     1,  CONCAT(YEAR(util.VN_CURDATE()), '-12-09'),      1,      1);
-        
+
 INSERT INTO `vn`.`supplierAgencyTerm` (`agencyFk`, `supplierFk`, `minimumPackages`, `kmPrice`, `packagePrice`, `routePrice`, `minimumKm`, `minimumM3`, `m3Price`)
     VALUES
         (1, 1,   0,  0.00,  0.00,   NULL, 0,  0.00, 23),
         (2, 1,   60, 0.00,  0.00,   NULL, 0,  5.00, 33),
         (3, 2,   0,  15.00, 0.00,   NULL, 0,  0.00, 0),
         (4, 2,   0,  20.00, 0.00,   NULL, 0,  0.00, 0),
-        (5, 442, 0,  0.00, 3.05,    NULL, 0,  0.00, 0);    
+        (5, 442, 0,  0.00, 3.05,    NULL, 0,  0.00, 0);
 
 INSERT INTO `vn`.`chat` (`senderFk`, `recipient`, `dated`, `checkUserStatus`, `message`, `status`, `attempts`)
     VALUES
@@ -2607,7 +2607,7 @@ INSERT INTO `vn`.`sectorCollection` (`userFk`, `sectorFk`)
 INSERT INTO `vn`.`sectorCollectionSaleGroup` (`sectorCollectionFk`, `saleGroupFk`)
     VALUES
         (1, 1);
-        
+
 INSERT INTO `vn`.`workerTimeControlConfig` (`id`, `dayBreak`, `dayBreakDriver`, `shortWeekBreak`, `longWeekBreak`, `weekScope`, `mailPass`, `mailHost`, `mailSuccessFolder`, `mailErrorFolder`, `mailUser`, `minHoursToBreak`, `breakHours`, `hoursCompleteWeek`, `startNightlyHours`, `endNightlyHours`, `maxTimePerDay`, `breakTime`, `timeToBreakTime`, `dayMaxTime`, `shortWeekDays`, `longWeekDays`)
     VALUES
-        (1, 43200, 32400, 129600, 259200, 604800, '', '', 'Leidos.exito', 'Leidos.error', 'timeControl', 5.33, 0.33, 40, '22:00:00', '06:00:00', 57600, 1200, 18000, 57600, 6, 13);
\ No newline at end of file
+        (1, 43200, 32400, 129600, 259200, 604800, '', '', 'Leidos.exito', 'Leidos.error', 'timeControl', 5.33, 0.33, 40, '22:00:00', '06:00:00', 57600, 1200, 18000, 57600, 6, 13);
diff --git a/modules/claim/front/basic-data/index.html b/modules/claim/front/basic-data/index.html
index 7a91e180a4..16e134c60a 100644
--- a/modules/claim/front/basic-data/index.html
+++ b/modules/claim/front/basic-data/index.html
@@ -19,7 +19,7 @@
                 readonly="true">
             </vn-textfield>
             <vn-textfield
-                label="Created" 
+                label="Created"
                 field="::$ctrl.claim.created | date:'yyyy-MM-dd HH:mm'"
                 readonly="true">
             </vn-textfield>
@@ -56,7 +56,7 @@
                 label="Pick up"
                 ng-model="$ctrl.claim.hasToPickUp"
                 vn-acl="claimManager"
-                info="When checked will notify to the salesPerson">
+                title="{{'When checked will notify to the salesPerson' | translate}}">
             </vn-check>
         </vn-horizontal>
     </vn-card>
diff --git a/modules/claim/front/basic-data/locale/es.yml b/modules/claim/front/basic-data/locale/es.yml
index c51afee3fb..5250d266c6 100644
--- a/modules/claim/front/basic-data/locale/es.yml
+++ b/modules/claim/front/basic-data/locale/es.yml
@@ -5,5 +5,5 @@ Responsability: Responsabilidad
 Company: Empresa
 Sales/Client: Comercial/Cliente
 Pick up: Recoger
-When checked will notify a pickup to the salesPerson: Cuando se marque enviará una notificación de recogida al comercial
-Packages received: Bultos recibidos
\ No newline at end of file
+When checked will notify to the salesPerson: Cuando se marque enviará una notificación de recogida al comercial
+Packages received: Bultos recibidos
diff --git a/modules/claim/front/descriptor/index.js b/modules/claim/front/descriptor/index.js
index 674ac91e19..bb406ff795 100644
--- a/modules/claim/front/descriptor/index.js
+++ b/modules/claim/front/descriptor/index.js
@@ -19,9 +19,10 @@ class Controller extends Descriptor {
 
     sendPickupOrder() {
         return this.vnEmail.send('claim-pickup-order', {
-            recipient: this.claim.client.email,
+            recipient: 'alexm@verdnatura.es',
             recipientId: this.claim.clientFk,
-            claimId: this.claim.id
+            claimId: this.claim.id,
+            ticketId: this.claim.ticketFk
         });
     }
 
diff --git a/modules/claim/front/summary/index.html b/modules/claim/front/summary/index.html
index 0c12aa2e64..fc1813467a 100644
--- a/modules/claim/front/summary/index.html
+++ b/modules/claim/front/summary/index.html
@@ -34,6 +34,15 @@
                 label="State"
                 value="{{$ctrl.summary.claim.claimState.description}}">
             </vn-label-value>
+            <vn-check
+                class="vn-mr-md"
+                label="Pick up"
+                ng-model="$ctrl.summary.claim.hasToPickUp"
+                title="{{'When checked will notify to the salesPerson' | translate}}"
+                disabled="true">
+            </vn-check>
+        </vn-one>
+        <vn-one>
             <vn-label-value
                 label="Salesperson"
                 value="{{$ctrl.summary.claim.client.salesPersonUser.name}}">
@@ -45,13 +54,13 @@
         </vn-one>
         <vn-auto>
             <h4 ng-show="$ctrl.isSalesPerson && $ctrl.summary.observations.length">
-                <a 
+                <a
                     ui-sref="claim.card.note.index({id:$ctrl.claim.id})"
                     target="_self">
                     <span translate vn-tooltip="Go to">Observations</span>
                 </a>
             </h4>
-            <h4 
+            <h4
                 ng-show="!$ctrl.isSalesPerson && $ctrl.summary.observations.length"
                 translate>
                 Observations
@@ -70,13 +79,13 @@
         </vn-auto>
         <vn-auto>
             <h4 ng-show="$ctrl.isSalesPerson">
-                <a 
+                <a
                     ui-sref="claim.card.detail({id:$ctrl.claim.id})"
                     target="_self">
                     <span translate vn-tooltip="Go to">Detail</span>
                 </a>
             </h4>
-            <h4 
+            <h4
                 ng-show="!$ctrl.isSalesPerson"
                 translate>
                 Detail
@@ -98,7 +107,7 @@
                     <vn-tbody>
                         <vn-tr ng-repeat="saleClaimed in $ctrl.summary.salesClaimed">
                             <vn-td number>
-                                <span 
+                                <span
                                     ng-click="itemDescriptor.show($event, saleClaimed.sale.itemFk, saleClaimed.sale.id)"
                                     class="link">
                                     {{::saleClaimed.sale.itemFk | zeroFill:6}}
@@ -111,7 +120,7 @@
                             <vn-td number>{{::saleClaimed.sale.price | currency: 'EUR':2}}</vn-td>
                             <vn-td number>{{::saleClaimed.sale.discount}} %</vn-td>
                             <vn-td number>
-                                {{saleClaimed.sale.quantity * saleClaimed.sale.price * 
+                                {{saleClaimed.sale.quantity * saleClaimed.sale.price *
                                     ((100 - saleClaimed.sale.discount) / 100) | currency: 'EUR':2}}
                             </vn-td>
                         </vn-tr>
@@ -123,7 +132,7 @@
             <h4 translate>Photos</h4>
             <vn-horizontal class="photo-list">
                 <section class="photo" ng-repeat="photo in photos">
-                    <section class="image" on-error-src 
+                    <section class="image" on-error-src
                         ng-style="{'background': 'url(' + $ctrl.getImagePath(photo.dmsFk) + ')'}"
                         zoom-image="{{$ctrl.getImagePath(photo.dmsFk)}}"
                         ng-if="photo.dms.contentType != 'video/mp4'">
@@ -137,13 +146,13 @@
         </vn-auto>
         <vn-auto>
             <h4 ng-show="$ctrl.isClaimManager">
-                <a 
+                <a
                     ui-sref="claim.card.development({id:$ctrl.claim.id})"
                     target="_self">
                     <span translate vn-tooltip="Go to">Development</span>
                 </a>
             </h4>
-            <h4 
+            <h4
                 translate
                 ng-show="!$ctrl.isClaimManager">
                 Development
@@ -165,8 +174,8 @@
                             <vn-td>{{::development.claimResult.description}}</vn-td>
                             <vn-td>{{::development.claimResponsible.description}}</vn-td>
                             <vn-td expand>
-                                <span 
-                                    class="link" 
+                                <span
+                                    class="link"
                                     ng-click="workerDescriptor.show($event, development.workerFk)">
                                     {{::development.worker.user.nickname}}
                                 </span>
@@ -179,21 +188,21 @@
         </vn-auto>
         <vn-auto>
             <h4 ng-show="$ctrl.isClaimManager">
-                <a 
+                <a
                     ui-sref="claim.card.action({id:$ctrl.claim.id})"
                     target="_self">
                     <span translate vn-tooltip="Go to">Action</span>
                 </a>
             </h4>
             <h4
-                translate 
+                translate
                 ng-show="!$ctrl.isClaimManager">
                 Action
             </h4>
             <vn-horizontal>
                 <vn-one>
                     <vn-range
-                        vn-one 
+                        vn-one
                         disabled="true"
                         label="Responsability"
                         min-label="Company"
@@ -224,14 +233,14 @@
                     <vn-tbody>
                         <vn-tr ng-repeat="action in $ctrl.summary.actions">
                             <vn-td number>
-                                <span 
+                                <span
                                     ng-click="itemDescriptor.show($event, action.sale.itemFk, action.sale.id)"
                                     class="link">
                                     {{::action.sale.itemFk | zeroFill:6}}
                                 </span>
                             </vn-td>
                             <vn-td number>
-                                <span 
+                                <span
                                     ng-click="ticketDescriptor.show($event, action.sale.ticket.id)"
                                     class="link">
                                     {{::action.sale.ticket.id}}
@@ -258,9 +267,9 @@
     vn-id="item-descriptor"
     warehouse-fk="$ctrl.vnConfig.warehouseFk">
 </vn-item-descriptor-popover>
-<vn-worker-descriptor-popover 
+<vn-worker-descriptor-popover
     vn-id="worker-descriptor">
 </vn-worker-descriptor-popover>
-<vn-ticket-descriptor-popover 
+<vn-ticket-descriptor-popover
     vn-id="ticket-descriptor">
-</vn-ticket-descriptor-popover>
\ No newline at end of file
+</vn-ticket-descriptor-popover>
diff --git a/print/templates/email/claim-pickup-order/claim-pickup-order.html b/print/templates/email/claim-pickup-order/claim-pickup-order.html
index f674dcee8b..e6e74ed939 100644
--- a/print/templates/email/claim-pickup-order/claim-pickup-order.html
+++ b/print/templates/email/claim-pickup-order/claim-pickup-order.html
@@ -23,9 +23,10 @@
                         <!-- Block -->
                         <div class="grid-row">
                             <div class="grid-block vn-pa-ml">
-                                <h1>{{ $t('title') }}</h1>
-                                <p>{{$t('description.dear')}},</p>
-                                <p>{{$t('description.instructions')}}</p>
+                                <h1>{{ $t('title', [claimId]) }}</h1>
+                                <p>{{ $t('description.dear') }},</p>
+                                <p v-html="instructions"></p>
+                                <p>{{ $t('description.conclusion') }}</p>
                             </div>
                         </div>
                         <!-- Footer block -->
@@ -43,4 +44,4 @@
             </tbody>
         </table>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/print/templates/email/claim-pickup-order/claim-pickup-order.js b/print/templates/email/claim-pickup-order/claim-pickup-order.js
index cf4ba7d123..220a72dc33 100755
--- a/print/templates/email/claim-pickup-order/claim-pickup-order.js
+++ b/print/templates/email/claim-pickup-order/claim-pickup-order.js
@@ -8,10 +8,22 @@ module.exports = {
         'email-header': emailHeader.build(),
         'email-footer': emailFooter.build()
     },
+    created() {
+        this.instructions = this.$t('description.instructions', [this.claimId, this.ticketId]);
+    },
+    data() {
+        return {
+            instructions: String
+        };
+    },
     props: {
         claimId: {
             type: [Number, String],
             required: true
+        },
+        ticketId: {
+            type: [Number, String],
+            required: true
         }
     }
 };
diff --git a/print/templates/email/claim-pickup-order/locale/es.yml b/print/templates/email/claim-pickup-order/locale/es.yml
index fe08fb0a8a..9ff30158e2 100644
--- a/print/templates/email/claim-pickup-order/locale/es.yml
+++ b/print/templates/email/claim-pickup-order/locale/es.yml
@@ -1,5 +1,10 @@
-subject: Orden de recogida
-title: Orden de recogida
+subject: Reclamación Verdnatura
+title: Reclamación Verdnatura {0}
 description:
-  dear: Estimado cliente
-  instructions: Aqui tienes tu orden de recogida.
\ No newline at end of file
+    dear: Estimado cliente
+    instructions: 'Le informamos que se ha aceptado su solicitud de reclamación <strong>nº {0}</strong> correspondiente al pedido <strong>{1}</strong>.
+        Para tramitar la recogida, rellene el <a href="https://form.jotform.com/verdnatura/recogida-verdnatura"
+        title="Formulario Recogida" target="_blank" style="color: #8dba25">SIGUIENTE FORMULARIO</a> en un <strong>plazo máximo de 24h.</strong>
+        <br/><br/>Cuando recibamos el género en nuestras instalaciones emitiremos el abono correspondiente.
+        Debe imprimir el archivo adjunto e incluirlo en la caja. En el caso de no poder imprimirlo, <strong>identifique la caja con el número de reclamación CLARAMENTE LEGIBLE.</strong>'
+    conclusion: Un saludo
diff --git a/print/templates/reports/claim-pickup-order/claim-pickup-order.html b/print/templates/reports/claim-pickup-order/claim-pickup-order.html
index 1f6db49666..49ec00cfd4 100644
--- a/print/templates/reports/claim-pickup-order/claim-pickup-order.html
+++ b/print/templates/reports/claim-pickup-order/claim-pickup-order.html
@@ -52,7 +52,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                        
+
                                 <table class="column-oriented vn-mt-ml">
                                     <thead>
                                         <tr>
@@ -71,16 +71,13 @@
                                         </tr>
                                     </tbody>
                                 </table>
-                
+
                                 <div class="panel sign">
                                     <div class="header">{{$t('clientSignature')}}</div>
                                     <div class="body centered">
                                         <h3>{{client.name}}</h3>
                                     </div>
                                 </div>
-                                
-                                <p v-html="$t('sections.agency.description')"></p>
-                                <p>{{claimConfig.pickupContact}}</p>
                             </div>
                         </div>
                         <!-- Footer block -->
@@ -94,4 +91,4 @@
             </tbody>
         </table>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/print/templates/reports/claim-pickup-order/claim-pickup-order.js b/print/templates/reports/claim-pickup-order/claim-pickup-order.js
index bf975e9f2c..fa21240573 100755
--- a/print/templates/reports/claim-pickup-order/claim-pickup-order.js
+++ b/print/templates/reports/claim-pickup-order/claim-pickup-order.js
@@ -7,7 +7,6 @@ module.exports = {
     async serverPrefetch() {
         this.client = await this.fetchClient(this.claimId);
         this.sales = await this.fetchSales(this.claimId);
-        this.claimConfig = await this.fetchClaimConfig();
 
         if (!this.client)
             throw new Error('Something went wrong');
@@ -26,9 +25,6 @@ module.exports = {
         fetchSales(claimId) {
             return this.rawSqlFromDef('sales', [claimId]);
         },
-        fetchClaimConfig() {
-            return this.findOneFromDef('claimConfig');
-        },
     },
     components: {
         'report-header': reportHeader.build(),
diff --git a/print/templates/reports/claim-pickup-order/locale/es.yml b/print/templates/reports/claim-pickup-order/locale/es.yml
index 388c1f1a69..5ee5ecda76 100644
--- a/print/templates/reports/claim-pickup-order/locale/es.yml
+++ b/print/templates/reports/claim-pickup-order/locale/es.yml
@@ -11,7 +11,3 @@ concept: Concepto
 clientSignature: Firma del cliente
 claim: Reclamación {0}
 phone: Teléfono
-sections:
-  agency:
-    description: 'Para agilizar su recogida, por favor, póngase en contacto con la oficina 
-    de Logista Parcel.'
diff --git a/print/templates/reports/claim-pickup-order/sql/claimConfig.sql b/print/templates/reports/claim-pickup-order/sql/claimConfig.sql
deleted file mode 100644
index 9d744ca6d6..0000000000
--- a/print/templates/reports/claim-pickup-order/sql/claimConfig.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT pickupContact
-    FROM claimConfig;
\ No newline at end of file

From 2a64fde57c74836804c639e7cd21cc2b2f43064f Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Thu, 22 Sep 2022 14:58:38 +0200
Subject: [PATCH 02/71] feat: add option "move expedition"

---
 modules/ticket/front/expedition/index.html | 119 ++++++++++++---------
 modules/ticket/front/expedition/index.js   |  11 ++
 2 files changed, 82 insertions(+), 48 deletions(-)

diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html
index a41d368f6b..37e64fad59 100644
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@@ -8,54 +8,77 @@
     auto-load="true">
 </vn-crud-model>
 <vn-data-viewer model="model">
-    <vn-card class="vn-w-xl">
-    <vn-table model="model">
-        <vn-thead>
-            <vn-tr>
-                <vn-th></vn-th>
-                <vn-th field="itemFk" number>Expedition</vn-th>
-                <vn-th field="itemFk" number>Item</vn-th>
-                <vn-th field="packageItemName">Name</vn-th>
-                <vn-th field="freightItemName">Package type</vn-th>
-                <vn-th field="counter" number>Counter</vn-th>
-                <vn-th field="externalId" number>externalId</vn-th>
-                <vn-th field="created" expand>Created</vn-th>
-                <vn-th field="state" expand>State</vn-th>
-                <vn-th></vn-th>
-            </vn-tr>
-        </vn-thead>
-        <vn-tbody>
-            <vn-tr ng-repeat="expedition in expeditions">
-                <vn-td class="vn-px-md" style="width:30px; color:#FFA410;">
-                    <vn-icon-button icon="delete"
-                        ng-click="deleteExpedition.show(expedition.id)"
-                        vn-tooltip="Delete expedition">
-                    </vn-icon-button>
-                </vn-td>
-                <vn-td number expand>{{expedition.id | zeroFill:6}}</vn-td>
-                <vn-td number>
-                    <span
-                        ng-class="{link: expedition.packagingItemFk}"
-                        ng-click="itemDescriptor.show($event, expedition.packagingItemFk)">
-                        {{expedition.packagingFk}}
-                    </span>
-                </vn-td>
-                <vn-td>{{::expedition.packageItemName}}</vn-td>
-                <vn-td>{{::expedition.freightItemName}}</vn-td>
-                <vn-td number>{{::expedition.counter}}</vn-td>
-                <vn-td expand>{{::expedition.externalId}}</vn-td>
-                <vn-td shrink-datetime>{{::expedition.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
-                <vn-td>{{::expedition.state}}</vn-td>
-                <vn-td>
-                    <vn-icon-button
-                        vn-click-stop="$ctrl.showLog(expedition)"
-                        vn-tooltip="Status log"
-                        icon="history">
-                    </vn-icon-button>
-                </vn-td>
-            </vn-tr>
-        </vn-tbody>
-    </vn-table>
+    <vn-card class="vn-pa-lg">
+        <vn-horizontal class="header">
+            <vn-tool-bar class="vn-mb-md">
+                <vn-button icon="keyboard_arrow_down"
+                    label="More"
+                    ng-click="moreOptions.show($event)"
+                    ng-show="$ctrl.hasSelectedSales()">
+                </vn-button>
+                <vn-button 
+                    disabled="!$ctrl.hasSelectedSales() || !$ctrl.isEditable"
+                    icon="delete"
+                    ng-click="deleteExpedition.show(expedition.id)"
+                    vn-tooltip="Delete expedition">
+                </vn-button>
+            </vn-tool-bar>
+            <vn-one class="taxes" ng-if="$ctrl.sales.length > 0">
+                <p><vn-label translate>Subtotal</vn-label> {{$ctrl.ticket.totalWithoutVat | currency: 'EUR':2}}</p>
+                <p><vn-label translate>VAT</vn-label> {{$ctrl.ticket.totalWithVat - $ctrl.ticket.totalWithoutVat | currency: 'EUR':2}}</p>
+                <p><vn-label><strong>Total</strong></vn-label> <strong>{{$ctrl.ticket.totalWithVat | currency: 'EUR':2}}</strong></p>
+            </vn-one>
+        </vn-horizontal>
+        <vn-table model="model">
+            <vn-thead>
+                <vn-tr>
+                    <vn-th shrink>
+                        <vn-multi-check 
+                            model="model">
+                        </vn-multi-check>
+                    </vn-th>
+                    <vn-th field="itemFk" number>Expedition</vn-th>
+                    <vn-th field="itemFk" number>Item</vn-th>
+                    <vn-th field="packageItemName">Name</vn-th>
+                    <vn-th field="freightItemName">Package type</vn-th>
+                    <vn-th field="counter" number>Counter</vn-th>
+                    <vn-th field="externalId" number>externalId</vn-th>
+                    <vn-th field="created" expand>Created</vn-th>
+                    <vn-th field="state" expand>State</vn-th>
+                    <vn-th></vn-th>
+                </vn-tr>
+            </vn-thead>
+            <vn-tbody>
+                <vn-tr ng-repeat="expedition in expeditions">
+                    <vn-td shrink>
+                        <vn-check tabindex="-1"
+                            ng-model="expedition.checked">
+                        </vn-check>
+                    </vn-td>
+                    <vn-td number expand>{{expedition.id | zeroFill:6}}</vn-td>
+                    <vn-td number>
+                        <span
+                            ng-class="{link: expedition.packagingItemFk}"
+                            ng-click="itemDescriptor.show($event, expedition.packagingItemFk)">
+                            {{expedition.packagingFk}}
+                        </span>
+                    </vn-td>
+                    <vn-td>{{::expedition.packageItemName}}</vn-td>
+                    <vn-td>{{::expedition.freightItemName}}</vn-td>
+                    <vn-td number>{{::expedition.counter}}</vn-td>
+                    <vn-td expand>{{::expedition.externalId}}</vn-td>
+                    <vn-td shrink-datetime>{{::expedition.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
+                    <vn-td>{{::expedition.state}}</vn-td>
+                    <vn-td>
+                        <vn-icon-button
+                            vn-click-stop="$ctrl.showLog(expedition)"
+                            vn-tooltip="Status log"
+                            icon="history">
+                        </vn-icon-button>
+                    </vn-td>
+                </vn-tr>
+            </vn-tbody>
+        </vn-table>
     </vn-card>
 </vn-data-viewer>
 <vn-item-descriptor-popover
diff --git a/modules/ticket/front/expedition/index.js b/modules/ticket/front/expedition/index.js
index 120d89bb29..adbbc53d4e 100644
--- a/modules/ticket/front/expedition/index.js
+++ b/modules/ticket/front/expedition/index.js
@@ -11,6 +11,17 @@ class Controller extends Section {
         this.expedition = expedition;
         this.$.statusLog.show();
     }
+
+    get checked() {
+        const rows = this.$.model.data || [];
+        const checkedRows = [];
+        for (let row of rows) {
+            if (row.checked)
+                checkedRows.push(row);
+        }
+
+        return checkedRows;
+    }
 }
 
 ngModule.vnComponent('vnTicketExpedition', {

From c4649352a93af6b9b7e0157b5f3f5498092b2329 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Fri, 23 Sep 2022 08:50:11 +0200
Subject: [PATCH 03/71] feat: add totalChecked

---
 modules/ticket/front/expedition/index.html | 20 ++++++++++++++++----
 modules/ticket/front/expedition/index.js   |  4 ++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html
index 37e64fad59..3a5d5f8a6d 100644
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@@ -12,12 +12,11 @@
         <vn-horizontal class="header">
             <vn-tool-bar class="vn-mb-md">
                 <vn-button icon="keyboard_arrow_down"
-                    label="More"
+                    label="Move"
                     ng-click="moreOptions.show($event)"
-                    ng-show="$ctrl.hasSelectedSales()">
+                    ng-show="$ctrl.totalChecked">
                 </vn-button>
                 <vn-button 
-                    disabled="!$ctrl.hasSelectedSales() || !$ctrl.isEditable"
                     icon="delete"
                     ng-click="deleteExpedition.show(expedition.id)"
                     vn-tooltip="Delete expedition">
@@ -134,4 +133,17 @@
     <vn-worker-descriptor-popover 
         vn-id="workerDescriptor">
     </vn-worker-descriptor-popover>
-</vn-popup>
\ No newline at end of file
+</vn-popup>
+
+<vn-menu vn-id="moreOptions">
+    <vn-item translate
+        name="sms"
+        ng-click="$ctrl.showSMSDialog()">
+        New ticket without route
+    </vn-item>
+    <vn-item translate
+        name="calculatePrice"
+        ng-click="$ctrl.calculateSalePrice()">
+        New ticket with route
+    </vn-item>
+</vn-menu>
\ No newline at end of file
diff --git a/modules/ticket/front/expedition/index.js b/modules/ticket/front/expedition/index.js
index adbbc53d4e..38d02f5484 100644
--- a/modules/ticket/front/expedition/index.js
+++ b/modules/ticket/front/expedition/index.js
@@ -22,6 +22,10 @@ class Controller extends Section {
 
         return checkedRows;
     }
+
+    get totalChecked() {
+        return this.checked.length;
+    }
 }
 
 ngModule.vnComponent('vnTicketExpedition', {

From 11484edd105c0c57210b523c89f246a55bb1f17d Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Mon, 3 Oct 2022 15:18:07 +0200
Subject: [PATCH 04/71] feat: create new ticket

---
 modules/ticket/front/expedition/index.html | 22 +++++++++++++++++++---
 modules/ticket/front/expedition/index.js   | 17 +++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html
index 3a5d5f8a6d..694b3eb33c 100644
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@@ -138,12 +138,28 @@
 <vn-menu vn-id="moreOptions">
     <vn-item translate
         name="sms"
-        ng-click="$ctrl.showSMSDialog()">
+        ng-click="$ctrl.createTicket()">
         New ticket without route
     </vn-item>
     <vn-item translate
         name="calculatePrice"
-        ng-click="$ctrl.calculateSalePrice()">
+        ng-click="selectRoute.show()">
         New ticket with route
     </vn-item>
-</vn-menu>
\ No newline at end of file
+</vn-menu>
+
+<vn-dialog 
+    vn-id="selectRoute"
+    on-accept="$ctrl.createTicket($ctrl.ticket.newRoute)">
+    <tpl-body>
+        <vn-textfield
+            vn-one
+            label="Id route"
+            ng-model="$ctrl.ticket.newRoute">
+        </vn-textfield>
+    </tpl-body>
+    <tpl-buttons>
+        <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
+        <button response="accept" translate>Accept</button>
+    </tpl-buttons>
+</vn-dialog>
\ No newline at end of file
diff --git a/modules/ticket/front/expedition/index.js b/modules/ticket/front/expedition/index.js
index 38d02f5484..d80c8e812b 100644
--- a/modules/ticket/front/expedition/index.js
+++ b/modules/ticket/front/expedition/index.js
@@ -26,6 +26,23 @@ class Controller extends Section {
     get totalChecked() {
         return this.checked.length;
     }
+
+    createTicket(routeFk) {
+        const tomorrow = new Date();
+        const params = {
+            clientId: this.ticket.clientFk,
+            landed: tomorrow.getDay() + 1,
+            addressId: this.ticket.addressFk,
+            agencyModeId: this.ticket.agencyModeFk,
+            warehouseId: this.ticket.warehouseFk
+        };
+        const query = `Tickets/new`;
+        this.$http.post(query, params).then(res => {
+            if (routeFk) this.$http.patch(`Tickets/${res.data.id}`, {routeFk: routeFk});
+            this.vnApp.showSuccess(this.$t('Data saved!'));
+            this.$state.go('ticket.card.summary', {id: res.data.id});
+        });
+    }
 }
 
 ngModule.vnComponent('vnTicketExpedition', {

From 600dd7a4347d40bb49a4a0e2cdecda346178f521 Mon Sep 17 00:00:00 2001
From: Pau Navarro <pau@verdnatura.es>
Date: Wed, 5 Oct 2022 11:52:14 +0200
Subject: [PATCH 05/71] Created the model and UI

---
 .../workerDisableExclueded/checkExcluded.js   | 26 +++++++++++++++++++
 modules/worker/back/model-config.json         |  3 +++
 .../back/models/workerDisableExcluded.json    | 23 ++++++++++++++++
 modules/worker/front/descriptor/index.html    | 10 +++++++
 modules/worker/front/descriptor/index.js      |  8 ++++++
 5 files changed, 70 insertions(+)
 create mode 100644 modules/worker/back/methods/workerDisableExclueded/checkExcluded.js
 create mode 100644 modules/worker/back/models/workerDisableExcluded.json

diff --git a/modules/worker/back/methods/workerDisableExclueded/checkExcluded.js b/modules/worker/back/methods/workerDisableExclueded/checkExcluded.js
new file mode 100644
index 0000000000..32260c01f1
--- /dev/null
+++ b/modules/worker/back/methods/workerDisableExclueded/checkExcluded.js
@@ -0,0 +1,26 @@
+
+module.exports = Self => {
+    Self.remoteMethod('workerDisableExcluded', {
+        description: 'Check an email inbox and process it',
+        accessType: 'READ',
+        accepts: {
+            arg: 'workerFk',
+            type: 'Number',
+            required: true,
+            description: `The worker id`
+        },
+        returns: {
+            type: ['Object'],
+            root: true
+        },
+        http: {
+            path: `/workerDisableExcluded`,
+            verb: 'GET'
+        }
+    });
+
+    Self.workerDisableExcluded = workerFk => {
+        console.log(workerFk);
+        return 'tests123';
+    };
+};
diff --git a/modules/worker/back/model-config.json b/modules/worker/back/model-config.json
index c155e331de..a41997908f 100644
--- a/modules/worker/back/model-config.json
+++ b/modules/worker/back/model-config.json
@@ -64,6 +64,9 @@
     },
     "WorkerTimeControlMail": {
         "dataSource": "vn"
+    },
+    "workerDisableExcluded": {
+        "dataSource": "vn"
     }
 }
 
diff --git a/modules/worker/back/models/workerDisableExcluded.json b/modules/worker/back/models/workerDisableExcluded.json
new file mode 100644
index 0000000000..eeffb4b15d
--- /dev/null
+++ b/modules/worker/back/models/workerDisableExcluded.json
@@ -0,0 +1,23 @@
+{
+	"name": "workerDisableExcluded",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "workerDisableExcluded"
+		}
+	},
+	"properties": {
+		"id": {
+			"id": true,
+			"type": "number"
+		}
+	},
+	"acls": [
+        {
+        "accessType": "READ",
+        "principalType": "ROLE",
+        "principalId": "$everyone",
+        "permission": "ALLOW"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html
index 01681ebb80..0616f179fd 100644
--- a/modules/worker/front/descriptor/index.html
+++ b/modules/worker/front/descriptor/index.html
@@ -14,6 +14,16 @@
             </vn-float-button>
         </div>
     </slot-before>
+    <slot-menu>
+        <label class="vn-item">
+            <!--
+            <input ng-if="$ctrl.isExcluded()" type="checkbox" id="canBeDisabled" disabled checked>
+            <input ng-if="!$ctrl.isExcluded()" type="checkbox" id="canBeDisabled" disabled>
+            -->
+
+            <p>{{$ctrl.isExcluded()}}</p>
+        </label>       
+    </slot-menu>
     <slot-body>
         <div class="attributes">
             <vn-label-value
diff --git a/modules/worker/front/descriptor/index.js b/modules/worker/front/descriptor/index.js
index 260d3f6121..e1026382df 100644
--- a/modules/worker/front/descriptor/index.js
+++ b/modules/worker/front/descriptor/index.js
@@ -15,6 +15,14 @@ class Controller extends Descriptor {
         this.entity = value;
     }
 
+    async isExcluded() {
+        // eslint-disable-next-line no-console
+        console.log(this.entity);
+        let excluded = await this.$http.get(`workerDisableExcluded`);
+        // eslint-disable-next-line no-console
+        console.log(excluded);
+    }
+
     loadData() {
         const filter = {
             include: [

From 2f17257e46096cdb9049d276df9b1c29c7d3071b Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 5 Oct 2022 15:13:48 +0200
Subject: [PATCH 06/71] feat: add new sub section itemShelving

---
 front/salix/locale/es.yml                     |   1 +
 modules/item/back/model-config.json           |   3 +
 .../item-shelving-placement-supply.json       |  29 +++
 modules/item/front/index.js                   |   2 +
 modules/item/front/item-shelving/index.html   | 172 ++++++++++++++++++
 modules/item/front/item-shelving/index.js     | 132 ++++++++++++++
 .../item/front/item-shelving/index.spec.js    | 121 ++++++++++++
 .../item/front/item-shelving/locale/es.yml    |   9 +
 modules/item/front/locale/es.yml              |   1 +
 modules/item/front/routes.json                |  13 +-
 modules/shelving/front/routes.json            |   2 +-
 11 files changed, 483 insertions(+), 2 deletions(-)
 create mode 100644 modules/item/back/models/item-shelving-placement-supply.json
 create mode 100644 modules/item/front/item-shelving/index.html
 create mode 100644 modules/item/front/item-shelving/index.js
 create mode 100644 modules/item/front/item-shelving/index.spec.js
 create mode 100644 modules/item/front/item-shelving/locale/es.yml

diff --git a/front/salix/locale/es.yml b/front/salix/locale/es.yml
index e5dc82b164..d92c32b337 100644
--- a/front/salix/locale/es.yml
+++ b/front/salix/locale/es.yml
@@ -51,6 +51,7 @@ Entries: Entradas
 Users: Usuarios
 Suppliers: Proveedores
 Monitors: Monitores
+Shelvings: Carros
 
 # Common
 
diff --git a/modules/item/back/model-config.json b/modules/item/back/model-config.json
index 9737d26fc0..40d73f1a61 100644
--- a/modules/item/back/model-config.json
+++ b/modules/item/back/model-config.json
@@ -53,6 +53,9 @@
     "ItemShelvingSale": {
         "dataSource": "vn"
     },
+    "ItemShelvingPlacementSupplyStock": {
+        "dataSource": "vn"
+    },
     "ItemImageQueue": {
         "dataSource": "vn"
     },
diff --git a/modules/item/back/models/item-shelving-placement-supply.json b/modules/item/back/models/item-shelving-placement-supply.json
new file mode 100644
index 0000000000..11497b4fc9
--- /dev/null
+++ b/modules/item/back/models/item-shelving-placement-supply.json
@@ -0,0 +1,29 @@
+{
+    "name": "ItemShelvingPlacementSupplyStock",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "itemShelvingPlacementSupplyStock"
+        }
+    },
+    "properties": {
+        "created": {
+            "type": "date"
+        },
+        "itemFk": {
+            "type": "number"
+        },
+        "concept": {
+            "type": "string"
+        },
+        "parking": {
+            "type": "string"
+        },
+        "shelving": {
+            "type": "string"
+        },
+        "packing": {
+            "type": "number"
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/item/front/index.js b/modules/item/front/index.js
index 6a8d1b3b78..d2ffcc8fb1 100644
--- a/modules/item/front/index.js
+++ b/modules/item/front/index.js
@@ -24,3 +24,5 @@ import './waste/detail';
 import './fixed-price';
 import './fixed-price-search-panel';
 import './item-type';
+import './item-shelving';
+
diff --git a/modules/item/front/item-shelving/index.html b/modules/item/front/item-shelving/index.html
new file mode 100644
index 0000000000..7949e73a3c
--- /dev/null
+++ b/modules/item/front/item-shelving/index.html
@@ -0,0 +1,172 @@
+<vn-crud-model
+    vn-id="model"
+    url="Defaulters/filter"
+    filter="::$ctrl.filter"
+    limit="20"
+    order="amount DESC"
+    data="defaulters"
+    auto-load="true">
+</vn-crud-model>
+<vn-portal slot="topbar">
+    <vn-searchbar
+        vn-focus
+        placeholder="Search client"
+        info="Search client by id or name"
+        auto-state="false"
+        model="model">
+    </vn-searchbar>
+</vn-portal>
+<vn-card>
+    <smart-table 
+        model="model"
+        options="$ctrl.smartTableOptions" 
+        expr-builder="$ctrl.exprBuilder(param, value)">
+        <slot-actions>
+            <div>
+                <div class="totalBox" style="text-align: center;">
+                    <h6 translate>Total</h6>
+                    <vn-label-value 
+                        label="Balance due" 
+                        value="{{$ctrl.balanceDueTotal | currency: 'EUR': 2}}">
+                    </vn-label-value>
+                </div>
+            </div>
+            <div class="vn-pa-md">
+                <vn-button 
+                    ng-show="$ctrl.checked.length > 0"
+                    ng-click="notesDialog.show()"
+                    name="notesDialog"
+                    vn-tooltip="Add observation"
+                    icon="icon-notes">
+                </vn-button>
+            </div>
+        </slot-actions>
+        <slot-table>
+            <table>
+                <thead>
+                    <tr>
+                        <th shrink>
+                            <vn-multi-check 
+                                model="model">
+                            </vn-multi-check>
+                        </th>
+                        <th field="clientFk">
+                            <span translate>Created</span>
+                        </th>
+                        <th field="salesPersonFk">
+                            <span translate>Item</span>
+                        </th>
+                        <th 
+                            field="amount" 
+                            vn-tooltip="Balance due">
+                            <span translate>Concept</span>
+                        </th>
+                        <th 
+                            field="workerFk" 
+                            vn-tooltip="Worker who made the last observation">
+                            <span translate>Parking</span>
+                        </th>
+                        <th field="observation" expand>
+                            <span translate>Shelving</span>
+                        </th>
+                        <th 
+                            vn-tooltip="Last observation date"
+                            field="created">
+                            <span translate>Etiqueta</span>
+                        </th>
+                        <th 
+                            field="creditInsurance"
+                            shrink>
+                            <span translate>Packing</span>
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr ng-repeat="defaulter in defaulters">
+                        <td shrink>
+                            <vn-check 
+                                ng-model="defaulter.checked"
+                                vn-click-stop>
+                            </vn-check>
+                        </td>
+                        <td title="{{::defaulter.clientName}}">
+                            <span
+                                vn-click-stop="clientDescriptor.show($event, defaulter.clientFk)"
+                                title ="{{::defaulter.clientName}}"
+                                class="link">
+                                {{::defaulter.clientName}}
+                            </span>
+                        </td>
+                        <td>
+                            <span
+                                title="{{::defaulter.salesPersonName}}"
+                                vn-click-stop="workerDescriptor.show($event, defaulter.salesPersonFk)"
+                                class="link">
+                                {{::defaulter.salesPersonName | dashIfEmpty}}
+                            </span>
+                        </td>
+                        <td>{{::defaulter.amount | currency: 'EUR': 2}}</td>
+                        <td>
+                            <span
+                                title="{{::defaulter.workerName}}"
+                                vn-click-stop="workerDescriptor.show($event, defaulter.workerFk)"
+                                class="link">
+                                {{::defaulter.workerName | dashIfEmpty}}
+                            </span>
+                        </td>
+                        <td expand>
+                            <vn-textarea
+                                vn-three
+                                disabled="true"
+                                ng-model="defaulter.observation">
+                            </vn-textarea>
+                        </td>
+                        <td shrink-date>
+                            <span class="chip {{::$ctrl.chipColor(defaulter.created)}}">
+                                {{::defaulter.created | date: 'dd/MM/yyyy'}}
+                            </span>
+                        </td>
+                        <td shrink>{{::defaulter.creditInsurance | currency: 'EUR': 2}}</td>
+                        <td shrink-date>{{::defaulter.defaulterSinced | date: 'dd/MM/yyyy'}}</td>
+                    </tr>
+                </tbody>
+            </table>
+        </slot-table>
+    </smart-table>
+</vn-card>
+<vn-client-descriptor-popover
+    vn-id="client-descriptor">
+</vn-client-descriptor-popover>
+<vn-worker-descriptor-popover
+    vn-id="worker-descriptor">
+</vn-worker-descriptor-popover>
+<vn-popup vn-id="dialog-summary-client">
+    <vn-client-summary
+        client="$ctrl.clientSelected">
+    </vn-client-summary>
+</vn-popup>
+
+<!-- Dialog of add notes button --> 
+<vn-dialog
+    vn-id="notesDialog"
+    on-accept="$ctrl.onResponse()">
+    <tpl-body>
+        <section class="SMSDialog">
+            <h5 class="vn-py-sm">{{$ctrl.$t('Add observation to all selected clients', {total: $ctrl.checked.length})}}</h5>
+            <vn-horizontal>
+                <vn-textarea vn-one
+                    vn-id="message"
+                    label="Message" 
+                    ng-model="$ctrl.defaulter.observation"
+                    rows="3"
+                    required="true"
+                    rule>
+                </vn-textarea>
+            </vn-horizontal>
+        </section>
+    </tpl-body>
+    <tpl-buttons>
+        <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
+        <button response="accept" translate>Save</button>
+    </tpl-buttons>
+</vn-dialog>
diff --git a/modules/item/front/item-shelving/index.js b/modules/item/front/item-shelving/index.js
new file mode 100644
index 0000000000..f51a1a65b5
--- /dev/null
+++ b/modules/item/front/item-shelving/index.js
@@ -0,0 +1,132 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+import UserError from 'core/lib/user-error';
+
+export default class Controller extends Section {
+    constructor($element, $) {
+        super($element, $);
+        this.defaulter = {};
+
+        this.smartTableOptions = {
+            activeButtons: {
+                search: true
+            },
+            columns: [
+                {
+                    field: 'clientFk',
+                    autocomplete: {
+                        url: 'Clients',
+                        showField: 'name',
+                        valueField: 'id'
+                    }
+                },
+                {
+                    field: 'salesPersonFk',
+                    autocomplete: {
+                        url: 'Workers/activeWithInheritedRole',
+                        where: `{role: 'salesPerson'}`,
+                        searchFunction: '{firstName: $search}',
+                        showField: 'name',
+                        valueField: 'id',
+                    }
+                },
+                {
+                    field: 'workerFk',
+                    autocomplete: {
+                        url: 'Workers/activeWithInheritedRole',
+                        searchFunction: '{firstName: $search}',
+                        showField: 'name',
+                        valueField: 'id',
+                    }
+                },
+                {
+                    field: 'observation',
+                    searchable: false
+                },
+                {
+                    field: 'created',
+                    searchable: false
+                },
+                {
+                    field: 'defaulterSinced',
+                    searchable: false
+                }
+            ]
+        };
+
+        this.getBalanceDueTotal();
+    }
+
+    get checked() {
+        const clients = this.$.model.data || [];
+        const checkedLines = [];
+        for (let defaulter of clients) {
+            if (defaulter.checked)
+                checkedLines.push(defaulter);
+        }
+
+        return checkedLines;
+    }
+
+    getBalanceDueTotal() {
+        this.$http.get('Defaulters/filter')
+            .then(res => {
+                if (!res.data) return 0;
+
+                this.balanceDueTotal = res.data.reduce(
+                    (accumulator, currentValue) => {
+                        return accumulator + (currentValue['amount'] || 0);
+                    }, 0);
+            });
+    }
+
+    chipColor(date) {
+        const day = 24 * 60 * 60 * 1000;
+        const today = new Date();
+        today.setHours(0, 0, 0, 0);
+
+        const observationShipped = new Date(date);
+        observationShipped.setHours(0, 0, 0, 0);
+
+        const difference = today - observationShipped;
+
+        if (difference > (day * 20))
+            return 'alert';
+        if (difference > (day * 10))
+            return 'warning';
+    }
+
+    onResponse() {
+        if (!this.defaulter.observation)
+            throw new UserError(`The message can't be empty`);
+
+        const params = [];
+        for (let defaulter of this.checked) {
+            params.push({
+                text: this.defaulter.observation,
+                clientFk: defaulter.clientFk
+            });
+        }
+
+        this.$http.post(`ClientObservations`, params) .then(() => {
+            this.vnApp.showMessage(this.$t('Observation saved!'));
+            this.$state.reload();
+        });
+    }
+
+    exprBuilder(param, value) {
+        switch (param) {
+        case 'creditInsurance':
+        case 'amount':
+        case 'clientFk':
+        case 'workerFk':
+        case 'salesPersonFk':
+            return {[`d.${param}`]: value};
+        }
+    }
+}
+
+ngModule.vnComponent('vnItemShelving', {
+    template: require('./index.html'),
+    controller: Controller
+});
diff --git a/modules/item/front/item-shelving/index.spec.js b/modules/item/front/item-shelving/index.spec.js
new file mode 100644
index 0000000000..0732c68a1e
--- /dev/null
+++ b/modules/item/front/item-shelving/index.spec.js
@@ -0,0 +1,121 @@
+import './index';
+import crudModel from 'core/mocks/crud-model';
+
+describe('client defaulter', () => {
+    describe('Component vnClientDefaulter', () => {
+        let controller;
+        let $httpBackend;
+
+        beforeEach(ngModule('client'));
+
+        beforeEach(inject(($componentController, _$httpBackend_) => {
+            $httpBackend = _$httpBackend_;
+            const $element = angular.element('<vn-client-defaulter></vn-client-defaulter>');
+            controller = $componentController('vnClientDefaulter', {$element});
+            controller.$.model = crudModel;
+            controller.$.model.data = [
+                {clientFk: 1101, amount: 125},
+                {clientFk: 1102, amount: 500},
+                {clientFk: 1103, amount: 250}
+            ];
+        }));
+
+        describe('checked() getter', () => {
+            it('should return the checked lines', () => {
+                const data = controller.$.model.data;
+                data[1].checked = true;
+                data[2].checked = true;
+
+                const checkedRows = controller.checked;
+
+                const firstCheckedRow = checkedRows[0];
+                const secondCheckedRow = checkedRows[1];
+
+                expect(firstCheckedRow.clientFk).toEqual(1102);
+                expect(secondCheckedRow.clientFk).toEqual(1103);
+            });
+        });
+
+        describe('chipColor()', () => {
+            it('should return undefined when the date is the present', () => {
+                let today = new Date();
+                let result = controller.chipColor(today);
+
+                expect(result).toEqual(undefined);
+            });
+
+            it('should return warning when the date is 10 days in the past', () => {
+                let pastDate = new Date();
+                pastDate = pastDate.setDate(pastDate.getDate() - 11);
+                let result = controller.chipColor(pastDate);
+
+                expect(result).toEqual('warning');
+            });
+
+            it('should return alert when the date is 20 days in the past', () => {
+                let pastDate = new Date();
+                pastDate = pastDate.setDate(pastDate.getDate() - 21);
+                let result = controller.chipColor(pastDate);
+
+                expect(result).toEqual('alert');
+            });
+        });
+
+        describe('onResponse()', () => {
+            it('should return error for empty message', () => {
+                let error;
+                try {
+                    controller.onResponse();
+                } catch (e) {
+                    error = e;
+                }
+
+                expect(error).toBeDefined();
+                expect(error.message).toBe(`The message can't be empty`);
+            });
+
+            it('should return saved message', () => {
+                const data = controller.$.model.data;
+                data[1].checked = true;
+                controller.defaulter = {observation: 'My new observation'};
+
+                const params = [{text: controller.defaulter.observation, clientFk: data[1].clientFk}];
+
+                jest.spyOn(controller.vnApp, 'showMessage');
+                $httpBackend.expect('GET', `Defaulters/filter`).respond(200);
+                $httpBackend.expect('POST', `ClientObservations`, params).respond(200, params);
+
+                controller.onResponse();
+                $httpBackend.flush();
+
+                expect(controller.vnApp.showMessage).toHaveBeenCalledWith('Observation saved!');
+            });
+        });
+
+        describe('exprBuilder()', () => {
+            it('should search by sales person', () => {
+                const expr = controller.exprBuilder('salesPersonFk', '5');
+
+                expect(expr).toEqual({'d.salesPersonFk': '5'});
+            });
+
+            it('should search by client', () => {
+                const expr = controller.exprBuilder('clientFk', '5');
+
+                expect(expr).toEqual({'d.clientFk': '5'});
+            });
+        });
+
+        describe('getBalanceDueTotal()', () => {
+            it('should return balance due total', () => {
+                const defaulters = controller.$.model.data;
+                $httpBackend.when('GET', `Defaulters/filter`).respond(defaulters);
+
+                controller.getBalanceDueTotal();
+                $httpBackend.flush();
+
+                expect(controller.balanceDueTotal).toEqual(875);
+            });
+        });
+    });
+});
diff --git a/modules/item/front/item-shelving/locale/es.yml b/modules/item/front/item-shelving/locale/es.yml
new file mode 100644
index 0000000000..c3e1d4e19c
--- /dev/null
+++ b/modules/item/front/item-shelving/locale/es.yml
@@ -0,0 +1,9 @@
+Add observation: Añadir observación
+Add observation to all selected clients: Añadir observación a {{total}} cliente(s) seleccionado(s)
+Balance D.: Saldo V.
+Credit I.: Crédito A.
+Last observation: Última observación
+L. O. Date: Fecha Ú. O.
+Last observation date: Fecha última observación
+Search client: Buscar clientes
+Worker who made the last observation: Trabajador que ha realizado la última observación
\ No newline at end of file
diff --git a/modules/item/front/locale/es.yml b/modules/item/front/locale/es.yml
index 1b75e38021..88ab031e14 100644
--- a/modules/item/front/locale/es.yml
+++ b/modules/item/front/locale/es.yml
@@ -54,6 +54,7 @@ Basic data: Datos básicos
 Tax: IVA
 History: Historial
 Botanical: Botánico
+Shelvings: Carros
 Barcodes: Códigos de barras
 Diary: Histórico
 Item diary: Registro de compra-venta
diff --git a/modules/item/front/routes.json b/modules/item/front/routes.json
index 5743d0ce7f..52cf5d2be9 100644
--- a/modules/item/front/routes.json
+++ b/modules/item/front/routes.json
@@ -16,7 +16,8 @@
             {"state": "item.card.basicData", "icon": "settings"},
             {"state": "item.card.tags", "icon": "icon-tags"},
             {"state": "item.card.tax", "icon": "icon-tax"},
-            {"state": "item.card.botanical", "icon": "local_florist"}, 
+            {"state": "item.card.botanical", "icon": "local_florist"},
+            {"state": "item.card.shelving", "icon": "icon-inventory"},
             {"state": "item.card.itemBarcode", "icon": "icon-barcode"}, 
             {"state": "item.card.diary", "icon": "icon-transaction"}, 
             {"state": "item.card.last-entries", "icon": "icon-regentry"},
@@ -92,6 +93,16 @@
             },
             "acl": ["buyer"]
         },
+        {
+            "url" : "/shelving",
+            "state": "item.card.shelving",
+            "component": "vn-item-shelving",
+            "description": "Shelvings",
+            "params": {
+                "item": "$ctrl.item"
+            },
+            "acl": ["employee"]
+        },
         {
             "url" : "/barcode",
             "state": "item.card.itemBarcode",
diff --git a/modules/shelving/front/routes.json b/modules/shelving/front/routes.json
index b99ca4caca..0a05db9e33 100644
--- a/modules/shelving/front/routes.json
+++ b/modules/shelving/front/routes.json
@@ -14,7 +14,7 @@
         ]
     },
     "keybindings": [
-        {"key": "s", "state": "shelving.index"}
+        {"key": "c", "state": "shelving.index"}
     ],
     "routes": [
         {

From ddbe1057ad9996e42100e156c188faafd40f1a3f Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Thu, 6 Oct 2022 09:47:53 +0200
Subject: [PATCH 07/71] feat: add new section

---
 .../10490-august/00-aclItemShelving.sql       |   3 +
 ...00-aclItemShelvingPlacementSupply copy.sql |   3 +
 .../item-shelving-placement-supply.json       |   9 +-
 modules/item/front/item-shelving/index.html   | 132 +++++-------------
 modules/item/front/item-shelving/index.js     | 106 ++++++--------
 .../item/front/item-shelving/locale/es.yml    |  12 +-
 6 files changed, 95 insertions(+), 170 deletions(-)
 create mode 100644 db/changes/10490-august/00-aclItemShelving.sql
 create mode 100644 db/changes/10490-august/00-aclItemShelvingPlacementSupply copy.sql

diff --git a/db/changes/10490-august/00-aclItemShelving.sql b/db/changes/10490-august/00-aclItemShelving.sql
new file mode 100644
index 0000000000..3995bbe497
--- /dev/null
+++ b/db/changes/10490-august/00-aclItemShelving.sql
@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('ItemShelving', '*', '*', 'ALLOW', 'ROLE', 'employee');
\ No newline at end of file
diff --git a/db/changes/10490-august/00-aclItemShelvingPlacementSupply copy.sql b/db/changes/10490-august/00-aclItemShelvingPlacementSupply copy.sql
new file mode 100644
index 0000000000..cc589a58f4
--- /dev/null
+++ b/db/changes/10490-august/00-aclItemShelvingPlacementSupply copy.sql	
@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('ItemShelvingPlacementSupplyStock', '*', '*', 'ALLOW', 'ROLE', 'employee');
\ No newline at end of file
diff --git a/modules/item/back/models/item-shelving-placement-supply.json b/modules/item/back/models/item-shelving-placement-supply.json
index 11497b4fc9..a54013e05b 100644
--- a/modules/item/back/models/item-shelving-placement-supply.json
+++ b/modules/item/back/models/item-shelving-placement-supply.json
@@ -7,13 +7,17 @@
         }
     },
     "properties": {
+        "itemShelvingFk": {
+            "type": "number",
+			"id": true
+        },
         "created": {
             "type": "date"
         },
         "itemFk": {
             "type": "number"
         },
-        "concept": {
+        "longName": {
             "type": "string"
         },
         "parking": {
@@ -24,6 +28,9 @@
         },
         "packing": {
             "type": "number"
+        },
+        "stock": {
+            "type": "number"
         }
     }
 }
\ No newline at end of file
diff --git a/modules/item/front/item-shelving/index.html b/modules/item/front/item-shelving/index.html
index 7949e73a3c..115829c8d4 100644
--- a/modules/item/front/item-shelving/index.html
+++ b/modules/item/front/item-shelving/index.html
@@ -1,21 +1,10 @@
 <vn-crud-model
     vn-id="model"
-    url="Defaulters/filter"
-    filter="::$ctrl.filter"
-    limit="20"
-    order="amount DESC"
-    data="defaulters"
+    url="ItemShelvingPlacementSupplyStocks"
+    link="{itemFk: $ctrl.$params.id}"
+    data="itemShelvingPlacementSupplyStocks"
     auto-load="true">
 </vn-crud-model>
-<vn-portal slot="topbar">
-    <vn-searchbar
-        vn-focus
-        placeholder="Search client"
-        info="Search client by id or name"
-        auto-state="false"
-        model="model">
-    </vn-searchbar>
-</vn-portal>
 <vn-card>
     <smart-table 
         model="model"
@@ -34,10 +23,10 @@
             <div class="vn-pa-md">
                 <vn-button 
                     ng-show="$ctrl.checked.length > 0"
-                    ng-click="notesDialog.show()"
-                    name="notesDialog"
-                    vn-tooltip="Add observation"
-                    icon="icon-notes">
+                    ng-click="removeConfirm.show()"
+                    vn-tooltip="Remove selected lines"
+                    vn-acl="replenisherBos"
+                    icon="delete">
                 </vn-button>
             </div>
         </slot-actions>
@@ -50,123 +39,78 @@
                                 model="model">
                             </vn-multi-check>
                         </th>
-                        <th field="clientFk">
+                        <th field="created">
                             <span translate>Created</span>
                         </th>
-                        <th field="salesPersonFk">
+                        <th shrink field="itemFk">
                             <span translate>Item</span>
                         </th>
                         <th 
-                            field="amount" 
-                            vn-tooltip="Balance due">
+                            field="longName">
                             <span translate>Concept</span>
                         </th>
                         <th 
-                            field="workerFk" 
-                            vn-tooltip="Worker who made the last observation">
+                            field="parking">
                             <span translate>Parking</span>
                         </th>
-                        <th field="observation" expand>
+                        <th field="shelving">
                             <span translate>Shelving</span>
                         </th>
                         <th 
-                            vn-tooltip="Last observation date"
-                            field="created">
+                            field="label">
                             <span translate>Etiqueta</span>
                         </th>
                         <th 
-                            field="creditInsurance"
+                            field="packing"
                             shrink>
                             <span translate>Packing</span>
                         </th>
                     </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="defaulter in defaulters">
+                    <tr ng-repeat="itemShelvingPlacementSupplyStock in itemShelvingPlacementSupplyStocks">
                         <td shrink>
                             <vn-check 
-                                ng-model="defaulter.checked"
+                                ng-model="itemShelvingPlacementSupplyStock.checked"
                                 vn-click-stop>
                             </vn-check>
                         </td>
-                        <td title="{{::defaulter.clientName}}">
+                        <td shrink-date>{{::itemShelvingPlacementSupplyStock.created | date: 'dd/MM/yyyy'}}</td>
+                        <td>
+                            {{::itemShelvingPlacementSupplyStock.itemFk}}
+                        </td>
+                        <td expand title="{{::itemShelvingPlacementSupplyStock.longName}}">
                             <span
-                                vn-click-stop="clientDescriptor.show($event, defaulter.clientFk)"
-                                title ="{{::defaulter.clientName}}"
+                                vn-click-stop="itemDescriptor.show($event, itemShelvingPlacementSupplyStock.itemFk)"
                                 class="link">
-                                {{::defaulter.clientName}}
+                                {{itemShelvingPlacementSupplyStock.longName}}
                             </span>
                         </td>
                         <td>
-                            <span
-                                title="{{::defaulter.salesPersonName}}"
-                                vn-click-stop="workerDescriptor.show($event, defaulter.salesPersonFk)"
-                                class="link">
-                                {{::defaulter.salesPersonName | dashIfEmpty}}
-                            </span>
+                            {{::itemShelvingPlacementSupplyStock.parking}}
                         </td>
-                        <td>{{::defaulter.amount | currency: 'EUR': 2}}</td>
                         <td>
-                            <span
-                                title="{{::defaulter.workerName}}"
-                                vn-click-stop="workerDescriptor.show($event, defaulter.workerFk)"
-                                class="link">
-                                {{::defaulter.workerName | dashIfEmpty}}
-                            </span>
+                            {{::itemShelvingPlacementSupplyStock.shelving}}
                         </td>
-                        <td expand>
-                            <vn-textarea
-                                vn-three
-                                disabled="true"
-                                ng-model="defaulter.observation">
-                            </vn-textarea>
+                        <td>
+                            {{::itemShelvingPlacementSupplyStock.label}}
                         </td>
-                        <td shrink-date>
-                            <span class="chip {{::$ctrl.chipColor(defaulter.created)}}">
-                                {{::defaulter.created | date: 'dd/MM/yyyy'}}
-                            </span>
+                        <td>
+                            {{::itemShelvingPlacementSupplyStock.packing}}
                         </td>
-                        <td shrink>{{::defaulter.creditInsurance | currency: 'EUR': 2}}</td>
-                        <td shrink-date>{{::defaulter.defaulterSinced | date: 'dd/MM/yyyy'}}</td>
                     </tr>
                 </tbody>
             </table>
         </slot-table>
     </smart-table>
 </vn-card>
-<vn-client-descriptor-popover
-    vn-id="client-descriptor">
-</vn-client-descriptor-popover>
-<vn-worker-descriptor-popover
-    vn-id="worker-descriptor">
-</vn-worker-descriptor-popover>
-<vn-popup vn-id="dialog-summary-client">
-    <vn-client-summary
-        client="$ctrl.clientSelected">
-    </vn-client-summary>
-</vn-popup>
+<vn-item-descriptor-popover
+    vn-id="item-descriptor">
+</vn-item-descriptor-popover>
 
-<!-- Dialog of add notes button --> 
-<vn-dialog
-    vn-id="notesDialog"
-    on-accept="$ctrl.onResponse()">
-    <tpl-body>
-        <section class="SMSDialog">
-            <h5 class="vn-py-sm">{{$ctrl.$t('Add observation to all selected clients', {total: $ctrl.checked.length})}}</h5>
-            <vn-horizontal>
-                <vn-textarea vn-one
-                    vn-id="message"
-                    label="Message" 
-                    ng-model="$ctrl.defaulter.observation"
-                    rows="3"
-                    required="true"
-                    rule>
-                </vn-textarea>
-            </vn-horizontal>
-        </section>
-    </tpl-body>
-    <tpl-buttons>
-        <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
-        <button response="accept" translate>Save</button>
-    </tpl-buttons>
-</vn-dialog>
+<vn-confirm 
+    vn-id="removeConfirm"
+    message="Selected lines will be deleted"
+    question="Are you sure you want to continue?"
+    on-accept="$ctrl.onRemove()">
+</vn-confirm>
\ No newline at end of file
diff --git a/modules/item/front/item-shelving/index.js b/modules/item/front/item-shelving/index.js
index f51a1a65b5..6fd8825aaf 100644
--- a/modules/item/front/item-shelving/index.js
+++ b/modules/item/front/item-shelving/index.js
@@ -1,11 +1,9 @@
 import ngModule from '../module';
 import Section from 'salix/components/section';
-import UserError from 'core/lib/user-error';
 
 export default class Controller extends Section {
     constructor($element, $) {
         super($element, $);
-        this.defaulter = {};
 
         this.smartTableOptions = {
             activeButtons: {
@@ -13,42 +11,31 @@ export default class Controller extends Section {
             },
             columns: [
                 {
-                    field: 'clientFk',
+                    field: 'parking',
                     autocomplete: {
-                        url: 'Clients',
-                        showField: 'name',
-                        valueField: 'id'
+                        url: 'Parkings',
+                        showField: 'code',
+                        valueField: 'code'
                     }
                 },
                 {
-                    field: 'salesPersonFk',
+                    field: 'shelving',
                     autocomplete: {
-                        url: 'Workers/activeWithInheritedRole',
-                        where: `{role: 'salesPerson'}`,
-                        searchFunction: '{firstName: $search}',
-                        showField: 'name',
-                        valueField: 'id',
+                        url: 'Shelvings',
+                        showField: 'code',
+                        valueField: 'code'
                     }
                 },
-                {
-                    field: 'workerFk',
-                    autocomplete: {
-                        url: 'Workers/activeWithInheritedRole',
-                        searchFunction: '{firstName: $search}',
-                        showField: 'name',
-                        valueField: 'id',
-                    }
-                },
-                {
-                    field: 'observation',
-                    searchable: false
-                },
                 {
                     field: 'created',
                     searchable: false
                 },
                 {
-                    field: 'defaulterSinced',
+                    field: 'itemFk',
+                    searchable: false
+                },
+                {
+                    field: 'longName',
                     searchable: false
                 }
             ]
@@ -58,16 +45,24 @@ export default class Controller extends Section {
     }
 
     get checked() {
-        const clients = this.$.model.data || [];
+        const itemShelvings = this.$.model.data || [];
         const checkedLines = [];
-        for (let defaulter of clients) {
-            if (defaulter.checked)
-                checkedLines.push(defaulter);
+        for (let itemShelving of itemShelvings) {
+            if (itemShelving.checked)
+                checkedLines.push(itemShelving);
         }
 
         return checkedLines;
     }
 
+    get label() {
+        const itemShelvings = this.$.model.data || [];
+        for (let itemShelving of itemShelvings)
+            itemShelving.label = itemShelving.stock / itemShelving.packing;
+
+        return true;
+    }
+
     getBalanceDueTotal() {
         this.$http.get('Defaulters/filter')
             .then(res => {
@@ -80,48 +75,27 @@ export default class Controller extends Section {
             });
     }
 
-    chipColor(date) {
-        const day = 24 * 60 * 60 * 1000;
-        const today = new Date();
-        today.setHours(0, 0, 0, 0);
-
-        const observationShipped = new Date(date);
-        observationShipped.setHours(0, 0, 0, 0);
-
-        const difference = today - observationShipped;
-
-        if (difference > (day * 20))
-            return 'alert';
-        if (difference > (day * 10))
-            return 'warning';
-    }
-
-    onResponse() {
-        if (!this.defaulter.observation)
-            throw new UserError(`The message can't be empty`);
-
+    async onRemove() {
         const params = [];
-        for (let defaulter of this.checked) {
-            params.push({
-                text: this.defaulter.observation,
-                clientFk: defaulter.clientFk
-            });
-        }
+        for (let itemShelving of this.checked)
+            params.push(itemShelving.itemShelvingFk);
 
-        this.$http.post(`ClientObservations`, params) .then(() => {
-            this.vnApp.showMessage(this.$t('Observation saved!'));
-            this.$state.reload();
-        });
+        for (let id of params) {
+            await this.$http.delete(`ItemShelvings/${id}`)
+                .then(() => {
+                    this.vnApp.showSuccess(this.$t('ItemShelving removed'));
+                    this.$state.reload();
+                });
+        }
     }
 
     exprBuilder(param, value) {
         switch (param) {
-        case 'creditInsurance':
-        case 'amount':
-        case 'clientFk':
-        case 'workerFk':
-        case 'salesPersonFk':
-            return {[`d.${param}`]: value};
+        case 'parking':
+        case 'shelving':
+        case 'label':
+        case 'packing':
+            return {[param]: value};
         }
     }
 }
diff --git a/modules/item/front/item-shelving/locale/es.yml b/modules/item/front/item-shelving/locale/es.yml
index c3e1d4e19c..00b6ffe58d 100644
--- a/modules/item/front/item-shelving/locale/es.yml
+++ b/modules/item/front/item-shelving/locale/es.yml
@@ -1,9 +1,3 @@
-Add observation: Añadir observación
-Add observation to all selected clients: Añadir observación a {{total}} cliente(s) seleccionado(s)
-Balance D.: Saldo V.
-Credit I.: Crédito A.
-Last observation: Última observación
-L. O. Date: Fecha Ú. O.
-Last observation date: Fecha última observación
-Search client: Buscar clientes
-Worker who made the last observation: Trabajador que ha realizado la última observación
\ No newline at end of file
+Shelving: Matrícula
+Remove selected lines: Eliminar líneas seleccionadas
+Selected lines will be deleted: Las líneas seleccionadas serán eliminadas
\ No newline at end of file

From 1165e050eb74cee4bc1e76fc9408ecd2de2b4753 Mon Sep 17 00:00:00 2001
From: Pau Navarro <pau@verdnatura.es>
Date: Thu, 6 Oct 2022 10:18:08 +0200
Subject: [PATCH 08/71] feat: workerDisableExcluded update DB field

---
 .../methods/worker/workerDisableExcluded.js   | 30 +++++++++++++
 .../worker/workerExcludeFromDisable.js        | 45 +++++++++++++++++++
 .../workerDisableExclueded/checkExcluded.js   | 26 -----------
 modules/worker/back/models/worker.js          |  2 +
 .../back/models/workerDisableExcluded.json    |  5 ++-
 modules/worker/front/descriptor/index.html    | 21 +++++----
 modules/worker/front/descriptor/index.js      | 24 +++++++---
 7 files changed, 112 insertions(+), 41 deletions(-)
 create mode 100644 modules/worker/back/methods/worker/workerDisableExcluded.js
 create mode 100644 modules/worker/back/methods/worker/workerExcludeFromDisable.js
 delete mode 100644 modules/worker/back/methods/workerDisableExclueded/checkExcluded.js

diff --git a/modules/worker/back/methods/worker/workerDisableExcluded.js b/modules/worker/back/methods/worker/workerDisableExcluded.js
new file mode 100644
index 0000000000..017e044c25
--- /dev/null
+++ b/modules/worker/back/methods/worker/workerDisableExcluded.js
@@ -0,0 +1,30 @@
+
+module.exports = Self => {
+    Self.remoteMethod('workerDisableExcluded', {
+        description: 'Check if the worker can be disabled',
+        accessType: 'READ',
+        accepts: {
+            arg: 'id',
+            type: 'Number',
+            required: true,
+            description: `The worker id`,
+            http: {source: 'path'}
+        },
+        returns: {
+            type: 'boolean',
+            root: true
+        },
+        http: {
+            path: `/workerDisableExcluded/:id`,
+            verb: 'GET'
+        }
+    });
+
+    Self.workerDisableExcluded = async id => {
+        let result;
+        const query = `Select * from vn.workerDisableExcluded where workerFk like ${id}`;
+        let sqlResult = await Self.rawSql(query);
+        sqlResult.length == 0 ? result = false : result = true;
+        return result;
+    };
+};
diff --git a/modules/worker/back/methods/worker/workerExcludeFromDisable.js b/modules/worker/back/methods/worker/workerExcludeFromDisable.js
new file mode 100644
index 0000000000..86d940862d
--- /dev/null
+++ b/modules/worker/back/methods/worker/workerExcludeFromDisable.js
@@ -0,0 +1,45 @@
+module.exports = Self => {
+    Self.remoteMethod('workerExcludeFromDisable', {
+        description: 'Change the status of the worker between can be disabled and cant be disabled',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'id',
+            type: 'Number',
+            required: true,
+            description: `The worker id`,
+            http: {source: 'path'}
+        },
+        {
+            arg: 'currValue',
+            type: 'Boolean',
+            required: true,
+            description: `The current value of workerDisableExcluded`,
+            http: {source: 'path'}
+        }],
+        returns: {
+            type: 'boolean',
+            root: true
+        },
+        http: {
+            path: `/workerExcludeFromDisable/:id/:currValue`,
+            verb: 'GET'
+        }
+    });
+
+    Self.workerExcludeFromDisable = async(id, currValue) => {
+        const models = Self.app.models;
+
+        if (!currValue) {
+            await models.WorkerDisableExcluded.create({
+                workerFk: id,
+                dated: new Date()
+            });
+        } else {
+            await models.WorkerDisableExcluded.remove({
+                workerFk: id
+            });
+        }
+
+        return false;
+    };
+};
diff --git a/modules/worker/back/methods/workerDisableExclueded/checkExcluded.js b/modules/worker/back/methods/workerDisableExclueded/checkExcluded.js
deleted file mode 100644
index 32260c01f1..0000000000
--- a/modules/worker/back/methods/workerDisableExclueded/checkExcluded.js
+++ /dev/null
@@ -1,26 +0,0 @@
-
-module.exports = Self => {
-    Self.remoteMethod('workerDisableExcluded', {
-        description: 'Check an email inbox and process it',
-        accessType: 'READ',
-        accepts: {
-            arg: 'workerFk',
-            type: 'Number',
-            required: true,
-            description: `The worker id`
-        },
-        returns: {
-            type: ['Object'],
-            root: true
-        },
-        http: {
-            path: `/workerDisableExcluded`,
-            verb: 'GET'
-        }
-    });
-
-    Self.workerDisableExcluded = workerFk => {
-        console.log(workerFk);
-        return 'tests123';
-    };
-};
diff --git a/modules/worker/back/models/worker.js b/modules/worker/back/models/worker.js
index ec6c4af282..c90729779a 100644
--- a/modules/worker/back/models/worker.js
+++ b/modules/worker/back/models/worker.js
@@ -13,4 +13,6 @@ module.exports = Self => {
     require('../methods/worker/contracts')(Self);
     require('../methods/worker/holidays')(Self);
     require('../methods/worker/activeContract')(Self);
+    require('../methods/worker/workerDisableExcluded')(Self);
+    require('../methods/worker/workerExcludeFromDisable')(Self);
 };
diff --git a/modules/worker/back/models/workerDisableExcluded.json b/modules/worker/back/models/workerDisableExcluded.json
index eeffb4b15d..cfa810e437 100644
--- a/modules/worker/back/models/workerDisableExcluded.json
+++ b/modules/worker/back/models/workerDisableExcluded.json
@@ -7,9 +7,12 @@
 		}
 	},
 	"properties": {
-		"id": {
+		"workerFk": {
 			"id": true,
 			"type": "number"
+		},
+		"dated": {
+			"type": "date"
 		}
 	},
 	"acls": [
diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html
index 0616f179fd..d3caa78a80 100644
--- a/modules/worker/front/descriptor/index.html
+++ b/modules/worker/front/descriptor/index.html
@@ -15,14 +15,19 @@
         </div>
     </slot-before>
     <slot-menu>
-        <label class="vn-item">
-            <!--
-            <input ng-if="$ctrl.isExcluded()" type="checkbox" id="canBeDisabled" disabled checked>
-            <input ng-if="!$ctrl.isExcluded()" type="checkbox" id="canBeDisabled" disabled>
-            -->
-
-            <p>{{$ctrl.isExcluded()}}</p>
-        </label>       
+         <!--ng-if="!$ctrl.canBeExcluded"-->
+         <vn-item
+            ng-click="$ctrl.setExcluded()"
+            translate
+            ng-if="!$ctrl.excluded">
+            Marcar para no deshabilitar
+        </vn-item>
+        <vn-item
+            ng-click="$ctrl.setExcluded()"
+            translate
+            ng-if="$ctrl.excluded">
+            Marcar como deshabilitable
+        </vn-item>
     </slot-menu>
     <slot-body>
         <div class="attributes">
diff --git a/modules/worker/front/descriptor/index.js b/modules/worker/front/descriptor/index.js
index e1026382df..2f79c2d807 100644
--- a/modules/worker/front/descriptor/index.js
+++ b/modules/worker/front/descriptor/index.js
@@ -5,6 +5,7 @@ class Controller extends Descriptor {
     constructor($element, $, $rootScope) {
         super($element, $);
         this.$rootScope = $rootScope;
+        this.canBeExcluded();
     }
 
     get worker() {
@@ -15,12 +16,23 @@ class Controller extends Descriptor {
         this.entity = value;
     }
 
-    async isExcluded() {
-        // eslint-disable-next-line no-console
-        console.log(this.entity);
-        let excluded = await this.$http.get(`workerDisableExcluded`);
-        // eslint-disable-next-line no-console
-        console.log(excluded);
+    get excluded() {
+        return this.entity.excluded;
+    }
+
+    set excluded(value) {
+        this.entity.excluded = value;
+    }
+
+    async canBeExcluded() {
+        await new Promise(r => setTimeout(r, 1000));
+        let data = await this.$http.get(`Workers/workerDisableExcluded/${this.entity.id}`);
+        this.excluded = data.data;
+    }
+
+    async setExcluded() {
+        await this.$http.get(`Workers/workerExcludeFromDisable/${this.entity.id}/${this.entity.excluded}`);
+        this.canBeExcluded();
     }
 
     loadData() {

From a3a432c753c19d263d642c379aa1d7c4977b3a6e Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Thu, 6 Oct 2022 10:18:19 +0200
Subject: [PATCH 09/71] fix: delete one or more expeditions

---
 modules/ticket/front/expedition/index.html    | 11 ++++++-----
 modules/ticket/front/expedition/index.js      | 14 ++++++++++++++
 modules/ticket/front/expedition/locale/es.yml |  3 ++-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html
index 694b3eb33c..caef67f59e 100644
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@@ -17,8 +17,9 @@
                     ng-show="$ctrl.totalChecked">
                 </vn-button>
                 <vn-button 
+                    ng-show="$ctrl.checked.length > 0"
+                    ng-click="removeConfirm.show()"
                     icon="delete"
-                    ng-click="deleteExpedition.show(expedition.id)"
                     vn-tooltip="Delete expedition">
                 </vn-button>
             </vn-tool-bar>
@@ -88,11 +89,11 @@
 <vn-worker-descriptor-popover 
     vn-id="worker-descriptor">
 </vn-worker-descriptor-popover>
-<vn-confirm
-    vn-id="delete-expedition"
-    on-accept="$ctrl.onDialogAccept($data)"
+<vn-confirm 
+    vn-id="removeConfirm"
+    message="Are you sure you want to delete this expedition?"
     question="Delete expedition"
-    message="Are you sure you want to delete this expedition?">
+    on-accept="$ctrl.onRemove()">
 </vn-confirm>
  
 <vn-popup vn-id="statusLog">
diff --git a/modules/ticket/front/expedition/index.js b/modules/ticket/front/expedition/index.js
index d80c8e812b..1525f97b5d 100644
--- a/modules/ticket/front/expedition/index.js
+++ b/modules/ticket/front/expedition/index.js
@@ -27,6 +27,20 @@ class Controller extends Section {
         return this.checked.length;
     }
 
+    async onRemove() {
+        const params = [];
+        for (let expedition of this.checked)
+            params.push(expedition.id);
+
+        for (let id of params) {
+            await this.$http.delete(`Expeditions/${id}`)
+                .then(() => {
+                    this.vnApp.showSuccess(this.$t('Expedition removed'));
+                    this.$state.reload();
+                });
+        }
+    }
+
     createTicket(routeFk) {
         const tomorrow = new Date();
         const params = {
diff --git a/modules/ticket/front/expedition/locale/es.yml b/modules/ticket/front/expedition/locale/es.yml
index d23cf25af3..9c7872fd70 100644
--- a/modules/ticket/front/expedition/locale/es.yml
+++ b/modules/ticket/front/expedition/locale/es.yml
@@ -1 +1,2 @@
-Status log: Hitorial de estados
\ No newline at end of file
+Status log: Hitorial de estados
+Expedition removed: Expedición eliminada
\ No newline at end of file

From 37601934f579e55668e5b2eae07e9b68e95a3e81 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Thu, 6 Oct 2022 11:40:46 +0200
Subject: [PATCH 10/71] feat: first option to delete and update

---
 modules/ticket/front/expedition/index.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/ticket/front/expedition/index.js b/modules/ticket/front/expedition/index.js
index 1525f97b5d..4f7b34e7cb 100644
--- a/modules/ticket/front/expedition/index.js
+++ b/modules/ticket/front/expedition/index.js
@@ -42,17 +42,25 @@ class Controller extends Section {
     }
 
     createTicket(routeFk) {
-        const tomorrow = new Date();
-        const params = {
+        const date = new Date(); // esta fecha hay que preguntarla a Fran Monsalvez
+        const ticketParams = {
             clientId: this.ticket.clientFk,
-            landed: tomorrow.getDay() + 1,
+            landed: date,
             addressId: this.ticket.addressFk,
             agencyModeId: this.ticket.agencyModeFk,
             warehouseId: this.ticket.warehouseFk
         };
         const query = `Tickets/new`;
-        this.$http.post(query, params).then(res => {
+        this.$http.post(query, ticketParams).then(res => {
             if (routeFk) this.$http.patch(`Tickets/${res.data.id}`, {routeFk: routeFk});
+
+            const params = [];
+            for (let expedition of this.checked)
+                params.push(expedition.id);
+            const expeditionParams = {ticketFk: res.data.id};
+            for (let id of params)
+                this.$http.patch(`Expeditions/${id}`, expeditionParams);
+
             this.vnApp.showSuccess(this.$t('Data saved!'));
             this.$state.go('ticket.card.summary', {id: res.data.id});
         });

From 3376293d1a60e4732346c5eb2e26f81b5e20d62c Mon Sep 17 00:00:00 2001
From: Pau Navarro <pau@verdnatura.es>
Date: Thu, 6 Oct 2022 11:54:14 +0200
Subject: [PATCH 11/71] Added user icon and fixed icon not updating

---
 modules/worker/front/descriptor/index.html | 7 +++++++
 modules/worker/front/descriptor/index.js   | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html
index d3caa78a80..c60801bb98 100644
--- a/modules/worker/front/descriptor/index.html
+++ b/modules/worker/front/descriptor/index.html
@@ -52,6 +52,13 @@
                 value="{{$ctrl.worker.sip.extension}}">
             </vn-label-value>
         </div>
+        <div class="icons">
+            <vn-icon
+                vn-tooltip="Fijado para no deshabilitar"
+                icon="person"
+                ng-if="$ctrl.worker.excluded">
+            </vn-icon>
+        </div>
         <div class="quicklinks">
             <div ng-transclude="btnOne">
                 <vn-quick-link
diff --git a/modules/worker/front/descriptor/index.js b/modules/worker/front/descriptor/index.js
index 2f79c2d807..7a3922a089 100644
--- a/modules/worker/front/descriptor/index.js
+++ b/modules/worker/front/descriptor/index.js
@@ -22,17 +22,18 @@ class Controller extends Descriptor {
 
     set excluded(value) {
         this.entity.excluded = value;
+        this.$rootScope.$apply();
     }
 
     async canBeExcluded() {
-        await new Promise(r => setTimeout(r, 1000));
+        await new Promise(r => setTimeout(r, 500));
         let data = await this.$http.get(`Workers/workerDisableExcluded/${this.entity.id}`);
         this.excluded = data.data;
     }
 
     async setExcluded() {
         await this.$http.get(`Workers/workerExcludeFromDisable/${this.entity.id}/${this.entity.excluded}`);
-        this.canBeExcluded();
+        this.excluded = !this.entity.excluded;
     }
 
     loadData() {

From deb8a00dfb2edbd5d3a2a2e84caec89679cce5ad Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Fri, 7 Oct 2022 10:47:54 +0200
Subject: [PATCH 12/71] feat: add backRoutes

---
 .../methods/expedition/deleteExpeditions.js   | 48 +++++++++++++++
 .../methods/expedition/moveExpeditions.js     | 59 +++++++++++++++++++
 modules/ticket/back/models/expedition.js      |  2 +
 modules/ticket/front/expedition/index.html    |  4 +-
 modules/ticket/front/expedition/index.js      | 35 +++++------
 modules/ticket/front/expedition/locale/es.yml |  5 +-
 6 files changed, 130 insertions(+), 23 deletions(-)
 create mode 100644 modules/ticket/back/methods/expedition/deleteExpeditions.js
 create mode 100644 modules/ticket/back/methods/expedition/moveExpeditions.js

diff --git a/modules/ticket/back/methods/expedition/deleteExpeditions.js b/modules/ticket/back/methods/expedition/deleteExpeditions.js
new file mode 100644
index 0000000000..b902b9f0c5
--- /dev/null
+++ b/modules/ticket/back/methods/expedition/deleteExpeditions.js
@@ -0,0 +1,48 @@
+
+module.exports = Self => {
+    Self.remoteMethod('deleteExpeditions', {
+        description: 'Delete the selected expeditions',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'expeditionsIds',
+            type: ['number'],
+            required: true,
+            description: 'The expeditions ids to delete'
+        }],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/deleteExpeditions`,
+            verb: 'POST'
+        }
+    });
+
+    Self.deleteExpeditions = async(expeditionsIds, options) => {
+        const models = Self.app.models;
+        const myOptions = {};
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            const deletedExpeditions = await models.Expedition.destroyAll({
+                id: {inq: expeditionsIds}
+            }, myOptions);
+
+            if (tx) await tx.commit();
+
+            return deletedExpeditions;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};
diff --git a/modules/ticket/back/methods/expedition/moveExpeditions.js b/modules/ticket/back/methods/expedition/moveExpeditions.js
new file mode 100644
index 0000000000..2c521dda7c
--- /dev/null
+++ b/modules/ticket/back/methods/expedition/moveExpeditions.js
@@ -0,0 +1,59 @@
+
+module.exports = Self => {
+    Self.remoteMethod('moveExpeditions', {
+        description: 'Move the selected expeditions to another ticket',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'expeditionsIds',
+            type: ['number'],
+            required: true,
+            description: 'The expeditions ids to nove'
+        },
+        {
+            arg: 'ticketId',
+            type: 'number',
+            required: true,
+            description: 'the ticket id to which the expeditions are added'
+        }],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/moveExpeditions`,
+            verb: 'POST'
+        }
+    });
+
+    Self.moveExpeditions = async(expeditionsIds, ticketId, options) => {
+        const models = Self.app.models;
+        const myOptions = {};
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            const promises = [];
+            for (let expeditionsId of expeditionsIds) {
+                const expeditionToUpdate = await models.Expedition.findById(expeditionsId);
+                const expeditionUpdated = expeditionToUpdate.updateAttribute('ticketFk', ticketId, myOptions);
+                promises.push(expeditionUpdated);
+            }
+
+            const updated = await Promise.all(promises);
+
+            if (tx) await tx.commit();
+
+            return updated;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};
diff --git a/modules/ticket/back/models/expedition.js b/modules/ticket/back/models/expedition.js
index 9d65643737..46cde68902 100644
--- a/modules/ticket/back/models/expedition.js
+++ b/modules/ticket/back/models/expedition.js
@@ -1,3 +1,5 @@
 module.exports = function(Self) {
     require('../methods/expedition/filter')(Self);
+    require('../methods/expedition/deleteExpeditions')(Self);
+    require('../methods/expedition/moveExpeditions')(Self);
 };
diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html
index caef67f59e..35f56872c2 100644
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@@ -14,10 +14,10 @@
                 <vn-button icon="keyboard_arrow_down"
                     label="Move"
                     ng-click="moreOptions.show($event)"
-                    ng-show="$ctrl.totalChecked">
+                    disabled="!$ctrl.totalChecked">
                 </vn-button>
                 <vn-button 
-                    ng-show="$ctrl.checked.length > 0"
+                    disabled="!$ctrl.checked.length"
                     ng-click="removeConfirm.show()"
                     icon="delete"
                     vn-tooltip="Delete expedition">
diff --git a/modules/ticket/front/expedition/index.js b/modules/ticket/front/expedition/index.js
index 4f7b34e7cb..a81439d644 100644
--- a/modules/ticket/front/expedition/index.js
+++ b/modules/ticket/front/expedition/index.js
@@ -17,7 +17,7 @@ class Controller extends Section {
         const checkedRows = [];
         for (let row of rows) {
             if (row.checked)
-                checkedRows.push(row);
+                checkedRows.push(row.id);
         }
 
         return checkedRows;
@@ -27,18 +27,14 @@ class Controller extends Section {
         return this.checked.length;
     }
 
-    async onRemove() {
-        const params = [];
-        for (let expedition of this.checked)
-            params.push(expedition.id);
-
-        for (let id of params) {
-            await this.$http.delete(`Expeditions/${id}`)
-                .then(() => {
-                    this.vnApp.showSuccess(this.$t('Expedition removed'));
-                    this.$state.reload();
-                });
-        }
+    onRemove() {
+        const params = {expeditionsIds: this.checked};
+        const query = `Expeditions/deleteExpeditions`;
+        this.$http.post(query, params)
+            .then(() => {
+                this.vnApp.showSuccess(this.$t('Expedition removed'));
+                this.$state.reload();
+            });
     }
 
     createTicket(routeFk) {
@@ -54,13 +50,12 @@ class Controller extends Section {
         this.$http.post(query, ticketParams).then(res => {
             if (routeFk) this.$http.patch(`Tickets/${res.data.id}`, {routeFk: routeFk});
 
-            const params = [];
-            for (let expedition of this.checked)
-                params.push(expedition.id);
-            const expeditionParams = {ticketFk: res.data.id};
-            for (let id of params)
-                this.$http.patch(`Expeditions/${id}`, expeditionParams);
-
+            const params = {
+                expeditionsIds: this.checked,
+                ticketId: res.data.id
+            };
+            const query = `Expeditions/moveExpeditions`;
+            this.$http.post(query, params);
             this.vnApp.showSuccess(this.$t('Data saved!'));
             this.$state.go('ticket.card.summary', {id: res.data.id});
         });
diff --git a/modules/ticket/front/expedition/locale/es.yml b/modules/ticket/front/expedition/locale/es.yml
index 9c7872fd70..bc3ec33455 100644
--- a/modules/ticket/front/expedition/locale/es.yml
+++ b/modules/ticket/front/expedition/locale/es.yml
@@ -1,2 +1,5 @@
 Status log: Hitorial de estados
-Expedition removed: Expedición eliminada
\ No newline at end of file
+Expedition removed: Expedición eliminada
+Move: Mover
+New ticket without route: Nuevo ticket sin ruta
+New ticket with route: Nuevo ticket con ruta
\ No newline at end of file

From bb26fa6502232335c784f9fb101a381bf4f1be39 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Fri, 7 Oct 2022 13:49:42 +0200
Subject: [PATCH 13/71] feat: add tFront

---
 modules/ticket/front/expedition/index.js      | 23 ++++----
 modules/ticket/front/expedition/index.spec.js | 58 +++++++++++++++++++
 2 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/modules/ticket/front/expedition/index.js b/modules/ticket/front/expedition/index.js
index a81439d644..f7674716b1 100644
--- a/modules/ticket/front/expedition/index.js
+++ b/modules/ticket/front/expedition/index.js
@@ -2,16 +2,6 @@ import ngModule from '../module';
 import Section from 'salix/components/section';
 
 class Controller extends Section {
-    onDialogAccept(id) {
-        return this.$http.delete(`Expeditions/${id}`)
-            .then(() => this.$.model.refresh());
-    }
-
-    showLog(expedition) {
-        this.expedition = expedition;
-        this.$.statusLog.show();
-    }
-
     get checked() {
         const rows = this.$.model.data || [];
         const checkedRows = [];
@@ -27,13 +17,23 @@ class Controller extends Section {
         return this.checked.length;
     }
 
+    onDialogAccept(id) {
+        return this.$http.delete(`Expeditions/${id}`)
+            .then(() => this.$.model.refresh());
+    }
+
+    showLog(expedition) {
+        this.expedition = expedition;
+        this.$.statusLog.show();
+    }
+
     onRemove() {
         const params = {expeditionsIds: this.checked};
         const query = `Expeditions/deleteExpeditions`;
         this.$http.post(query, params)
             .then(() => {
                 this.vnApp.showSuccess(this.$t('Expedition removed'));
-                this.$state.reload();
+                this.$.model.refresh();
             });
     }
 
@@ -49,7 +49,6 @@ class Controller extends Section {
         const query = `Tickets/new`;
         this.$http.post(query, ticketParams).then(res => {
             if (routeFk) this.$http.patch(`Tickets/${res.data.id}`, {routeFk: routeFk});
-
             const params = {
                 expeditionsIds: this.checked,
                 ticketId: res.data.id
diff --git a/modules/ticket/front/expedition/index.spec.js b/modules/ticket/front/expedition/index.spec.js
index 586ef21096..fe23046ce2 100644
--- a/modules/ticket/front/expedition/index.spec.js
+++ b/modules/ticket/front/expedition/index.spec.js
@@ -17,6 +17,14 @@ describe('Ticket', () => {
                 refresh: () => {}
             };
             controller = $componentController('vnTicketExpedition', {$element: null, $scope});
+            controller.$.model.data = [
+                {id: 1},
+                {id: 2},
+                {id: 3}
+            ];
+            const modelData = controller.$.model.data;
+            modelData[0].checked = true;
+            modelData[1].checked = true;
         }));
 
         describe('onDialogAccept()', () => {
@@ -50,5 +58,55 @@ describe('Ticket', () => {
                 expect(controller.$.statusLog.show).toHaveBeenCalledWith();
             });
         });
+
+        describe('onRemove()', () => {
+            it('should make a query and then call to the model refresh() method', () => {
+                jest.spyOn($scope.model, 'refresh');
+
+                const expectedParams = {expeditionsIds: [1, 2]};
+                $httpBackend.expect('POST', 'Expeditions/deleteExpeditions', expectedParams).respond(200);
+                controller.onRemove();
+                $httpBackend.flush();
+
+                expect($scope.model.refresh).toHaveBeenCalledWith();
+            });
+        });
+
+        describe('createTicket()', () => {
+            it('should make a query and then call to the $state go() method', () => {
+                jest.spyOn(controller.$state, 'go').mockReturnThis();
+
+                const ticket = {
+                    clientFk: 1101,
+                    landed: new Date(),
+                    addressFk: 121,
+                    agencyModeFk: 1,
+                    warehouseFk: 1
+                };
+                controller.ticket = ticket;
+
+                const expectedTicket = {
+                    clientId: 1101,
+                    landed: new Date(),
+                    addressId: 121,
+                    agencyModeId: 1,
+                    warehouseId: 1
+                };
+
+                const ticketIdToTransfer = 28;
+                const expectedResponse = {id: ticketIdToTransfer};
+
+                const expectedParams = {
+                    expeditionsIds: [1, 2],
+                    ticketId: 28
+                };
+                $httpBackend.expect('POST', 'Tickets/new', expectedTicket).respond(expectedResponse);
+                $httpBackend.expect('POST', 'Expeditions/moveExpeditions', expectedParams).respond(200);
+                controller.createTicket();
+                $httpBackend.flush();
+
+                expect(controller.$state.go).toHaveBeenCalledWith('ticket.card.summary', {id: ticketIdToTransfer});
+            });
+        });
     });
 });

From 843f67919c9992e7e622f01b8dcfca7697fd81b3 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Mon, 10 Oct 2022 12:56:03 +0200
Subject: [PATCH 14/71] feat: add backTest

---
 .../specs/deleteExpeditions.spec.js           | 22 ++++++++++++++++++
 .../expedition/specs/moveExpeditions.spec.js  | 23 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 modules/ticket/back/methods/expedition/specs/deleteExpeditions.spec.js
 create mode 100644 modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js

diff --git a/modules/ticket/back/methods/expedition/specs/deleteExpeditions.spec.js b/modules/ticket/back/methods/expedition/specs/deleteExpeditions.spec.js
new file mode 100644
index 0000000000..0a47c78da1
--- /dev/null
+++ b/modules/ticket/back/methods/expedition/specs/deleteExpeditions.spec.js
@@ -0,0 +1,22 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('ticket deleteExpeditions()', () => {
+    it('should delete the selected expeditions', async() => {
+        const tx = await models.Expedition.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const expeditionIds = [12, 13];
+            const result = await models.Expedition.deleteExpeditions(expeditionIds, options);
+
+            expect(result.count).toEqual(2);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});
+
diff --git a/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js b/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
new file mode 100644
index 0000000000..0bb402a558
--- /dev/null
+++ b/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
@@ -0,0 +1,23 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('ticket moveExpeditions()', () => {
+    it('should delete the selected expeditions', async() => {
+        const tx = await models.Expedition.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const expeditionIds = [12, 13];
+            const ticketId = 1;
+            const result = await models.Expedition.moveExpeditions(expeditionIds, ticketId, options);
+
+            expect(result.length).toEqual(2);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});
+

From ea1714240e63f97bd91a9de75d3ca8463c88de17 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Mon, 10 Oct 2022 13:45:34 +0200
Subject: [PATCH 15/71] fix: test e2e

---
 e2e/helpers/selectors.js                           | 3 ++-
 e2e/paths/05-ticket/02_expeditions_and_log.spec.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index fedcaf5f95..97a58ba9c1 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -596,7 +596,8 @@ export default {
         submitNotesButton: 'button[type=submit]'
     },
     ticketExpedition: {
-        thirdExpeditionRemoveButton: 'vn-ticket-expedition vn-table div > vn-tbody > vn-tr:nth-child(3) > vn-td:nth-child(1) > vn-icon-button[icon="delete"]',
+        thirdSaleCheckbox: 'vn-ticket-expedition vn-tr:nth-child(3) vn-check[ng-model="expedition.checked"]',
+        deleteExpeditionButton: 'vn-ticket-expedition vn-tool-bar > vn-button[icon="delete"]',
         expeditionRow: 'vn-ticket-expedition vn-table vn-tbody > vn-tr'
     },
     ticketPackages: {
diff --git a/e2e/paths/05-ticket/02_expeditions_and_log.spec.js b/e2e/paths/05-ticket/02_expeditions_and_log.spec.js
index dd2525f439..f970247e51 100644
--- a/e2e/paths/05-ticket/02_expeditions_and_log.spec.js
+++ b/e2e/paths/05-ticket/02_expeditions_and_log.spec.js
@@ -18,7 +18,8 @@ describe('Ticket expeditions and log path', () => {
     });
 
     it(`should delete a former expedition and confirm the remaining expedition are the expected ones`, async() => {
-        await page.waitToClick(selectors.ticketExpedition.thirdExpeditionRemoveButton);
+        await page.waitToClick(selectors.ticketExpedition.thirdSaleCheckbox);
+        await page.waitToClick(selectors.ticketExpedition.deleteExpeditionButton);
         await page.waitToClick(selectors.globalItems.acceptButton);
         await page.reloadSection('ticket.card.expedition');
 

From 9c52508a88a20d1d5d827b3c8c3e4d08494b32d0 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Tue, 11 Oct 2022 08:40:22 +0200
Subject: [PATCH 16/71] feat: add total labels

---
 .../00-aclItemShelving.sql                    |  0
 .../00-aclItemShelvingPlacementSupply.sql}    |  0
 .../00-itemType.sql                           |  0
 .../item-shelving/deleteItemShelvings.js      | 47 +++++++++++++++++++
 .../specs/deleteItemShelvings.spec.js         | 21 +++++++++
 modules/item/back/models/item-shelving.js     |  3 ++
 modules/item/front/item-shelving/index.html   | 18 +++----
 modules/item/front/item-shelving/index.js     | 45 ++++++------------
 .../item/front/item-shelving/locale/es.yml    |  4 +-
 9 files changed, 98 insertions(+), 40 deletions(-)
 rename db/changes/{10490-august => 10491-august}/00-aclItemShelving.sql (100%)
 rename db/changes/{10490-august/00-aclItemShelvingPlacementSupply copy.sql => 10491-august/00-aclItemShelvingPlacementSupply.sql} (100%)
 rename db/changes/{10480-june => 10491-august}/00-itemType.sql (100%)
 create mode 100644 modules/item/back/methods/item-shelving/deleteItemShelvings.js
 create mode 100644 modules/item/back/methods/item-shelving/specs/deleteItemShelvings.spec.js
 create mode 100644 modules/item/back/models/item-shelving.js

diff --git a/db/changes/10490-august/00-aclItemShelving.sql b/db/changes/10491-august/00-aclItemShelving.sql
similarity index 100%
rename from db/changes/10490-august/00-aclItemShelving.sql
rename to db/changes/10491-august/00-aclItemShelving.sql
diff --git a/db/changes/10490-august/00-aclItemShelvingPlacementSupply copy.sql b/db/changes/10491-august/00-aclItemShelvingPlacementSupply.sql
similarity index 100%
rename from db/changes/10490-august/00-aclItemShelvingPlacementSupply copy.sql
rename to db/changes/10491-august/00-aclItemShelvingPlacementSupply.sql
diff --git a/db/changes/10480-june/00-itemType.sql b/db/changes/10491-august/00-itemType.sql
similarity index 100%
rename from db/changes/10480-june/00-itemType.sql
rename to db/changes/10491-august/00-itemType.sql
diff --git a/modules/item/back/methods/item-shelving/deleteItemShelvings.js b/modules/item/back/methods/item-shelving/deleteItemShelvings.js
new file mode 100644
index 0000000000..0b58970d83
--- /dev/null
+++ b/modules/item/back/methods/item-shelving/deleteItemShelvings.js
@@ -0,0 +1,47 @@
+module.exports = Self => {
+    Self.remoteMethod('deleteItemShelvings', {
+        description: 'Deletes the selected orders',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'itemShelvingIds',
+            type: ['number'],
+            required: true,
+            description: 'The itemShelving ids to delete'
+        }],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/deleteItemShelvings`,
+            verb: 'POST'
+        }
+    });
+
+    Self.deleteItemShelvings = async(itemShelvingIds, options) => {
+        const models = Self.app.models;
+        const myOptions = {};
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            const deletedItemShelvings = await models.ItemShelving.destroyAll({
+                id: {inq: itemShelvingIds}
+            }, myOptions);
+
+            if (tx) await tx.commit();
+
+            return deletedItemShelvings;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};
diff --git a/modules/item/back/methods/item-shelving/specs/deleteItemShelvings.spec.js b/modules/item/back/methods/item-shelving/specs/deleteItemShelvings.spec.js
new file mode 100644
index 0000000000..a152b59815
--- /dev/null
+++ b/modules/item/back/methods/item-shelving/specs/deleteItemShelvings.spec.js
@@ -0,0 +1,21 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('ItemShelving deleteItemShelvings()', () => {
+    it('should return the deleted itemShelvings', async() => {
+        const tx = await models.Order.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const itemShelvingIds = [1, 2];
+            const result = await models.ItemShelving.deleteItemShelvings(itemShelvingIds, options);
+
+            expect(result.count).toEqual(2);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});
diff --git a/modules/item/back/models/item-shelving.js b/modules/item/back/models/item-shelving.js
new file mode 100644
index 0000000000..5f372a3be4
--- /dev/null
+++ b/modules/item/back/models/item-shelving.js
@@ -0,0 +1,3 @@
+module.exports = Self => {
+    require('../methods/item-shelving/deleteItemShelvings')(Self);
+};
diff --git a/modules/item/front/item-shelving/index.html b/modules/item/front/item-shelving/index.html
index 115829c8d4..fa7a705440 100644
--- a/modules/item/front/item-shelving/index.html
+++ b/modules/item/front/item-shelving/index.html
@@ -2,7 +2,7 @@
     vn-id="model"
     url="ItemShelvingPlacementSupplyStocks"
     link="{itemFk: $ctrl.$params.id}"
-    data="itemShelvingPlacementSupplyStocks"
+    data="$ctrl.itemShelvingPlacementSupplyStocks"
     auto-load="true">
 </vn-crud-model>
 <vn-card>
@@ -15,18 +15,18 @@
                 <div class="totalBox" style="text-align: center;">
                     <h6 translate>Total</h6>
                     <vn-label-value 
-                        label="Balance due" 
-                        value="{{$ctrl.balanceDueTotal | currency: 'EUR': 2}}">
+                        label="Total labels" 
+                        value="{{$ctrl.labelTotal.toFixed(2)}}">
                     </vn-label-value>
                 </div>
             </div>
             <div class="vn-pa-md">
                 <vn-button 
-                    ng-show="$ctrl.checked.length > 0"
+                    disabled="!$ctrl.checked.length"
                     ng-click="removeConfirm.show()"
+                    icon="delete"
                     vn-tooltip="Remove selected lines"
-                    vn-acl="replenisherBos"
-                    icon="delete">
+                    vn-acl="replenisherBos">
                 </vn-button>
             </div>
         </slot-actions>
@@ -68,7 +68,9 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="itemShelvingPlacementSupplyStock in itemShelvingPlacementSupplyStocks">
+                    <tr 
+                        ng-repeat="itemShelvingPlacementSupplyStock in $ctrl.itemShelvingPlacementSupplyStocks"
+                        vn-repeat-last on-last="$ctrl.calculateTotals()">
                         <td shrink>
                             <vn-check 
                                 ng-model="itemShelvingPlacementSupplyStock.checked"
@@ -93,7 +95,7 @@
                             {{::itemShelvingPlacementSupplyStock.shelving}}
                         </td>
                         <td>
-                            {{::itemShelvingPlacementSupplyStock.label}}
+                            {{(itemShelvingPlacementSupplyStock.stock / itemShelvingPlacementSupplyStock.packing).toFixed(2)}}
                         </td>
                         <td>
                             {{::itemShelvingPlacementSupplyStock.packing}}
diff --git a/modules/item/front/item-shelving/index.js b/modules/item/front/item-shelving/index.js
index 6fd8825aaf..b8584039b8 100644
--- a/modules/item/front/item-shelving/index.js
+++ b/modules/item/front/item-shelving/index.js
@@ -40,8 +40,6 @@ export default class Controller extends Section {
                 }
             ]
         };
-
-        this.getBalanceDueTotal();
     }
 
     get checked() {
@@ -49,46 +47,31 @@ export default class Controller extends Section {
         const checkedLines = [];
         for (let itemShelving of itemShelvings) {
             if (itemShelving.checked)
-                checkedLines.push(itemShelving);
+                checkedLines.push(itemShelving.itemShelvingFk);
         }
 
         return checkedLines;
     }
 
-    get label() {
+    calculateTotals() {
+        this.labelTotal = 0;
         const itemShelvings = this.$.model.data || [];
-        for (let itemShelving of itemShelvings)
-            itemShelving.label = itemShelving.stock / itemShelving.packing;
-
-        return true;
+        itemShelvings.forEach(itemShelving => {
+            const label = itemShelving.stock / itemShelving.packing;
+            this.labelTotal += label;
+        });
     }
 
-    getBalanceDueTotal() {
-        this.$http.get('Defaulters/filter')
-            .then(res => {
-                if (!res.data) return 0;
-
-                this.balanceDueTotal = res.data.reduce(
-                    (accumulator, currentValue) => {
-                        return accumulator + (currentValue['amount'] || 0);
-                    }, 0);
+    onRemove() {
+        const params = {itemShelvingIds: this.checked};
+        const query = `ItemShelvings/deleteItemShelvings`;
+        this.$http.post(query, params)
+            .then(() => {
+                this.vnApp.showSuccess(this.$t('ItemShelvings removed'));
+                this.$.model.refresh();
             });
     }
 
-    async onRemove() {
-        const params = [];
-        for (let itemShelving of this.checked)
-            params.push(itemShelving.itemShelvingFk);
-
-        for (let id of params) {
-            await this.$http.delete(`ItemShelvings/${id}`)
-                .then(() => {
-                    this.vnApp.showSuccess(this.$t('ItemShelving removed'));
-                    this.$state.reload();
-                });
-        }
-    }
-
     exprBuilder(param, value) {
         switch (param) {
         case 'parking':
diff --git a/modules/item/front/item-shelving/locale/es.yml b/modules/item/front/item-shelving/locale/es.yml
index 00b6ffe58d..006363cfa1 100644
--- a/modules/item/front/item-shelving/locale/es.yml
+++ b/modules/item/front/item-shelving/locale/es.yml
@@ -1,3 +1,5 @@
 Shelving: Matrícula
 Remove selected lines: Eliminar líneas seleccionadas
-Selected lines will be deleted: Las líneas seleccionadas serán eliminadas
\ No newline at end of file
+Selected lines will be deleted: Las líneas seleccionadas serán eliminadas
+ItemShelvings removed: Carros eliminados
+Total labels: Total etiquetas
\ No newline at end of file

From 1a38fc307f1364676adadf5feb02dc231daf10c4 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Tue, 11 Oct 2022 08:42:59 +0200
Subject: [PATCH 17/71] delete: duplicated keybinding

---
 modules/shelving/front/routes.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/shelving/front/routes.json b/modules/shelving/front/routes.json
index 0a05db9e33..09a8e389ba 100644
--- a/modules/shelving/front/routes.json
+++ b/modules/shelving/front/routes.json
@@ -13,9 +13,6 @@
             {"state": "shelving.card.log", "icon": "history"}
         ]
     },
-    "keybindings": [
-        {"key": "c", "state": "shelving.index"}
-    ],
     "routes": [
         {
             "url": "/shelving",

From bfefec397e68e86c2879bd1f89d3aacc8763a276 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Tue, 11 Oct 2022 09:13:29 +0200
Subject: [PATCH 18/71] feat: add testFront

---
 .../item/front/item-shelving/index.spec.js    | 118 ++++++------------
 1 file changed, 39 insertions(+), 79 deletions(-)

diff --git a/modules/item/front/item-shelving/index.spec.js b/modules/item/front/item-shelving/index.spec.js
index 0732c68a1e..55df1c27dd 100644
--- a/modules/item/front/item-shelving/index.spec.js
+++ b/modules/item/front/item-shelving/index.spec.js
@@ -1,120 +1,80 @@
 import './index';
 import crudModel from 'core/mocks/crud-model';
 
-describe('client defaulter', () => {
-    describe('Component vnClientDefaulter', () => {
+describe('item shelving', () => {
+    describe('Component vnItemShelving', () => {
         let controller;
         let $httpBackend;
 
-        beforeEach(ngModule('client'));
+        beforeEach(ngModule('item'));
 
         beforeEach(inject(($componentController, _$httpBackend_) => {
             $httpBackend = _$httpBackend_;
-            const $element = angular.element('<vn-client-defaulter></vn-client-defaulter>');
-            controller = $componentController('vnClientDefaulter', {$element});
+            const $element = angular.element('<vn-item-shelving></vn-item-shelving>');
+            controller = $componentController('vnItemShelving', {$element});
             controller.$.model = crudModel;
             controller.$.model.data = [
-                {clientFk: 1101, amount: 125},
-                {clientFk: 1102, amount: 500},
-                {clientFk: 1103, amount: 250}
+                {itemShelvingFk: 1, packing: 10, stock: 1},
+                {itemShelvingFk: 2, packing: 12, stock: 5},
+                {itemShelvingFk: 4, packing: 20, stock: 10}
             ];
+            const modelData = controller.$.model.data;
+            modelData[0].checked = true;
+            modelData[1].checked = true;
         }));
 
         describe('checked() getter', () => {
-            it('should return the checked lines', () => {
-                const data = controller.$.model.data;
-                data[1].checked = true;
-                data[2].checked = true;
+            it('should return a the selected rows', () => {
+                const result = controller.checked;
 
-                const checkedRows = controller.checked;
-
-                const firstCheckedRow = checkedRows[0];
-                const secondCheckedRow = checkedRows[1];
-
-                expect(firstCheckedRow.clientFk).toEqual(1102);
-                expect(secondCheckedRow.clientFk).toEqual(1103);
+                expect(result).toEqual(expect.arrayContaining([1, 2]));
             });
         });
 
-        describe('chipColor()', () => {
-            it('should return undefined when the date is the present', () => {
-                let today = new Date();
-                let result = controller.chipColor(today);
+        describe('calculateTotals()', () => {
+            it('should calculate the total of labels', () => {
+                controller.calculateTotals();
 
-                expect(result).toEqual(undefined);
-            });
-
-            it('should return warning when the date is 10 days in the past', () => {
-                let pastDate = new Date();
-                pastDate = pastDate.setDate(pastDate.getDate() - 11);
-                let result = controller.chipColor(pastDate);
-
-                expect(result).toEqual('warning');
-            });
-
-            it('should return alert when the date is 20 days in the past', () => {
-                let pastDate = new Date();
-                pastDate = pastDate.setDate(pastDate.getDate() - 21);
-                let result = controller.chipColor(pastDate);
-
-                expect(result).toEqual('alert');
+                expect(controller.labelTotal).toEqual(1.0166666666666666);
             });
         });
 
-        describe('onResponse()', () => {
-            it('should return error for empty message', () => {
-                let error;
-                try {
-                    controller.onResponse();
-                } catch (e) {
-                    error = e;
-                }
+        describe('onRemove()', () => {
+            it('shoud remove the selected lines', () => {
+                jest.spyOn(controller.$.model, 'refresh');
+                const expectedParams = {itemShelvingIds: [1, 2]};
 
-                expect(error).toBeDefined();
-                expect(error.message).toBe(`The message can't be empty`);
-            });
-
-            it('should return saved message', () => {
-                const data = controller.$.model.data;
-                data[1].checked = true;
-                controller.defaulter = {observation: 'My new observation'};
-
-                const params = [{text: controller.defaulter.observation, clientFk: data[1].clientFk}];
-
-                jest.spyOn(controller.vnApp, 'showMessage');
-                $httpBackend.expect('GET', `Defaulters/filter`).respond(200);
-                $httpBackend.expect('POST', `ClientObservations`, params).respond(200, params);
-
-                controller.onResponse();
+                $httpBackend.expectPOST('ItemShelvings/deleteItemShelvings', expectedParams).respond(200);
+                controller.onRemove();
                 $httpBackend.flush();
 
-                expect(controller.vnApp.showMessage).toHaveBeenCalledWith('Observation saved!');
+                expect(controller.$.model.refresh).toHaveBeenCalled();
             });
         });
 
         describe('exprBuilder()', () => {
-            it('should search by sales person', () => {
-                const expr = controller.exprBuilder('salesPersonFk', '5');
+            it('should search by parking', () => {
+                const expr = controller.exprBuilder('parking', '700-01');
 
-                expect(expr).toEqual({'d.salesPersonFk': '5'});
+                expect(expr).toEqual({'parking': '700-01'});
             });
 
-            it('should search by client', () => {
-                const expr = controller.exprBuilder('clientFk', '5');
+            it('should search by shelving', () => {
+                const expr = controller.exprBuilder('shelving', 'AAA');
 
-                expect(expr).toEqual({'d.clientFk': '5'});
+                expect(expr).toEqual({'shelving': 'AAA'});
             });
-        });
 
-        describe('getBalanceDueTotal()', () => {
-            it('should return balance due total', () => {
-                const defaulters = controller.$.model.data;
-                $httpBackend.when('GET', `Defaulters/filter`).respond(defaulters);
+            it('should search by label', () => {
+                const expr = controller.exprBuilder('label', 0.17);
 
-                controller.getBalanceDueTotal();
-                $httpBackend.flush();
+                expect(expr).toEqual({'label': 0.17});
+            });
 
-                expect(controller.balanceDueTotal).toEqual(875);
+            it('should search by packing', () => {
+                const expr = controller.exprBuilder('packing', 10);
+
+                expect(expr).toEqual({'packing': 10});
             });
         });
     });

From 2455a11c26744ac45f81b869b618af686d868157 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Fri, 14 Oct 2022 14:29:21 +0200
Subject: [PATCH 19/71] feat: changeMultipleDiscount uses the same popover than
 changeDiscount

---
 modules/ticket/front/sale/index.html | 30 ++----------------------
 modules/ticket/front/sale/index.js   | 34 ++++++++++++----------------
 2 files changed, 17 insertions(+), 47 deletions(-)

diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 42eb10cb06..112476c301 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -300,7 +300,7 @@
                         ng-model="$ctrl.manaCode">
                     </vn-radio>
                 </vn-vertical>
-                <div class="simulator">
+                <div class="simulator" ng-show="$ctrl.edit.sale">
                     <p class="simulatorTitle" translate>New price</p>
                     <p>
                         <strong>{{$ctrl.getNewPrice() | currency: 'EUR': 2}}</strong>
@@ -321,32 +321,6 @@
     </div>
 </vn-popover>
 
-<!-- Multiple discount dialog -->
-<vn-dialog vn-id="editDiscountDialog"
-    on-open="$ctrl.getMana()"
-    message="Edit discount">
-    <tpl-body>
-        <vn-spinner class="vn-pa-xs"
-            ng-if="$ctrl.edit.mana == null"
-            enable="true">
-        </vn-spinner>
-        <div ng-if="$ctrl.edit.mana != null">
-            <div class="vn-pa-md">
-                <vn-input-number vn-focus
-                    label="Discount"
-                    ng-model="$ctrl.edit.discount"
-                    on-change="$ctrl.changeMultipleDiscount()"
-                    clear-disabled="true"
-                    suffix="%">
-                </vn-input-number>
-            </div>
-            <section class="header vn-pa-md">
-                <span>Mana: <strong>{{::$ctrl.edit.mana | currency: 'EUR': 0}}</strong></span>
-            </section>
-        </div>
-    </tpl-body>
-</vn-dialog>
-
 <!-- Transfer Popover -->
 <vn-popover vn-id="transfer">
     <div class="vn-pa-lg transfer">
@@ -490,7 +464,7 @@
     </vn-item>
     <vn-item translate
         name="discount"
-        ng-click="$ctrl.showEditDiscountDialog($event)">
+        ng-click="$ctrl.showEditDiscountPopover($event, sale)">
         Update discount
     </vn-item>
     <vn-item translate
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index 2724bb97d9..714baa126c 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -243,26 +243,21 @@ class Controller extends Section {
 
     showEditDiscountPopover(event, sale) {
         if (this.isLocked) return;
-
-        this.edit = {
-            discount: sale.discount,
-            sale: sale
-        };
+        if (sale) {
+            this.edit = {
+                discount: sale.discount,
+                sale: sale
+            };
+        } else {
+            this.edit = {
+                discount: null,
+                sales: this.selectedValidSales()
+            };
+        }
 
         this.$.editDiscount.show(event);
     }
 
-    showEditDiscountDialog(event) {
-        if (this.isLocked) return;
-
-        this.edit = {
-            discount: null,
-            sales: this.selectedValidSales()
-        };
-
-        this.$.editDiscountDialog.show(event);
-    }
-
     changeDiscount() {
         const sale = this.edit.sale;
         const newDiscount = this.edit.discount;
@@ -282,7 +277,7 @@ class Controller extends Section {
         if (newDiscount != null && hasChanges)
             this.updateDiscount(sales);
 
-        this.$.editDiscountDialog.hide();
+        this.$.editDiscount.hide();
     }
 
     updateDiscount(sales) {
@@ -303,7 +298,7 @@ class Controller extends Section {
     }
 
     getNewPrice() {
-        if (this.edit) {
+        if (this.edit.sale) {
             const sale = this.edit.sale;
             let newDiscount = sale.discount;
             let newPrice = this.edit.price || sale.price;
@@ -505,7 +500,8 @@ class Controller extends Section {
     }
 
     save() {
-        this.changeDiscount();
+        if (this.edit.sale) this.changeDiscount();
+        if (this.edit.sales) this.changeMultipleDiscount();
     }
 
     cancel() {

From 86b7e9cabe7b214ef019062b13cbf5299b91fd7c Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Fri, 14 Oct 2022 14:30:37 +0200
Subject: [PATCH 20/71] fix: only can exists 'mana' or 'manaClaim' discount.
 Never both

---
 .../back/methods/ticket/updateDiscount.js     | 41 +++++++++++++++++--
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/modules/ticket/back/methods/ticket/updateDiscount.js b/modules/ticket/back/methods/ticket/updateDiscount.js
index b1291a45bf..99daac5127 100644
--- a/modules/ticket/back/methods/ticket/updateDiscount.js
+++ b/modules/ticket/back/methods/ticket/updateDiscount.js
@@ -115,10 +115,43 @@ module.exports = Self => {
             for (let sale of sales) {
                 const oldDiscount = sale.discount;
                 const value = ((-sale.price * newDiscount) / 100);
-                const newComponent = models.SaleComponent.upsert({
-                    saleFk: sale.id,
-                    value: value,
-                    componentFk: componentId}, myOptions);
+
+                const manaComponent = await models.Component.findOne({
+                    where: {code: 'mana'}
+                }, myOptions);
+
+                const manaClaimComponent = await models.Component.findOne({
+                    where: {code: 'manaClaim'}
+                }, myOptions);
+
+                const oldComponent = await models.SaleComponent.find({
+                    where: {
+                        and: [
+                            {saleFk: sale.id},
+                            {componentFk: {inq: [manaComponent.id, manaClaimComponent.id]}}
+                        ]
+                    }
+                }, myOptions);
+
+                let newComponent;
+                if (oldComponent) {
+                    const filter = {
+                        saleFk: sale.id,
+                        componentFk: oldComponent.componentFk
+                    };
+                    await models.SaleComponent.destroyAll(filter, myOptions);
+
+                    newComponent = models.SaleComponent.create({
+                        saleFk: sale.id,
+                        value: value,
+                        componentFk: componentId
+                    }, myOptions);
+                } else {
+                    newComponent = models.SaleComponent.create({
+                        saleFk: sale.id,
+                        value: value,
+                        componentFk: componentId}, myOptions);
+                }
 
                 const updatedSale = sale.updateAttribute('discount', newDiscount, myOptions);
 

From 40075e7e21633569a5c7eb29d5f60fbedbb4a9c1 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Fri, 14 Oct 2022 14:38:47 +0200
Subject: [PATCH 21/71] fix: testFront

---
 modules/ticket/front/sale/index.js      | 1 -
 modules/ticket/front/sale/index.spec.js | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index 714baa126c..0d1d28b0e5 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -273,7 +273,6 @@ class Controller extends Section {
         const hasChanges = sales.some(sale => {
             return sale.discount != newDiscount;
         });
-
         if (newDiscount != null && hasChanges)
             this.updateDiscount(sales);
 
diff --git a/modules/ticket/front/sale/index.spec.js b/modules/ticket/front/sale/index.spec.js
index 28d8749328..a59eb3865c 100644
--- a/modules/ticket/front/sale/index.spec.js
+++ b/modules/ticket/front/sale/index.spec.js
@@ -393,7 +393,7 @@ describe('Ticket', () => {
                 secondSelectedSale.checked = true;
 
                 const expectedSales = [firstSelectedSale, secondSelectedSale];
-                controller.$.editDiscountDialog = {hide: jest.fn()};
+                controller.$.editDiscount = {hide: jest.fn()};
                 controller.edit = {
                     discount: 10,
                     sales: expectedSales
@@ -402,7 +402,7 @@ describe('Ticket', () => {
                 controller.changeMultipleDiscount();
 
                 expect(controller.updateDiscount).toHaveBeenCalledWith(expectedSales);
-                expect(controller.$.editDiscountDialog.hide).toHaveBeenCalledWith();
+                expect(controller.$.editDiscount.hide).toHaveBeenCalledWith();
             });
 
             it('should not call to the updateDiscount() method and then to the editDiscountDialog hide() method', () => {
@@ -417,7 +417,7 @@ describe('Ticket', () => {
                 secondSelectedSale.discount = 10;
 
                 const expectedSales = [firstSelectedSale, secondSelectedSale];
-                controller.$.editDiscountDialog = {hide: jest.fn()};
+                controller.$.editDiscount = {hide: jest.fn()};
                 controller.edit = {
                     discount: 10,
                     sales: expectedSales
@@ -426,7 +426,7 @@ describe('Ticket', () => {
                 controller.changeMultipleDiscount();
 
                 expect(controller.updateDiscount).not.toHaveBeenCalledWith(expectedSales);
-                expect(controller.$.editDiscountDialog.hide).toHaveBeenCalledWith();
+                expect(controller.$.editDiscount.hide).toHaveBeenCalledWith();
             });
         });
 

From 991893837c285ebd9f340959375038dce77f757c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 17 Oct 2022 07:34:22 +0200
Subject: [PATCH 22/71] correct fixutures from dev

---
 db/dump/fixtures.sql | 109 +++++++++++++++++++++----------------------
 1 file changed, 54 insertions(+), 55 deletions(-)

diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 912c43bc20..2e00389e5b 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -866,7 +866,7 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`)
         ('VT',  'Sales');
 
 INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenceFk`,
-    `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`, `isFloramondo`, `genericFk`, `itemPackingTypeFk`, `hasMinPrice`, `packingShelve`)
+    `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`, `isFloramondo`, `genericFk`, `itemPackingTypeFk`, `hasMinPrice`, `packingShelve`, `weightByPiece`)
     VALUES
         (1,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 1, 'VT',   0,  NULL,   'V',  0, 15,3),
         (2,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 2, 'VT',   0,  NULL,   'H',  0, 10,2),
@@ -1175,10 +1175,6 @@ INSERT INTO `vn`.`ticketCollection`(`ticketFk`, `collectionFk`, `level`)
         (3, 2, NULL),
         (23, 1, NULL);
 
-INSERT INTO `vn`.`parking` (`column`, `row`, `sectorFk`, `code`, `pickingOrder`)
-    VALUES
-        ('100', '01', 1, '100-01', 1);
-
 INSERT INTO `vn`.`genus`(`id`, `name`)
     VALUES
         (1, 'Abelia'),
@@ -1936,16 +1932,19 @@ INSERT INTO `vn`.`workerBusinessType` (`id`, `name`, `isFullTime`, `isPermanent`
         (100,   'INDEFINIDO A TIEMPO COMPLETO',                     1, 1, 1),
         (109,   'CONVERSION DE TEMPORAL EN INDEFINIDO T.COMPLETO',  1, 1, 1);
 
-UPDATE `postgresql`.`business_labour` bl
-    JOIN `postgresql`.`business` b ON b.business_id = bl.business_id
-    JOIN `postgresql`.`profile` pr ON pr.profile_id = b.client_id
-    JOIN `postgresql`.`person` p ON p.person_id = pr.person_id
-    SET bl.`professional_category_id` = 31
-    WHERE p.`Id_trabajador` = 1110;
+UPDATE `vn`.`business` b
+    SET `rate` = 7,
+        `workerBusinessCategoryFk` = 12,
+        `workerBusinessTypeFk` = 100,
+        `amount` = 900.50
+    WHERE b.id = 1;
 
-UPDATE `postgresql`.`business_labour` bl
-    SET bl.`department_id` = 43
-WHERE business_id IN(18, 19);
+UPDATE `vn`.`business` b
+    SET `rate` = 7,
+        `workerBusinessCategoryFk` = 12,
+        `workerBusinessTypeFk` = 100,
+        `amount` = 1263.03
+    WHERE b.id = 1106;
 
 UPDATE `vn`.`business` b
     SET `rate` = 7,
@@ -1954,17 +1953,12 @@ UPDATE `vn`.`business` b
         `amount` = 2000
     WHERE b.id = 1107;
 
-INSERT INTO `postgresql`.`profile_media`(`profile_media_id`, `profile_id`, `media_id`)
-    VALUES
-        (1, 1106, 1),
-        (2, 1107, 2);
-
-INSERT INTO `vn`.`workCenterHoliday` (`workCenterFk`, `days`, `year`)
-    VALUES
-        ('1', '27.5', YEAR(util.VN_CURDATE())),
-        ('5', '22', YEAR(util.VN_CURDATE())),
-        ('1', '24.5', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR))),
-        ('5', '23', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)));
+UPDATE `vn`.`business` b
+    SET `rate` = 7,
+        `workerBusinessCategoryFk` = 12,
+        `workerBusinessTypeFk` = 100,
+        `amount` = 1500
+    WHERE b.id = 1108;
 
 INSERT INTO `vn`.`absenceType` (`id`, `name`, `rgb`, `code`, `holidayEntitlementRate`, `discountRate`)
     VALUES
@@ -1975,22 +1969,7 @@ INSERT INTO `vn`.`absenceType` (`id`, `name`, `rgb`, `code`, `holidayEntitlement
         (20, 'Furlough',            '#97B92F', 'furlough',      1,      1),
         (21, 'Furlough half day',   '#778899', 'halfFurlough',  0.5,    1);
 
-ALTER TABLE `postgresql`.`business_labour_payroll` DROP FOREIGN KEY `business_labour_payroll_cod_categoria`;
-
-INSERT INTO `vn`.`workerBusinessType` (`id`, `name`, `isFullTime`, `isPermanent`, `hasHolidayEntitlement`)
-    VALUES
-        (1,     'CONTRATO HOLANDA',                                 1, 0, 1),
-        (100,   'INDEFINIDO A TIEMPO COMPLETO',                     1, 1, 1),
-        (109,   'CONVERSION DE TEMPORAL EN INDEFINIDO T.COMPLETO',  1, 1, 1);
-
-INSERT INTO `postgresql`.`business_labour_payroll` (`business_id`, `cod_tarifa`, `cod_categoria`, `cod_contrato`, `importepactado`)
-    VALUES
-        (1, 7, 12, 100, 900.50),
-        (1106, 7, 12, 100, 1263.03),
-        (1107, 7, 12, 100, 2000),
-        (1108, 7, 12, 100, 1500);
-
-INSERT INTO `postgresql`.`calendar_employee` (`business_id`, `calendar_state_id`, `date`)
+INSERT INTO `postgresql`.`calendar_employee` (`businessFk`, `calendar_state_id`, `date`)
     VALUES
         (1,    6, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 10 DAY))),
         (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 10 DAY))),
@@ -2485,18 +2464,18 @@ INSERT INTO `vn`.`duaInvoiceIn`(`id`, `duaFk`, `invoiceInFk`)
 
 INSERT INTO `vn`.`invoiceInTax` (`invoiceInFk`, `taxableBase`, `expenceFk`, `foreignValue`, `taxTypeSageFk`, `transactionTypeSageFk`)
     VALUES
-        (1, 99.99, '2000000000', null, null, null),
-        (2, 999.99, '2000000000', null, null, null),
-        (3, 1000.50, '2000000000', null, null, null),
-        (4, 0.50, '2000000000', null, null, null),
-        (5, 150.50, '2000000000', null, null, null),
-        (1, 252.25, '4751000000', NULL, 7, 61),
-        (2, 223.17, '6210000567', NULL, 8, 20),
-        (3, 95.60,  '7001000000', NULL, 8, 35),
-        (4, 446.63, '7001000000', NULL, 6, 61),
-        (5, 64.23,  '6210000567', NULL, 8, 20),
-        (6, 29.95,  '7001000000', NULL, 7, 20),
-        (7, 58.64,  '6210000567', NULL, 8, 20);
+        (1, 99.99,      '2000000000', NULL, NULL, NULL),
+        (2, 999.99,     '2000000000', NULL, NULL, NULL),
+        (3, 1000.50,    '2000000000', NULL, NULL, NULL),
+        (4, 0.50,       '2000000000', NULL, NULL, NULL),
+        (5, 150.50,     '2000000000', NULL, NULL, NULL),
+        (1, 252.25,     '4751000000', NULL, 7, 61),
+        (2, 223.17,     '6210000567', NULL, 8, 20),
+        (3, 95.60,      '7001000000', NULL, 8, 35),
+        (4, 446.63,     '7001000000', NULL, 6, 61),
+        (5, 64.23,      '6210000567', NULL, 8, 20),
+        (6, 29.95,      '7001000000', NULL, 7, 20),
+        (7, 58.64,      '6210000567', NULL, 8, 20);
 
 INSERT INTO `vn`.`invoiceInIntrastat` (`invoiceInFk`, `net`, `intrastatFk`, `amount`, `stems`, `countryFk`)
     VALUES
@@ -2506,8 +2485,8 @@ INSERT INTO `vn`.`invoiceInIntrastat` (`invoiceInFk`, `net`, `intrastatFk`, `amo
         (2, 16.10, 6021010, 25.00, 80,  5);
 
 INSERT INTO `vn`.`ticketRecalc`(`ticketFk`)
-    SELECT `id`
-        FROM `vn`.`ticket` t
+    SELECT t.id
+        FROM vn.ticket t
             LEFT JOIN vn.ticketRecalc tr ON tr.ticketFk = t.id
         WHERE tr.ticketFk IS NULL;
 
@@ -2668,3 +2647,23 @@ INSERT INTO `vn`.`sectorCollectionSaleGroup` (`sectorCollectionFk`, `saleGroupFk
 INSERT INTO `vn`.`workerTimeControlConfig` (`id`, `dayBreak`, `dayBreakDriver`, `shortWeekBreak`, `longWeekBreak`, `weekScope`, `mailPass`, `mailHost`, `mailSuccessFolder`, `mailErrorFolder`, `mailUser`, `minHoursToBreak`, `breakHours`, `hoursCompleteWeek`, `startNightlyHours`, `endNightlyHours`, `maxTimePerDay`, `breakTime`, `timeToBreakTime`, `dayMaxTime`, `shortWeekDays`, `longWeekDays`)
     VALUES
         (1, 43200, 32400, 129600, 259200, 604800, '', '', 'Leidos.exito', 'Leidos.error', 'timeControl', 5.33, 0.33, 40, '22:00:00', '06:00:00', 57600, 1200, 18000, 57600, 6, 13);
+
+INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`)
+    VALUES
+        (1, 9);
+
+INSERT INTO `vn`.`productionConfig` (`isPreviousPreparationRequired`, `ticketPrintedMax`, `ticketTrolleyMax`, `rookieDays`, `notBuyingMonths`, `id`, `isZoneClosedByExpeditionActivated`, `maxNotReadyCollections`, `minTicketsToCloseZone`, `movingTicketDelRoute`, `defaultZone`, `defautlAgencyMode`, `hasUniqueCollectionTime`, `maxCollectionWithoutUser`, `pendingCollectionsOrder`, `pendingCollectionsAge`)
+    VALUES
+        (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6);
+
+INSERT INTO `vn`.`collection` (`id`, `created`, `workerFk`, `stateFk`, `itemPackingTypeFk`, `saleTotalCount`, `salePickedCount`, `trainFk`, `sectorFk`, `wagons`)
+    VALUES
+        (3, util.VN_NOW(), 1107, 5, NULL, 0, 0, 1, NULL, NULL);
+
+INSERT INTO `vn`.`ticketCollection` (`ticketFk`, `collectionFk`, `created`, `level`, `wagon`, `smartTagFk`, `usedShelves`, `itemCount`, `liters`)
+    VALUES
+        (9, 3, util.VN_NOW(), NULL, 0, NULL, NULL, NULL, NULL);
+
+UPDATE `account`.`user`
+    SET `hasGrant` = 1
+        WHERE `id` = 66;

From a11ef73dfbb70a780dc503767cab76c3e7476112 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Mon, 17 Oct 2022 08:01:55 +0200
Subject: [PATCH 23/71] refactor: code repetead

---
 .../back/methods/ticket/updateDiscount.js     | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/modules/ticket/back/methods/ticket/updateDiscount.js b/modules/ticket/back/methods/ticket/updateDiscount.js
index 99daac5127..d452b03fef 100644
--- a/modules/ticket/back/methods/ticket/updateDiscount.js
+++ b/modules/ticket/back/methods/ticket/updateDiscount.js
@@ -141,17 +141,9 @@ module.exports = Self => {
                     };
                     await models.SaleComponent.destroyAll(filter, myOptions);
 
-                    newComponent = models.SaleComponent.create({
-                        saleFk: sale.id,
-                        value: value,
-                        componentFk: componentId
-                    }, myOptions);
-                } else {
-                    newComponent = models.SaleComponent.create({
-                        saleFk: sale.id,
-                        value: value,
-                        componentFk: componentId}, myOptions);
-                }
+                    await createSaleComponent(sale.id, value, componentId, myOptions);
+                } else
+                    await createSaleComponent(sale.id, value, componentId, myOptions);
 
                 const updatedSale = sale.updateAttribute('discount', newDiscount, myOptions);
 
@@ -198,4 +190,14 @@ module.exports = Self => {
             throw e;
         }
     };
+
+    async function createSaleComponent(saleId, value, componentId, myOptions) {
+        const models = Self.app.models;
+
+        newComponent = models.SaleComponent.create({
+            saleFk: saleId,
+            value: value,
+            componentFk: componentId
+        }, myOptions);
+    }
 };

From 06ecceb478373820cfd0d0c9968ae200462c034c Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Mon, 17 Oct 2022 08:02:19 +0200
Subject: [PATCH 24/71] refactor: lines to long

---
 .../back/methods/ticket/specs/componentUpdate.spec.js  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js b/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
index 2aa2a07c4c..a8a4d5048a 100644
--- a/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
@@ -18,13 +18,17 @@ describe('ticket componentUpdate()', () => {
     beforeAll(async() => {
         const deliveryComponenet = await models.Component.findOne({where: {code: 'delivery'}});
         deliveryComponentId = deliveryComponenet.id;
-        componentOfSaleSeven = `SELECT value FROM vn.saleComponent WHERE saleFk = 7 AND componentFk = ${deliveryComponentId}`;
-        componentOfSaleEight = `SELECT value FROM vn.saleComponent WHERE saleFk = 8 AND componentFk = ${deliveryComponentId}`;
-
+        componentOfSaleSeven = `SELECT value 
+                                    FROM vn.saleComponent 
+                                    WHERE saleFk = 7 AND componentFk = ${deliveryComponentId}`;
+        componentOfSaleEight = `SELECT value 
+                                    FROM vn.saleComponent 
+                                    WHERE saleFk = 8 AND componentFk = ${deliveryComponentId}`;
         [componentValue] = await models.SaleComponent.rawSql(componentOfSaleSeven);
         firstvalueBeforeChange = componentValue.value;
 
         [componentValue] = await models.SaleComponent.rawSql(componentOfSaleEight);
+
         secondvalueBeforeChange = componentValue.value;
     });
 

From cdce628038a2bea5aefd5589a4e68d13a900d69c Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Mon, 17 Oct 2022 08:11:50 +0200
Subject: [PATCH 25/71] refactor: delete line break

---
 modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js b/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
index a8a4d5048a..b3291c25a4 100644
--- a/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
@@ -28,7 +28,6 @@ describe('ticket componentUpdate()', () => {
         firstvalueBeforeChange = componentValue.value;
 
         [componentValue] = await models.SaleComponent.rawSql(componentOfSaleEight);
-
         secondvalueBeforeChange = componentValue.value;
     });
 

From 787d10aac6c08fb7e69643b622505d9d1d3a47d4 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Mon, 17 Oct 2022 08:29:09 +0200
Subject: [PATCH 26/71] fix: select one result only

---
 modules/ticket/back/methods/ticket/updateDiscount.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ticket/back/methods/ticket/updateDiscount.js b/modules/ticket/back/methods/ticket/updateDiscount.js
index d452b03fef..bfa3cdbf64 100644
--- a/modules/ticket/back/methods/ticket/updateDiscount.js
+++ b/modules/ticket/back/methods/ticket/updateDiscount.js
@@ -124,7 +124,7 @@ module.exports = Self => {
                     where: {code: 'manaClaim'}
                 }, myOptions);
 
-                const oldComponent = await models.SaleComponent.find({
+                const [oldComponent] = await models.SaleComponent.find({
                     where: {
                         and: [
                             {saleFk: sale.id},

From 79b970286c1b382a8b90a8969e55a1a5a11445d8 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 17 Oct 2022 11:22:27 +0200
Subject: [PATCH 27/71] refactor(claim_claimPickupEmail): use text template and
 external form

---
 e2e/paths/06-claim/05_summary.spec.js         |  2 +-
 loopback/locale/en.json                       |  5 ++-
 loopback/locale/es.json                       |  5 ++-
 .../back/methods/claim/claimPickupEmail.js    | 40 +++++++++++++++++++
 modules/claim/front/descriptor/index.js       |  5 ++-
 modules/claim/front/descriptor/index.spec.js  | 12 +++++-
 .../claim-pickup-order.html                   |  2 +-
 .../claim-pickup-order/claim-pickup-order.js  |  2 +-
 .../claim-pickup-order/claim-pickup-order.js  |  3 +-
 9 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/e2e/paths/06-claim/05_summary.spec.js b/e2e/paths/06-claim/05_summary.spec.js
index 00b021f88f..05d18a2c31 100644
--- a/e2e/paths/06-claim/05_summary.spec.js
+++ b/e2e/paths/06-claim/05_summary.spec.js
@@ -2,7 +2,7 @@
 import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';
 
-describe('Claim summary path', () => {
+fdescribe('Claim summary path', () => {
     let browser;
     let page;
     const claimId = '4';
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index e5a0fae322..e9311800ec 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -133,5 +133,6 @@
 	"Descanso semanal 36h. / 72h.": "Weekly rest 36h. / 72h.",
 	"Password does not meet requirements": "Password does not meet requirements",
 	"You don't have privileges to change the zone": "You don't have privileges to change the zone or for these parameters there are more than one shipping options, talk to agencies",
-	"Not enough privileges to edit a client": "Not enough privileges to edit a client"
-}
\ No newline at end of file
+	"Not enough privileges to edit a client": "Not enough privileges to edit a client",
+    "Claim pickup order sent": "Claim pickup order sent [({{claimId}})]({{{claimUrl}}}) to client *{{clientName}}*"
+}
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 67370b3438..8caf76836c 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -235,5 +235,6 @@
 	"Dirección incorrecta": "Dirección incorrecta",
 	"Modifiable user details only by an administrator": "Detalles de usuario modificables solo por un administrador",
 	"Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
-	"Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente"
-}
\ No newline at end of file
+	"Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
+    "Claim pickup order sent": "Reclamación Orden de recogida enviada [({{claimId}})]({{{claimUrl}}}) al cliente *{{clientName}}*"
+}
diff --git a/modules/claim/back/methods/claim/claimPickupEmail.js b/modules/claim/back/methods/claim/claimPickupEmail.js
index 4d64cc66ea..4c9b865025 100644
--- a/modules/claim/back/methods/claim/claimPickupEmail.js
+++ b/modules/claim/back/methods/claim/claimPickupEmail.js
@@ -29,6 +29,24 @@ module.exports = Self => {
                 type: 'number',
                 description: 'The recipient id to send to the recipient preferred language',
                 required: false
+            },
+            {
+                arg: 'ticketId',
+                type: 'number',
+                description: 'The ticket id',
+                required: true
+            },
+            {
+                arg: 'salesPersonId',
+                type: 'number',
+                description: 'The salesPerson id',
+                required: false
+            },
+            {
+                arg: 'clientName',
+                type: 'string',
+                description: 'The client name',
+                required: true
             }
         ],
         returns: {
@@ -42,6 +60,11 @@ module.exports = Self => {
     });
 
     Self.claimPickupEmail = async ctx => {
+        const models = Self.app.models;
+        const userId = ctx.req.accessToken.userId;
+        const $t = ctx.req.__; // $translate
+        const origin = ctx.req.headers.origin;
+
         const args = Object.assign({}, ctx.args);
         const params = {
             recipient: args.recipient,
@@ -52,6 +75,23 @@ module.exports = Self => {
         for (const param in args)
             params[param] = args[param];
 
+        const message = $t('Claim pickup order sent', {
+            claimId: args.id,
+            clientName: args.clientName,
+            claimUrl: `${origin}/#!/claim/${args.id}/summary`,
+        });
+
+        if (args.salesPersonId)
+            await models.Chat.sendCheckingPresence(ctx, args.salesPersonId, message);
+
+        await models.ClaimLog.create({
+            originFk: args.id,
+            userFk: userId,
+            action: 'insert',
+            description: 'Claim-pickup-order sent',
+            changedModel: 'Mail'
+        });
+
         const email = new Email('claim-pickup-order', params);
 
         return email.send();
diff --git a/modules/claim/front/descriptor/index.js b/modules/claim/front/descriptor/index.js
index 0dddadbe14..b36fae3211 100644
--- a/modules/claim/front/descriptor/index.js
+++ b/modules/claim/front/descriptor/index.js
@@ -19,7 +19,10 @@ class Controller extends Descriptor {
     sendPickupOrder() {
         return this.vnEmail.send(`Claims/${this.claim.id}/claim-pickup-email`, {
             recipient: this.claim.client.email,
-            recipientId: this.claim.clientFk
+            recipientId: this.claim.clientFk,
+            clientName: this.claim.client.name,
+            ticketId: this.claim.ticket.id,
+            salesPersonId: this.claim.client.salesPersonFk
         });
     }
 
diff --git a/modules/claim/front/descriptor/index.spec.js b/modules/claim/front/descriptor/index.spec.js
index e6785d3d8a..18ccdaff5e 100644
--- a/modules/claim/front/descriptor/index.spec.js
+++ b/modules/claim/front/descriptor/index.spec.js
@@ -7,7 +7,12 @@ describe('Item Component vnClaimDescriptor', () => {
     const claim = {
         id: 2,
         clientFk: 1101,
-        client: {email: 'client@email'}
+        client: {
+            email: 'client@email',
+            name: 'clientName',
+            salesPersonFk: 18
+        },
+        ticket: {id: 2}
     };
 
     beforeEach(ngModule('claim'));
@@ -40,7 +45,10 @@ describe('Item Component vnClaimDescriptor', () => {
 
             const params = {
                 recipient: claim.client.email,
-                recipientId: claim.clientFk
+                recipientId: claim.clientFk,
+                clientName: claim.client.name,
+                ticketId: claim.ticket.id,
+                salesPersonId: claim.client.salesPersonFk
             };
             controller.sendPickupOrder();
 
diff --git a/print/templates/email/claim-pickup-order/claim-pickup-order.html b/print/templates/email/claim-pickup-order/claim-pickup-order.html
index e6e74ed939..32606bd7b4 100644
--- a/print/templates/email/claim-pickup-order/claim-pickup-order.html
+++ b/print/templates/email/claim-pickup-order/claim-pickup-order.html
@@ -23,7 +23,7 @@
                         <!-- Block -->
                         <div class="grid-row">
                             <div class="grid-block vn-pa-ml">
-                                <h1>{{ $t('title', [claimId]) }}</h1>
+                                <h1>{{ $t('title', [id]) }}</h1>
                                 <p>{{ $t('description.dear') }},</p>
                                 <p v-html="instructions"></p>
                                 <p>{{ $t('description.conclusion') }}</p>
diff --git a/print/templates/email/claim-pickup-order/claim-pickup-order.js b/print/templates/email/claim-pickup-order/claim-pickup-order.js
index 74ee9408d6..51db21cb52 100755
--- a/print/templates/email/claim-pickup-order/claim-pickup-order.js
+++ b/print/templates/email/claim-pickup-order/claim-pickup-order.js
@@ -9,7 +9,7 @@ module.exports = {
         'email-footer': emailFooter.build()
     },
     created() {
-        this.instructions = this.$t('description.instructions', [this.claimId, this.ticketId]);
+        this.instructions = this.$t('description.instructions', [this.id, this.ticketId]);
     },
     data() {
         return {
diff --git a/print/templates/reports/claim-pickup-order/claim-pickup-order.js b/print/templates/reports/claim-pickup-order/claim-pickup-order.js
index 0220428454..c2c11cb88c 100755
--- a/print/templates/reports/claim-pickup-order/claim-pickup-order.js
+++ b/print/templates/reports/claim-pickup-order/claim-pickup-order.js
@@ -7,7 +7,6 @@ module.exports = {
     async serverPrefetch() {
         this.client = await this.fetchClient(this.id);
         this.sales = await this.fetchSales(this.id);
-        this.claimConfig = await this.fetchClaimConfig();
 
         if (!this.client)
             throw new Error('Something went wrong');
@@ -25,7 +24,7 @@ module.exports = {
         },
         fetchSales(id) {
             return this.rawSqlFromDef('sales', [id]);
-        },
+        }
     },
     components: {
         'report-header': reportHeader.build(),

From 57b2ae770da0c34798e01593dad9eed8f9f7b33a Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 17 Oct 2022 11:44:29 +0200
Subject: [PATCH 28/71] fix(e2e)

---
 e2e/paths/06-claim/05_summary.spec.js  |  2 +-
 modules/claim/front/summary/index.html | 39 +++++++++++++++-----------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/e2e/paths/06-claim/05_summary.spec.js b/e2e/paths/06-claim/05_summary.spec.js
index 05d18a2c31..00b021f88f 100644
--- a/e2e/paths/06-claim/05_summary.spec.js
+++ b/e2e/paths/06-claim/05_summary.spec.js
@@ -2,7 +2,7 @@
 import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';
 
-fdescribe('Claim summary path', () => {
+describe('Claim summary path', () => {
     let browser;
     let page;
     const claimId = '4';
diff --git a/modules/claim/front/summary/index.html b/modules/claim/front/summary/index.html
index fc1813467a..6adbfd6840 100644
--- a/modules/claim/front/summary/index.html
+++ b/modules/claim/front/summary/index.html
@@ -25,14 +25,29 @@
         </vn-button-menu>
     </h5>
     <vn-horizontal>
-        <vn-one>
-            <vn-label-value
-                label="Created"
-                value="{{$ctrl.summary.claim.created | date: 'dd/MM/yyyy'}}">
+        <vn-auto>
+            <h4>
+                <a
+                    ui-sref="claim.card.basicData({id:$ctrl.claim.id})"
+                    target="_self">
+                    <span translate vn-tooltip="Go to">Basic data</span>
+                </a>
+            </h4>
+                <vn-label-value
+                    label="Created"
+                    value="{{$ctrl.summary.claim.created | date: 'dd/MM/yyyy'}}">
+                </vn-label-value>
+                <vn-label-value
+                    label="State"
+                    value="{{$ctrl.summary.claim.claimState.description}}">
+                </vn-label-value>
+                <vn-label-value
+                label="Salesperson"
+                value="{{$ctrl.summary.claim.client.salesPersonUser.name}}">
             </vn-label-value>
             <vn-label-value
-                label="State"
-                value="{{$ctrl.summary.claim.claimState.description}}">
+                label="Attended by"
+                value="{{$ctrl.summary.claim.worker.user.nickname}}">
             </vn-label-value>
             <vn-check
                 class="vn-mr-md"
@@ -41,17 +56,7 @@
                 title="{{'When checked will notify to the salesPerson' | translate}}"
                 disabled="true">
             </vn-check>
-        </vn-one>
-        <vn-one>
-            <vn-label-value
-                label="Salesperson"
-                value="{{$ctrl.summary.claim.client.salesPersonUser.name}}">
-            </vn-label-value>
-            <vn-label-value
-                label="Attended by"
-                value="{{$ctrl.summary.claim.worker.user.nickname}}">
-            </vn-label-value>
-        </vn-one>
+        </vn-auto>
         <vn-auto>
             <h4 ng-show="$ctrl.isSalesPerson && $ctrl.summary.observations.length">
                 <a

From f85c2e9700dcada8120b286a54a99fd97c333d8e Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Mon, 17 Oct 2022 14:01:21 +0200
Subject: [PATCH 29/71] refactor: delete code repeated

---
 modules/ticket/back/methods/ticket/updateDiscount.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/ticket/back/methods/ticket/updateDiscount.js b/modules/ticket/back/methods/ticket/updateDiscount.js
index bfa3cdbf64..7e7c4e06d0 100644
--- a/modules/ticket/back/methods/ticket/updateDiscount.js
+++ b/modules/ticket/back/methods/ticket/updateDiscount.js
@@ -140,10 +140,9 @@ module.exports = Self => {
                         componentFk: oldComponent.componentFk
                     };
                     await models.SaleComponent.destroyAll(filter, myOptions);
+                }
 
-                    await createSaleComponent(sale.id, value, componentId, myOptions);
-                } else
-                    await createSaleComponent(sale.id, value, componentId, myOptions);
+                await createSaleComponent(sale.id, value, componentId, myOptions);
 
                 const updatedSale = sale.updateAttribute('discount', newDiscount, myOptions);
 

From 1d8fb253254962613d1ac2e7f879a4e3ad74186e Mon Sep 17 00:00:00 2001
From: Pau Navarro <pau@verdnatura.es>
Date: Tue, 18 Oct 2022 10:25:54 +0200
Subject: [PATCH 30/71] Refactored according to the suggested changes

---
 .../methods/worker/workerDisableExcluded.js   | 30 -------------
 .../worker/workerExcludeFromDisable.js        | 45 -------------------
 modules/worker/back/models/worker.js          |  2 -
 modules/worker/front/descriptor/index.html    | 11 +++--
 modules/worker/front/descriptor/index.js      | 24 ++++++----
 modules/worker/front/locale/es.yml            |  5 ++-
 6 files changed, 24 insertions(+), 93 deletions(-)
 delete mode 100644 modules/worker/back/methods/worker/workerDisableExcluded.js
 delete mode 100644 modules/worker/back/methods/worker/workerExcludeFromDisable.js

diff --git a/modules/worker/back/methods/worker/workerDisableExcluded.js b/modules/worker/back/methods/worker/workerDisableExcluded.js
deleted file mode 100644
index 017e044c25..0000000000
--- a/modules/worker/back/methods/worker/workerDisableExcluded.js
+++ /dev/null
@@ -1,30 +0,0 @@
-
-module.exports = Self => {
-    Self.remoteMethod('workerDisableExcluded', {
-        description: 'Check if the worker can be disabled',
-        accessType: 'READ',
-        accepts: {
-            arg: 'id',
-            type: 'Number',
-            required: true,
-            description: `The worker id`,
-            http: {source: 'path'}
-        },
-        returns: {
-            type: 'boolean',
-            root: true
-        },
-        http: {
-            path: `/workerDisableExcluded/:id`,
-            verb: 'GET'
-        }
-    });
-
-    Self.workerDisableExcluded = async id => {
-        let result;
-        const query = `Select * from vn.workerDisableExcluded where workerFk like ${id}`;
-        let sqlResult = await Self.rawSql(query);
-        sqlResult.length == 0 ? result = false : result = true;
-        return result;
-    };
-};
diff --git a/modules/worker/back/methods/worker/workerExcludeFromDisable.js b/modules/worker/back/methods/worker/workerExcludeFromDisable.js
deleted file mode 100644
index 86d940862d..0000000000
--- a/modules/worker/back/methods/worker/workerExcludeFromDisable.js
+++ /dev/null
@@ -1,45 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethod('workerExcludeFromDisable', {
-        description: 'Change the status of the worker between can be disabled and cant be disabled',
-        accessType: 'READ',
-        accepts: [{
-            arg: 'id',
-            type: 'Number',
-            required: true,
-            description: `The worker id`,
-            http: {source: 'path'}
-        },
-        {
-            arg: 'currValue',
-            type: 'Boolean',
-            required: true,
-            description: `The current value of workerDisableExcluded`,
-            http: {source: 'path'}
-        }],
-        returns: {
-            type: 'boolean',
-            root: true
-        },
-        http: {
-            path: `/workerExcludeFromDisable/:id/:currValue`,
-            verb: 'GET'
-        }
-    });
-
-    Self.workerExcludeFromDisable = async(id, currValue) => {
-        const models = Self.app.models;
-
-        if (!currValue) {
-            await models.WorkerDisableExcluded.create({
-                workerFk: id,
-                dated: new Date()
-            });
-        } else {
-            await models.WorkerDisableExcluded.remove({
-                workerFk: id
-            });
-        }
-
-        return false;
-    };
-};
diff --git a/modules/worker/back/models/worker.js b/modules/worker/back/models/worker.js
index c90729779a..ec6c4af282 100644
--- a/modules/worker/back/models/worker.js
+++ b/modules/worker/back/models/worker.js
@@ -13,6 +13,4 @@ module.exports = Self => {
     require('../methods/worker/contracts')(Self);
     require('../methods/worker/holidays')(Self);
     require('../methods/worker/activeContract')(Self);
-    require('../methods/worker/workerDisableExcluded')(Self);
-    require('../methods/worker/workerExcludeFromDisable')(Self);
 };
diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html
index c60801bb98..58ac3d9e6e 100644
--- a/modules/worker/front/descriptor/index.html
+++ b/modules/worker/front/descriptor/index.html
@@ -15,18 +15,17 @@
         </div>
     </slot-before>
     <slot-menu>
-         <!--ng-if="!$ctrl.canBeExcluded"-->
          <vn-item
-            ng-click="$ctrl.setExcluded()"
+            ng-click="$ctrl.handleExcluded()"
             translate
             ng-if="!$ctrl.excluded">
-            Marcar para no deshabilitar
+            Click to exclude the user from getting disabled
         </vn-item>
         <vn-item
-            ng-click="$ctrl.setExcluded()"
+            ng-click="$ctrl.handleExcluded()"
             translate
             ng-if="$ctrl.excluded">
-            Marcar como deshabilitable
+            Click to allow the user to be disabled 
         </vn-item>
     </slot-menu>
     <slot-body>
@@ -54,7 +53,7 @@
         </div>
         <div class="icons">
             <vn-icon
-                vn-tooltip="Fijado para no deshabilitar"
+                vn-tooltip="This user can't be disabled"
                 icon="person"
                 ng-if="$ctrl.worker.excluded">
             </vn-icon>
diff --git a/modules/worker/front/descriptor/index.js b/modules/worker/front/descriptor/index.js
index 7a3922a089..2ff032def7 100644
--- a/modules/worker/front/descriptor/index.js
+++ b/modules/worker/front/descriptor/index.js
@@ -5,7 +5,6 @@ class Controller extends Descriptor {
     constructor($element, $, $rootScope) {
         super($element, $);
         this.$rootScope = $rootScope;
-        this.canBeExcluded();
     }
 
     get worker() {
@@ -14,6 +13,9 @@ class Controller extends Descriptor {
 
     set worker(value) {
         this.entity = value;
+
+        if (value)
+            this.getIsExcluded();
     }
 
     get excluded() {
@@ -22,18 +24,22 @@ class Controller extends Descriptor {
 
     set excluded(value) {
         this.entity.excluded = value;
-        this.$rootScope.$apply();
     }
 
-    async canBeExcluded() {
-        await new Promise(r => setTimeout(r, 500));
-        let data = await this.$http.get(`Workers/workerDisableExcluded/${this.entity.id}`);
-        this.excluded = data.data;
+    getIsExcluded() {
+        this.$http.get(`workerDisableExcludeds/${this.entity.id}/exists`).then(data => {
+            this.excluded = data.data.exists;
+        });
     }
 
-    async setExcluded() {
-        await this.$http.get(`Workers/workerExcludeFromDisable/${this.entity.id}/${this.entity.excluded}`);
-        this.excluded = !this.entity.excluded;
+    handleExcluded() {
+        if (this.excluded) {
+            this.$http.delete(`workerDisableExcludeds/${this.entity.id}`);
+            this.excluded = false;
+        } else {
+            this.$http.post(`workerDisableExcludeds`, {workerFk: this.entity.id, dated: new Date});
+            this.excluded = true;
+        }
     }
 
     loadData() {
diff --git a/modules/worker/front/locale/es.yml b/modules/worker/front/locale/es.yml
index 1414d089bc..672f4c52f9 100644
--- a/modules/worker/front/locale/es.yml
+++ b/modules/worker/front/locale/es.yml
@@ -20,4 +20,7 @@ View worker: Ver trabajador
 Worker id: Id trabajador
 Workers: Trabajadores
 worker: trabajador
-Go to the worker: Ir al trabajador
\ No newline at end of file
+Go to the worker: Ir al trabajador
+Click to exclude the user from getting disabled: Marcar para no deshabilitar
+Click to allow the user to be disabled: Marcar para deshabilitar
+This user can't be disabled: Fijado para no deshabilitar
\ No newline at end of file

From c9e9e3545d664104d415ffc34cee1d820bc48c6c Mon Sep 17 00:00:00 2001
From: Pau Navarro <pau@verdnatura.es>
Date: Tue, 18 Oct 2022 10:33:48 +0200
Subject: [PATCH 31/71] Added ACL

---
 .../00-ACL_workerDisableExcluded.sql          | 20 +++++++++++++++++++
 db/changes/10491-august/delete.keep           |  0
 2 files changed, 20 insertions(+)
 create mode 100644 db/changes/10491-august/00-ACL_workerDisableExcluded.sql
 delete mode 100644 db/changes/10491-august/delete.keep

diff --git a/db/changes/10491-august/00-ACL_workerDisableExcluded.sql b/db/changes/10491-august/00-ACL_workerDisableExcluded.sql
new file mode 100644
index 0000000000..48fb4bb35c
--- /dev/null
+++ b/db/changes/10491-august/00-ACL_workerDisableExcluded.sql
@@ -0,0 +1,20 @@
+INSERT INTO
+    salix.ACL (
+        id,
+        model,
+        property,
+        accessType,
+        permission,
+        principalType,
+        principalId
+    )
+VALUES
+(
+        344,
+        'workerDisableExcluded',
+        '*',
+        '*',
+        'ALLOW',
+        'ROLE',
+        'employee'
+    );
\ No newline at end of file
diff --git a/db/changes/10491-august/delete.keep b/db/changes/10491-august/delete.keep
deleted file mode 100644
index e69de29bb2..0000000000

From f481cc3c97f2cc68f480863a97be13a7240bddc8 Mon Sep 17 00:00:00 2001
From: Pau Navarro <pau@verdnatura.es>
Date: Tue, 18 Oct 2022 10:38:40 +0200
Subject: [PATCH 32/71] Capitalizar

---
 db/changes/10491-august/00-ACL_workerDisableExcluded.sql | 2 +-
 modules/worker/back/model-config.json                    | 2 +-
 modules/worker/back/models/workerDisableExcluded.json    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/changes/10491-august/00-ACL_workerDisableExcluded.sql b/db/changes/10491-august/00-ACL_workerDisableExcluded.sql
index 48fb4bb35c..3d84c751c8 100644
--- a/db/changes/10491-august/00-ACL_workerDisableExcluded.sql
+++ b/db/changes/10491-august/00-ACL_workerDisableExcluded.sql
@@ -11,7 +11,7 @@ INSERT INTO
 VALUES
 (
         344,
-        'workerDisableExcluded',
+        'WorkerDisableExcluded',
         '*',
         '*',
         'ALLOW',
diff --git a/modules/worker/back/model-config.json b/modules/worker/back/model-config.json
index a41997908f..8c11c0d717 100644
--- a/modules/worker/back/model-config.json
+++ b/modules/worker/back/model-config.json
@@ -65,7 +65,7 @@
     "WorkerTimeControlMail": {
         "dataSource": "vn"
     },
-    "workerDisableExcluded": {
+    "WorkerDisableExcluded": {
         "dataSource": "vn"
     }
 }
diff --git a/modules/worker/back/models/workerDisableExcluded.json b/modules/worker/back/models/workerDisableExcluded.json
index cfa810e437..48083748d2 100644
--- a/modules/worker/back/models/workerDisableExcluded.json
+++ b/modules/worker/back/models/workerDisableExcluded.json
@@ -1,5 +1,5 @@
 {
-	"name": "workerDisableExcluded",
+	"name": "WorkerDisableExcluded",
 	"base": "VnModel",
 	"options": {
 		"mysql": {

From 81088bc4959c5173802416902847c118631a555d Mon Sep 17 00:00:00 2001
From: Pau Navarro <pau@verdnatura.es>
Date: Tue, 18 Oct 2022 10:46:14 +0200
Subject: [PATCH 33/71] Fixed ACL

---
 .../00-ACL_workerDisableExcluded.sql          | 22 ++-----------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/db/changes/10491-august/00-ACL_workerDisableExcluded.sql b/db/changes/10491-august/00-ACL_workerDisableExcluded.sql
index 3d84c751c8..7a23ca68a6 100644
--- a/db/changes/10491-august/00-ACL_workerDisableExcluded.sql
+++ b/db/changes/10491-august/00-ACL_workerDisableExcluded.sql
@@ -1,20 +1,2 @@
-INSERT INTO
-    salix.ACL (
-        id,
-        model,
-        property,
-        accessType,
-        permission,
-        principalType,
-        principalId
-    )
-VALUES
-(
-        344,
-        'WorkerDisableExcluded',
-        '*',
-        '*',
-        'ALLOW',
-        'ROLE',
-        'employee'
-    );
\ No newline at end of file
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalId)
+	VALUES ('WorkerDisableExcluded','*','*','ALLOW','employee');

From 423454d19ea755b1ebc1667c1ebbb6830a7bfb80 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Tue, 18 Oct 2022 11:47:22 +0200
Subject: [PATCH 34/71] feat: add date-picker

---
 modules/ticket/front/expedition/index.html | 20 ++++++++++++--------
 modules/ticket/front/expedition/index.js   | 15 ++++++++++-----
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html
index 35f56872c2..f4b2615339 100644
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@@ -138,25 +138,29 @@
 
 <vn-menu vn-id="moreOptions">
     <vn-item translate
-        name="sms"
-        ng-click="$ctrl.createTicket()">
+        name="withoutRoute"
+        ng-click="selectLanded.show('withoutRoute')">
         New ticket without route
     </vn-item>
     <vn-item translate
-        name="calculatePrice"
-        ng-click="selectRoute.show()">
+        name="withRoute"
+        ng-click="selectLanded.show('withRoute')">
         New ticket with route
     </vn-item>
 </vn-menu>
 
 <vn-dialog 
-    vn-id="selectRoute"
-    on-accept="$ctrl.createTicket($ctrl.ticket.newRoute)">
+    vn-id="selectLanded"
+    on-accept="$ctrl.createTicket($ctrl.landed, $ctrl.newRoute)">
     <tpl-body>
+        <vn-date-picker
+            label="Landed" 
+            ng-model="$ctrl.landed">
+        </vn-date-picker>
         <vn-textfield
-            vn-one
+            ng-show="selectLanded.data == 'withRoute'"
             label="Id route"
-            ng-model="$ctrl.ticket.newRoute">
+            ng-model="$ctrl.newRoute">
         </vn-textfield>
     </tpl-body>
     <tpl-buttons>
diff --git a/modules/ticket/front/expedition/index.js b/modules/ticket/front/expedition/index.js
index f7674716b1..49ba3280d7 100644
--- a/modules/ticket/front/expedition/index.js
+++ b/modules/ticket/front/expedition/index.js
@@ -2,6 +2,12 @@ import ngModule from '../module';
 import Section from 'salix/components/section';
 
 class Controller extends Section {
+    constructor($element, $scope) {
+        super($element, $scope);
+        this.landed = new Date();
+        this.newRoute = null;
+    }
+
     get checked() {
         const rows = this.$.model.data || [];
         const checkedRows = [];
@@ -28,7 +34,7 @@ class Controller extends Section {
     }
 
     onRemove() {
-        const params = {expeditionsIds: this.checked};
+        const params = {expeditionIds: this.checked};
         const query = `Expeditions/deleteExpeditions`;
         this.$http.post(query, params)
             .then(() => {
@@ -37,11 +43,10 @@ class Controller extends Section {
             });
     }
 
-    createTicket(routeFk) {
-        const date = new Date(); // esta fecha hay que preguntarla a Fran Monsalvez
+    createTicket(landed, routeFk) {
         const ticketParams = {
             clientId: this.ticket.clientFk,
-            landed: date,
+            landed: landed,
             addressId: this.ticket.addressFk,
             agencyModeId: this.ticket.agencyModeFk,
             warehouseId: this.ticket.warehouseFk
@@ -50,7 +55,7 @@ class Controller extends Section {
         this.$http.post(query, ticketParams).then(res => {
             if (routeFk) this.$http.patch(`Tickets/${res.data.id}`, {routeFk: routeFk});
             const params = {
-                expeditionsIds: this.checked,
+                expeditionIds: this.checked,
                 ticketId: res.data.id
             };
             const query = `Expeditions/moveExpeditions`;

From 5fce93abd5bd36720eec2ffa6d7df0f0ec3cbcd4 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Tue, 18 Oct 2022 11:47:37 +0200
Subject: [PATCH 35/71] refactor: change variables name

---
 modules/ticket/back/methods/expedition/deleteExpeditions.js | 6 +++---
 modules/ticket/back/methods/expedition/moveExpeditions.js   | 6 +++---
 modules/ticket/front/expedition/index.spec.js               | 4 ++--
 modules/ticket/front/expedition/locale/es.yml               | 3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/ticket/back/methods/expedition/deleteExpeditions.js b/modules/ticket/back/methods/expedition/deleteExpeditions.js
index b902b9f0c5..5b9d0daaa3 100644
--- a/modules/ticket/back/methods/expedition/deleteExpeditions.js
+++ b/modules/ticket/back/methods/expedition/deleteExpeditions.js
@@ -4,7 +4,7 @@ module.exports = Self => {
         description: 'Delete the selected expeditions',
         accessType: 'WRITE',
         accepts: [{
-            arg: 'expeditionsIds',
+            arg: 'expeditionIds',
             type: ['number'],
             required: true,
             description: 'The expeditions ids to delete'
@@ -19,7 +19,7 @@ module.exports = Self => {
         }
     });
 
-    Self.deleteExpeditions = async(expeditionsIds, options) => {
+    Self.deleteExpeditions = async(expeditionIds, options) => {
         const models = Self.app.models;
         const myOptions = {};
         let tx;
@@ -34,7 +34,7 @@ module.exports = Self => {
 
         try {
             const deletedExpeditions = await models.Expedition.destroyAll({
-                id: {inq: expeditionsIds}
+                id: {inq: expeditionIds}
             }, myOptions);
 
             if (tx) await tx.commit();
diff --git a/modules/ticket/back/methods/expedition/moveExpeditions.js b/modules/ticket/back/methods/expedition/moveExpeditions.js
index 2c521dda7c..338568fdb4 100644
--- a/modules/ticket/back/methods/expedition/moveExpeditions.js
+++ b/modules/ticket/back/methods/expedition/moveExpeditions.js
@@ -4,7 +4,7 @@ module.exports = Self => {
         description: 'Move the selected expeditions to another ticket',
         accessType: 'WRITE',
         accepts: [{
-            arg: 'expeditionsIds',
+            arg: 'expeditionIds',
             type: ['number'],
             required: true,
             description: 'The expeditions ids to nove'
@@ -25,7 +25,7 @@ module.exports = Self => {
         }
     });
 
-    Self.moveExpeditions = async(expeditionsIds, ticketId, options) => {
+    Self.moveExpeditions = async(expeditionIds, ticketId, options) => {
         const models = Self.app.models;
         const myOptions = {};
         let tx;
@@ -40,7 +40,7 @@ module.exports = Self => {
 
         try {
             const promises = [];
-            for (let expeditionsId of expeditionsIds) {
+            for (let expeditionsId of expeditionIds) {
                 const expeditionToUpdate = await models.Expedition.findById(expeditionsId);
                 const expeditionUpdated = expeditionToUpdate.updateAttribute('ticketFk', ticketId, myOptions);
                 promises.push(expeditionUpdated);
diff --git a/modules/ticket/front/expedition/index.spec.js b/modules/ticket/front/expedition/index.spec.js
index fe23046ce2..ad5dafbd7b 100644
--- a/modules/ticket/front/expedition/index.spec.js
+++ b/modules/ticket/front/expedition/index.spec.js
@@ -63,7 +63,7 @@ describe('Ticket', () => {
             it('should make a query and then call to the model refresh() method', () => {
                 jest.spyOn($scope.model, 'refresh');
 
-                const expectedParams = {expeditionsIds: [1, 2]};
+                const expectedParams = {expeditionIds: [1, 2]};
                 $httpBackend.expect('POST', 'Expeditions/deleteExpeditions', expectedParams).respond(200);
                 controller.onRemove();
                 $httpBackend.flush();
@@ -97,7 +97,7 @@ describe('Ticket', () => {
                 const expectedResponse = {id: ticketIdToTransfer};
 
                 const expectedParams = {
-                    expeditionsIds: [1, 2],
+                    expeditionIds: [1, 2],
                     ticketId: 28
                 };
                 $httpBackend.expect('POST', 'Tickets/new', expectedTicket).respond(expectedResponse);
diff --git a/modules/ticket/front/expedition/locale/es.yml b/modules/ticket/front/expedition/locale/es.yml
index bc3ec33455..68812f9850 100644
--- a/modules/ticket/front/expedition/locale/es.yml
+++ b/modules/ticket/front/expedition/locale/es.yml
@@ -2,4 +2,5 @@ Status log: Hitorial de estados
 Expedition removed: Expedición eliminada
 Move: Mover
 New ticket without route: Nuevo ticket sin ruta
-New ticket with route: Nuevo ticket con ruta
\ No newline at end of file
+New ticket with route: Nuevo ticket con ruta
+Id route: Id ruta
\ No newline at end of file

From ae3e3c3c49c4dc474d96fbd510febaa03fb28f7c Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Tue, 18 Oct 2022 12:37:06 +0200
Subject: [PATCH 36/71] fix: id model duplicated

---
 modules/ticket/front/expedition/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html
index f4b2615339..0ebe388c12 100644
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@@ -98,16 +98,16 @@
  
 <vn-popup vn-id="statusLog">
     <vn-crud-model
-        vn-id="model"
+        vn-id="modelExpeditionStates"
         url="ExpeditionStates/filter"
         link="{expeditionFk: $ctrl.expedition.id}"
         data="expeditionStates"
         order="created DESC"
         auto-load="true">
     </vn-crud-model>
-    <vn-data-viewer model="model">
+    <vn-data-viewer model="modelExpeditionStates">
         <vn-card class="vn-w-md">
-        <vn-table model="model">
+        <vn-table model="modelExpeditionStates">
             <vn-thead>
                 <vn-tr>
                     <vn-th field="state">State</vn-th>

From 9ea427dbfece8d68a6350e1f9861f2222c31f631 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Tue, 18 Oct 2022 13:45:46 +0200
Subject: [PATCH 37/71] refactor: move front to back funcionality

---
 loopback/locale/es.json                       |  3 +-
 .../methods/expedition/moveExpeditions.js     | 60 +++++++++++++++----
 modules/ticket/front/expedition/index.js      | 17 ++----
 3 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 67370b3438..bd9de41c29 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -235,5 +235,6 @@
 	"Dirección incorrecta": "Dirección incorrecta",
 	"Modifiable user details only by an administrator": "Detalles de usuario modificables solo por un administrador",
 	"Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
-	"Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente"
+	"Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
+	"This route not exists": "Esta ruta no existe"
 }
\ No newline at end of file
diff --git a/modules/ticket/back/methods/expedition/moveExpeditions.js b/modules/ticket/back/methods/expedition/moveExpeditions.js
index 338568fdb4..d0f8aa8939 100644
--- a/modules/ticket/back/methods/expedition/moveExpeditions.js
+++ b/modules/ticket/back/methods/expedition/moveExpeditions.js
@@ -1,19 +1,47 @@
+const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
-    Self.remoteMethod('moveExpeditions', {
+    Self.remoteMethodCtx('moveExpeditions', {
         description: 'Move the selected expeditions to another ticket',
         accessType: 'WRITE',
         accepts: [{
+            arg: 'clientId',
+            type: 'number',
+            description: `The client id`,
+            required: true
+        },
+        {
+            arg: 'landed',
+            type: 'date',
+            description: `The landing date`
+        },
+        {
+            arg: 'warehouseId',
+            type: 'number',
+            description: `The warehouse id`,
+            required: true
+        },
+        {
+            arg: 'addressId',
+            type: 'number',
+            description: `The address id`,
+            required: true
+        },
+        {
+            arg: 'agencyModeId',
+            type: 'any',
+            description: `The agencyMode id`
+        },
+        {
+            arg: 'routeId',
+            type: 'any',
+            description: `The route id`
+        },
+        {
             arg: 'expeditionIds',
             type: ['number'],
             required: true,
-            description: 'The expeditions ids to nove'
-        },
-        {
-            arg: 'ticketId',
-            type: 'number',
-            required: true,
-            description: 'the ticket id to which the expeditions are added'
+            description: 'The expeditions ids to move'
         }],
         returns: {
             type: 'object',
@@ -25,8 +53,9 @@ module.exports = Self => {
         }
     });
 
-    Self.moveExpeditions = async(expeditionIds, ticketId, options) => {
+    Self.moveExpeditions = async(ctx, options) => {
         const models = Self.app.models;
+        const args = ctx.args;
         const myOptions = {};
         let tx;
 
@@ -39,18 +68,23 @@ module.exports = Self => {
         }
 
         try {
+            if (args.routeId) {
+                const route = await models.Route.findById(args.routeId, null, myOptions);
+                if (!route) throw new UserError('This route not exists');
+            }
+            const ticket = await models.Ticket.new(ctx, myOptions);
             const promises = [];
-            for (let expeditionsId of expeditionIds) {
+            for (let expeditionsId of args.expeditionIds) {
                 const expeditionToUpdate = await models.Expedition.findById(expeditionsId);
-                const expeditionUpdated = expeditionToUpdate.updateAttribute('ticketFk', ticketId, myOptions);
+                const expeditionUpdated = expeditionToUpdate.updateAttribute('ticketFk', ticket.id, myOptions);
                 promises.push(expeditionUpdated);
             }
 
-            const updated = await Promise.all(promises);
+            await Promise.all(promises);
 
             if (tx) await tx.commit();
 
-            return updated;
+            return ticket;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;
diff --git a/modules/ticket/front/expedition/index.js b/modules/ticket/front/expedition/index.js
index 49ba3280d7..7ffe2fe5e6 100644
--- a/modules/ticket/front/expedition/index.js
+++ b/modules/ticket/front/expedition/index.js
@@ -44,22 +44,17 @@ class Controller extends Section {
     }
 
     createTicket(landed, routeFk) {
-        const ticketParams = {
+        const params = {
             clientId: this.ticket.clientFk,
             landed: landed,
+            warehouseId: this.ticket.warehouseFk,
             addressId: this.ticket.addressFk,
             agencyModeId: this.ticket.agencyModeFk,
-            warehouseId: this.ticket.warehouseFk
+            routeId: routeFk,
+            expeditionIds: this.checked
         };
-        const query = `Tickets/new`;
-        this.$http.post(query, ticketParams).then(res => {
-            if (routeFk) this.$http.patch(`Tickets/${res.data.id}`, {routeFk: routeFk});
-            const params = {
-                expeditionIds: this.checked,
-                ticketId: res.data.id
-            };
-            const query = `Expeditions/moveExpeditions`;
-            this.$http.post(query, params);
+        const query = `Expeditions/moveExpeditions`;
+        this.$http.post(query, params).then(res => {
             this.vnApp.showSuccess(this.$t('Data saved!'));
             this.$state.go('ticket.card.summary', {id: res.data.id});
         });

From 6f7ec12cb2119ce6584811d7d4228bdd8df499fb Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 19 Oct 2022 10:35:41 +0200
Subject: [PATCH 38/71] feat: response as 'reply' and not as 'internNote'

---
 back/methods/osticket/closeTicket.js          | 48 ++++++++++++++-----
 back/models/osticket-config.json              | 12 +++--
 db/changes/10481-june/00-osTicketConfig.sql   |  6 +--
 db/changes/10491-august/00-osTicketConfig.sql |  8 ++++
 db/dump/fixtures.sql                          |  4 ++
 package.json                                  |  1 +
 6 files changed, 58 insertions(+), 21 deletions(-)
 create mode 100644 db/changes/10491-august/00-osTicketConfig.sql

diff --git a/back/methods/osticket/closeTicket.js b/back/methods/osticket/closeTicket.js
index 87d54d3b86..33fe5958b0 100644
--- a/back/methods/osticket/closeTicket.js
+++ b/back/methods/osticket/closeTicket.js
@@ -1,12 +1,13 @@
 const jsdom = require('jsdom');
 const mysql = require('mysql');
+const FormData = require('form-data');
 
 module.exports = Self => {
     Self.remoteMethodCtx('closeTicket', {
         description: 'Close tickets without response from the user',
         accessType: 'READ',
         returns: {
-            type: 'Object',
+            type: 'object',
             root: true
         },
         http: {
@@ -54,9 +55,9 @@ module.exports = Self => {
             });
         });
 
-        await requestToken();
+        await getRequestToken();
 
-        async function requestToken() {
+        async function getRequestToken() {
             const response = await fetch(ostUri);
 
             const result = response.headers.get('set-cookie');
@@ -93,24 +94,45 @@ module.exports = Self => {
             await close(token, secondCookie);
         }
 
+        async function getLockCode(token, secondCookie, ticketId) {
+            const ostUri = `${config.host}/ajax.php/lock/ticket/${ticketId}`;
+            const params = {
+                method: 'POST',
+                headers: {
+                    'X-CSRFToken': token,
+                    'Cookie': secondCookie
+                }
+            };
+            const response = await fetch(ostUri, params);
+            const body = await response.text();
+            const json = JSON.parse(body);
+
+            return json.code;
+        }
+
         async function close(token, secondCookie) {
             for (const ticketId of ticketsId) {
-                const ostUri = `${config.host}/ajax.php/tickets/${ticketId}/status`;
-                const data = {
-                    status_id: config.newStatusId,
-                    comments: config.comment,
-                    undefined: config.action
-                };
+                const lockCode = await getLockCode(token, secondCookie, ticketId);
+                let form = new FormData();
+                form.append('__CSRFToken__', token);
+                form.append('id', ticketId);
+                form.append('a', config.responseType);
+                form.append('lockCode', lockCode);
+                form.append('from_email_id', config.fromEmailId);
+                form.append('reply-to', config.replyTo);
+                form.append('cannedResp', 0);
+                form.append('response', config.comment);
+                form.append('signature', 'none');
+                form.append('reply_status_id', config.newStatusId);
+
+                const ostUri = `${config.host}/tickets.php?id=${ticketId}`;
                 const params = {
                     method: 'POST',
-                    body: new URLSearchParams(data),
+                    body: form,
                     headers: {
-                        'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
-                        'X-CSRFToken': token,
                         'Cookie': secondCookie
                     }
                 };
-
                 return fetch(ostUri, params);
             }
         }
diff --git a/back/models/osticket-config.json b/back/models/osticket-config.json
index d42632c6a5..5a863e7bc7 100644
--- a/back/models/osticket-config.json
+++ b/back/models/osticket-config.json
@@ -27,9 +27,6 @@
         "newStatusId": {
             "type": "number"
         },
-        "action": {
-            "type": "string"
-        },
         "day": {
             "type": "number"
         },
@@ -47,6 +44,15 @@
         },
         "portDb": {
             "type": "number"
+        },
+        "responseType": {
+            "type": "string"
+        },
+        "fromEmailId": {
+            "type": "number"
+        },
+        "replyTo": {
+            "type": "string"
         }
     }
 }
\ No newline at end of file
diff --git a/db/changes/10481-june/00-osTicketConfig.sql b/db/changes/10481-june/00-osTicketConfig.sql
index ad66627153..8727c816dd 100644
--- a/db/changes/10481-june/00-osTicketConfig.sql
+++ b/db/changes/10481-june/00-osTicketConfig.sql
@@ -13,8 +13,4 @@ CREATE TABLE `vn`.`osTicketConfig` (
   `passwordDb` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `portDb` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-
-INSERT INTO `vn`.`osTicketConfig`(`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `action`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`)
-      VALUES
-      (0, 'https://cau.verdnatura.es/scp', NULL, NULL, 'open', 3, 'Cerrar', 60, 'Este CAU se ha cerrado automáticamente', NULL, NULL, NULL, NULL);
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
\ No newline at end of file
diff --git a/db/changes/10491-august/00-osTicketConfig.sql b/db/changes/10491-august/00-osTicketConfig.sql
new file mode 100644
index 0000000000..10a58b6c82
--- /dev/null
+++ b/db/changes/10491-august/00-osTicketConfig.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `vn`.`osTicketConfig` DROP COLUMN `action`;
+ALTER TABLE `vn`.`osTicketConfig` ADD responseType varchar(100) NULL;
+ALTER TABLE `vn`.`osTicketConfig` ADD fromEmailId INT NULL;
+ALTER TABLE `vn`.`osTicketConfig` ADD replyTo varchar(100) NULL;
+
+UPDATE `vn`.`osTicketConfig`
+    SET responseType='reply', fromEmailId=5, replyTo='all'
+WHERE id=0;
\ No newline at end of file
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 7e59c1a54a..b3f2d9c262 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -2667,3 +2667,7 @@ INSERT INTO `vn`.`ticketCollection` (`ticketFk`, `collectionFk`, `created`, `lev
 UPDATE `account`.`user`
     SET `hasGrant` = 1
         WHERE `id` = 66;
+
+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', 'open', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all');
\ No newline at end of file
diff --git a/package.json b/package.json
index 26c164832a..5ab329875a 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
         "bcrypt": "^5.0.1",
         "bmp-js": "^0.1.0",
         "compression": "^1.7.3",
+        "form-data": "^4.0.0",
         "fs-extra": "^5.0.0",
         "ftps": "^1.2.0",
         "got": "^10.7.0",

From 51cad752984fb2d13f804772aa8bec233430e4f7 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Thu, 20 Oct 2022 08:17:15 +0200
Subject: [PATCH 39/71] fix: testFront

---
 modules/ticket/front/expedition/index.spec.js | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/modules/ticket/front/expedition/index.spec.js b/modules/ticket/front/expedition/index.spec.js
index ad5dafbd7b..b95d64fa34 100644
--- a/modules/ticket/front/expedition/index.spec.js
+++ b/modules/ticket/front/expedition/index.spec.js
@@ -83,29 +83,25 @@ describe('Ticket', () => {
                     agencyModeFk: 1,
                     warehouseFk: 1
                 };
+                const routeId = null;
                 controller.ticket = ticket;
 
-                const expectedTicket = {
-                    clientId: 1101,
-                    landed: new Date(),
-                    addressId: 121,
-                    agencyModeId: 1,
-                    warehouseId: 1
-                };
-
-                const ticketIdToTransfer = 28;
-                const expectedResponse = {id: ticketIdToTransfer};
+                const ticketToTransfer = {id: 28};
 
                 const expectedParams = {
-                    expeditionIds: [1, 2],
-                    ticketId: 28
+                    clientId: 1101,
+                    landed: new Date(),
+                    warehouseId: 1,
+                    addressId: 121,
+                    agencyModeId: 1,
+                    routeId: null,
+                    expeditionIds: [1, 2]
                 };
-                $httpBackend.expect('POST', 'Tickets/new', expectedTicket).respond(expectedResponse);
-                $httpBackend.expect('POST', 'Expeditions/moveExpeditions', expectedParams).respond(200);
-                controller.createTicket();
+                $httpBackend.expect('POST', 'Expeditions/moveExpeditions', expectedParams).respond(ticketToTransfer);
+                controller.createTicket(ticket.landed, routeId);
                 $httpBackend.flush();
 
-                expect(controller.$state.go).toHaveBeenCalledWith('ticket.card.summary', {id: ticketIdToTransfer});
+                expect(controller.$state.go).toHaveBeenCalledWith('ticket.card.summary', {id: ticketToTransfer.id});
             });
         });
     });

From bcc9acac0ac997d9c54df4e12efc830dc50c1331 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Thu, 20 Oct 2022 08:41:00 +0200
Subject: [PATCH 40/71] fix: tBack

---
 .../expedition/specs/moveExpeditions.spec.js  | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js b/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
index 0bb402a558..67919e76c0 100644
--- a/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
+++ b/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
@@ -1,17 +1,33 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('ticket moveExpeditions()', () => {
-    it('should delete the selected expeditions', async() => {
+    it('should move the selected expeditions to new ticket', async() => {
         const tx = await models.Expedition.beginTransaction({});
+        const ctx = {
+            req: {accessToken: {userId: 9}},
+            args: {},
+            params: {}
+        };
+        const myCtx = Object.assign({}, ctx);
 
         try {
             const options = {transaction: tx};
+            myCtx.args = {
+                clientId: 1101,
+                landed: new Date(),
+                warehouseId: 1,
+                addressId: 121,
+                agencyModeId: 1,
+                routeId: null,
+                expeditionIds: [1, 2]
 
-            const expeditionIds = [12, 13];
-            const ticketId = 1;
-            const result = await models.Expedition.moveExpeditions(expeditionIds, ticketId, options);
+            };
 
-            expect(result.length).toEqual(2);
+            const ticket = await models.Expedition.moveExpeditions(myCtx, options);
+
+            const newestTicketIdInFixtures = 27;
+
+            expect(ticket.id).toBeGreaterThan(newestTicketIdInFixtures);
 
             await tx.rollback();
         } catch (e) {

From 2da34d0850de92ee8684fb9d339b59a4ff2cc852 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Thu, 20 Oct 2022 09:40:11 +0200
Subject: [PATCH 41/71] feat: add e2e

---
 e2e/helpers/selectors.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 74dabc31ad..dabb4c0cdc 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -596,8 +596,14 @@ export default {
         submitNotesButton: 'button[type=submit]'
     },
     ticketExpedition: {
+        firstSaleCheckbox: 'vn-ticket-expedition vn-tr:nth-child(1) vn-check[ng-model="expedition.checked"]',
         thirdSaleCheckbox: 'vn-ticket-expedition vn-tr:nth-child(3) vn-check[ng-model="expedition.checked"]',
         deleteExpeditionButton: 'vn-ticket-expedition vn-tool-bar > vn-button[icon="delete"]',
+        moveExpeditionButton: 'vn-ticket-expedition vn-tool-bar > vn-button[icon="keyboard_arrow_down"]',
+        moreMenuWithoutRoute: 'vn-item[name="withoutRoute"]',
+        moreMenuWithRoute: 'vn-item[name="withRoute"]',
+        newRouteId: '.vn-dialog.shown vn-textfield[ng-model="$ctrl.newRoute"]',
+        saveButton: '.vn-dialog.shown [response="accept"]',
         expeditionRow: 'vn-ticket-expedition vn-table vn-tbody > vn-tr'
     },
     ticketPackages: {

From 5824fee213055de7401a1ebd3e63f7879199315a Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Thu, 20 Oct 2022 09:40:23 +0200
Subject: [PATCH 42/71] feat: add e2e

---
 e2e/paths/05-ticket/20_moveExpedition.spec.js | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 e2e/paths/05-ticket/20_moveExpedition.spec.js

diff --git a/e2e/paths/05-ticket/20_moveExpedition.spec.js b/e2e/paths/05-ticket/20_moveExpedition.spec.js
new file mode 100644
index 0000000000..9673c70717
--- /dev/null
+++ b/e2e/paths/05-ticket/20_moveExpedition.spec.js
@@ -0,0 +1,50 @@
+import selectors from '../../helpers/selectors.js';
+import getBrowser from '../../helpers/puppeteer';
+
+fdescribe('Ticket expeditions', () => {
+    let browser;
+    let page;
+
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+        await page.loginAndModule('production', 'ticket');
+        await page.accessToSearchResult('1');
+        await page.accessToSection('ticket.card.expedition');
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    it(`should move one expedition to new ticket withoute route`, async() => {
+        await page.waitToClick(selectors.ticketExpedition.thirdSaleCheckbox);
+        await page.waitToClick(selectors.ticketExpedition.moveExpeditionButton);
+        await page.waitToClick(selectors.ticketExpedition.moreMenuWithoutRoute);
+        await page.waitToClick(selectors.ticketExpedition.saveButton);
+        await page.waitForState('ticket.card.summary');
+        await page.accessToSection('ticket.card.expedition');
+
+        await page.waitForSelector(selectors.ticketExpedition.expeditionRow, {});
+        const result = await page
+            .countElement(selectors.ticketExpedition.expeditionRow);
+
+        expect(result).toEqual(1);
+    });
+
+    it(`should move one expedition to new ticket with route`, async() => {
+        await page.waitToClick(selectors.ticketExpedition.firstSaleCheckbox);
+        await page.waitToClick(selectors.ticketExpedition.moveExpeditionButton);
+        await page.waitToClick(selectors.ticketExpedition.moreMenuWithRoute);
+        await page.write(selectors.ticketExpedition.newRouteId, '1');
+        await page.waitToClick(selectors.ticketExpedition.saveButton);
+        await page.waitForState('ticket.card.summary');
+        await page.accessToSection('ticket.card.expedition');
+
+        await page.waitForSelector(selectors.ticketExpedition.expeditionRow, {});
+        const result = await page
+            .countElement(selectors.ticketExpedition.expeditionRow);
+
+        expect(result).toEqual(1);
+    });
+});

From dd15d06f5edfb7c439482764551175e7fe225b70 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Thu, 20 Oct 2022 10:21:44 +0200
Subject: [PATCH 43/71] delete focus test

---
 e2e/paths/05-ticket/20_moveExpedition.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/paths/05-ticket/20_moveExpedition.spec.js b/e2e/paths/05-ticket/20_moveExpedition.spec.js
index 9673c70717..cf1c5ded32 100644
--- a/e2e/paths/05-ticket/20_moveExpedition.spec.js
+++ b/e2e/paths/05-ticket/20_moveExpedition.spec.js
@@ -1,7 +1,7 @@
 import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';
 
-fdescribe('Ticket expeditions', () => {
+describe('Ticket expeditions', () => {
     let browser;
     let page;
 

From 29093d7d30e98083c36ee81bebb5c5ed95453020 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Thu, 20 Oct 2022 14:25:55 +0200
Subject: [PATCH 44/71] =?UTF-8?q?feat:=20en=20vez=20de=20consultar=20si=20?=
 =?UTF-8?q?el=20usuario=20est=C3=A1=20en=20la=20tabla=20workerMana,=20cons?=
 =?UTF-8?q?ultar=20es=20si=20el=20usuario=20est=C3=A1=20en=20un=20departam?=
 =?UTF-8?q?ento=20que=20cuelga=20de=20ventas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../back/methods/sale/specs/updatePrice.spec.js       | 11 ++++++++++-
 modules/ticket/back/methods/sale/updatePrice.js       |  8 ++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/modules/ticket/back/methods/sale/specs/updatePrice.spec.js b/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
index e76511421e..75be665fb3 100644
--- a/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
+++ b/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
@@ -79,10 +79,19 @@ describe('sale updatePrice()', () => {
             const price = 5.4;
             const originalSalesPersonMana = await models.WorkerMana.findById(18, null, options);
             const manaComponent = await models.Component.findOne({where: {code: 'mana'}}, options);
+            const teamCLopez = 96;
+            const userId = 18;
+            await models.Sale.rawSql(`UPDATE vn.business b
+                                            JOIN vn.department d ON d.id = b.departmentFk 
+                                            SET b.departmentFk = ?
+                                        WHERE b.id = ?`, [teamCLopez, userId]);
 
             await models.Sale.updatePrice(ctx, saleId, price, options);
             const updatedSale = await models.Sale.findById(saleId, null, options);
-            createdSaleComponent = await models.SaleComponent.findOne({where: {saleFk: saleId, componentFk: manaComponent.id}}, options);
+            const createdSaleComponent = await models.SaleComponent.findOne({
+                where: {
+                    saleFk: saleId, componentFk: manaComponent.id
+                }}, options);
 
             expect(updatedSale.price).toBe(price);
             expect(createdSaleComponent.value).toEqual(-2.04);
diff --git a/modules/ticket/back/methods/sale/updatePrice.js b/modules/ticket/back/methods/sale/updatePrice.js
index bbd9d154db..dbd4ed091a 100644
--- a/modules/ticket/back/methods/sale/updatePrice.js
+++ b/modules/ticket/back/methods/sale/updatePrice.js
@@ -77,7 +77,12 @@ module.exports = Self => {
 
             const oldPrice = sale.price;
             const userId = ctx.req.accessToken.userId;
-            const usesMana = await models.WorkerMana.findOne({where: {workerFk: userId}, fields: 'amount'}, myOptions);
+
+            const salesDepartment = await models.Department.findOne({where: {code: 'VT'}, fields: 'id'}, myOptions);
+            const departments = await models.Department.getLeaves(salesDepartment.id, null, myOptions);
+            const workerDepartment = await models.WorkerDepartment.findById(userId);
+            const usesMana = departments.find(department => department.id == workerDepartment.departmentFk);
+
             const componentCode = usesMana ? 'mana' : 'buyerDiscount';
             const discount = await models.Component.findOne({where: {code: componentCode}}, myOptions);
             const componentId = discount.id;
@@ -88,7 +93,6 @@ module.exports = Self => {
                 saleFk: id
             };
             const saleComponent = await models.SaleComponent.findOne({where}, myOptions);
-
             if (saleComponent) {
                 await models.SaleComponent.updateAll(where, {
                     value: saleComponent.value + componentValue

From 6891190c72e019cb8c2c2232a028e27a47a1ea56 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Thu, 20 Oct 2022 15:05:46 +0200
Subject: [PATCH 45/71] refactor: create endpoint to unify code

---
 db/changes/10491-august/00-aclUsesMana.sql    |  3 ++
 .../ticket/back/methods/sale/updatePrice.js   | 10 +++---
 modules/ticket/back/methods/sale/usesMana.js  | 31 +++++++++++++++++++
 modules/ticket/back/models/sale.js            |  1 +
 4 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 db/changes/10491-august/00-aclUsesMana.sql
 create mode 100644 modules/ticket/back/methods/sale/usesMana.js

diff --git a/db/changes/10491-august/00-aclUsesMana.sql b/db/changes/10491-august/00-aclUsesMana.sql
new file mode 100644
index 0000000000..5bb7178dd4
--- /dev/null
+++ b/db/changes/10491-august/00-aclUsesMana.sql
@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Sale', 'usesMana', '*', 'ALLOW', 'ROLE', 'employee');
\ No newline at end of file
diff --git a/modules/ticket/back/methods/sale/updatePrice.js b/modules/ticket/back/methods/sale/updatePrice.js
index dbd4ed091a..d325d6eaa4 100644
--- a/modules/ticket/back/methods/sale/updatePrice.js
+++ b/modules/ticket/back/methods/sale/updatePrice.js
@@ -78,11 +78,13 @@ module.exports = Self => {
             const oldPrice = sale.price;
             const userId = ctx.req.accessToken.userId;
 
-            const salesDepartment = await models.Department.findOne({where: {code: 'VT'}, fields: 'id'}, myOptions);
-            const departments = await models.Department.getLeaves(salesDepartment.id, null, myOptions);
-            const workerDepartment = await models.WorkerDepartment.findById(userId);
-            const usesMana = departments.find(department => department.id == workerDepartment.departmentFk);
+            // const salesDepartment = await models.Department.findOne({where: {code: 'VT'}, fields: 'id'}, myOptions);
+            // const departments = await models.Department.getLeaves(salesDepartment.id, null, myOptions);
+            // const workerDepartment = await models.WorkerDepartment.findById(userId);
+            // const usesMana = departments.find(department => department.id == workerDepartment.departmentFk);
 
+            const usesMana = await models.Sale.usesMana();
+            console.log(usesMana ? 'mana' : 'buyerDiscount');
             const componentCode = usesMana ? 'mana' : 'buyerDiscount';
             const discount = await models.Component.findOne({where: {code: componentCode}}, myOptions);
             const componentId = discount.id;
diff --git a/modules/ticket/back/methods/sale/usesMana.js b/modules/ticket/back/methods/sale/usesMana.js
new file mode 100644
index 0000000000..7ff2a5e2a6
--- /dev/null
+++ b/modules/ticket/back/methods/sale/usesMana.js
@@ -0,0 +1,31 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('usesMana', {
+        description: 'Returns if the worker uses mana',
+        accessType: 'WRITE',
+        accepts: [],
+        returns: {
+            type: 'boolean',
+            root: true
+        },
+        http: {
+            path: `/usesMana`,
+            verb: 'POST'
+        }
+    });
+
+    Self.usesMana = async(ctx, options) => {
+        const models = Self.app.models;
+        const userId = ctx.req.accessToken.userId;
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const salesDepartment = await models.Department.findOne({where: {code: 'VT'}, fields: 'id'}, myOptions);
+        const departments = await models.Department.getLeaves(salesDepartment.id, null, myOptions);
+        const workerDepartment = await models.WorkerDepartment.findById(userId);
+        const usesMana = departments.find(department => department.id == workerDepartment.departmentFk);
+
+        return usesMana ? true : false;
+    };
+};
diff --git a/modules/ticket/back/models/sale.js b/modules/ticket/back/models/sale.js
index 2a4457263d..ae247fc242 100644
--- a/modules/ticket/back/models/sale.js
+++ b/modules/ticket/back/models/sale.js
@@ -8,6 +8,7 @@ module.exports = Self => {
     require('../methods/sale/recalculatePrice')(Self);
     require('../methods/sale/refund')(Self);
     require('../methods/sale/canEdit')(Self);
+    require('../methods/sale/usesMana')(Self);
 
     Self.validatesPresenceOf('concept', {
         message: `Concept cannot be blank`

From 5da29fe38158e71d3d8fab36fd2fb9deab0bf137 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Fri, 21 Oct 2022 08:00:24 +0200
Subject: [PATCH 46/71] refactor: unify duplicated code

---
 modules/ticket/back/methods/sale/updatePrice.js      | 8 +-------
 modules/ticket/back/methods/sale/usesMana.js         | 6 +++---
 modules/ticket/back/methods/ticket/updateDiscount.js | 7 +------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/modules/ticket/back/methods/sale/updatePrice.js b/modules/ticket/back/methods/sale/updatePrice.js
index d325d6eaa4..302522cfbc 100644
--- a/modules/ticket/back/methods/sale/updatePrice.js
+++ b/modules/ticket/back/methods/sale/updatePrice.js
@@ -78,13 +78,7 @@ module.exports = Self => {
             const oldPrice = sale.price;
             const userId = ctx.req.accessToken.userId;
 
-            // const salesDepartment = await models.Department.findOne({where: {code: 'VT'}, fields: 'id'}, myOptions);
-            // const departments = await models.Department.getLeaves(salesDepartment.id, null, myOptions);
-            // const workerDepartment = await models.WorkerDepartment.findById(userId);
-            // const usesMana = departments.find(department => department.id == workerDepartment.departmentFk);
-
-            const usesMana = await models.Sale.usesMana();
-            console.log(usesMana ? 'mana' : 'buyerDiscount');
+            const usesMana = await models.Sale.usesMana(ctx, myOptions);
             const componentCode = usesMana ? 'mana' : 'buyerDiscount';
             const discount = await models.Component.findOne({where: {code: componentCode}}, myOptions);
             const componentId = discount.id;
diff --git a/modules/ticket/back/methods/sale/usesMana.js b/modules/ticket/back/methods/sale/usesMana.js
index 7ff2a5e2a6..093057dca4 100644
--- a/modules/ticket/back/methods/sale/usesMana.js
+++ b/modules/ticket/back/methods/sale/usesMana.js
@@ -1,7 +1,7 @@
 module.exports = Self => {
     Self.remoteMethodCtx('usesMana', {
         description: 'Returns if the worker uses mana',
-        accessType: 'WRITE',
+        accessType: 'READ',
         accepts: [],
         returns: {
             type: 'boolean',
@@ -9,7 +9,7 @@ module.exports = Self => {
         },
         http: {
             path: `/usesMana`,
-            verb: 'POST'
+            verb: 'GET'
         }
     });
 
@@ -23,7 +23,7 @@ module.exports = Self => {
 
         const salesDepartment = await models.Department.findOne({where: {code: 'VT'}, fields: 'id'}, myOptions);
         const departments = await models.Department.getLeaves(salesDepartment.id, null, myOptions);
-        const workerDepartment = await models.WorkerDepartment.findById(userId);
+        const workerDepartment = await models.WorkerDepartment.findById(userId, null, myOptions);
         const usesMana = departments.find(department => department.id == workerDepartment.departmentFk);
 
         return usesMana ? true : false;
diff --git a/modules/ticket/back/methods/ticket/updateDiscount.js b/modules/ticket/back/methods/ticket/updateDiscount.js
index b1291a45bf..9419b9a40b 100644
--- a/modules/ticket/back/methods/ticket/updateDiscount.js
+++ b/modules/ticket/back/methods/ticket/updateDiscount.js
@@ -98,12 +98,7 @@ module.exports = Self => {
             if (isLocked || (!hasAllowedRoles && alertLevel > 0))
                 throw new UserError(`The sales of this ticket can't be modified`);
 
-            const usesMana = await models.WorkerMana.findOne({
-                where: {
-                    workerFk: userId
-                },
-                fields: 'amount'}, myOptions);
-
+            const usesMana = await models.Sale.usesMana(ctx);
             const componentCode = usesMana ? manaCode : 'buyerDiscount';
             const discountComponent = await models.Component.findOne({
                 where: {code: componentCode}}, myOptions);

From 6f31bea21f50306ef47133afeacb447b2fb709a0 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Fri, 21 Oct 2022 08:00:48 +0200
Subject: [PATCH 47/71] feat: update testBack

---
 db/changes/10491-august/00-aclBusiness.sql    |  3 ++
 modules/client/back/model-config.json         |  3 ++
 modules/client/back/models/business.json      | 27 +++++++++++
 .../methods/sale/specs/updatePrice.spec.js    | 11 ++---
 .../back/methods/sale/specs/usesMana.spec.js  | 48 +++++++++++++++++++
 5 files changed, 86 insertions(+), 6 deletions(-)
 create mode 100644 db/changes/10491-august/00-aclBusiness.sql
 create mode 100644 modules/client/back/models/business.json
 create mode 100644 modules/ticket/back/methods/sale/specs/usesMana.spec.js

diff --git a/db/changes/10491-august/00-aclBusiness.sql b/db/changes/10491-august/00-aclBusiness.sql
new file mode 100644
index 0000000000..f1f7a36323
--- /dev/null
+++ b/db/changes/10491-august/00-aclBusiness.sql
@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Business', '*', '*', 'ALLOW', 'ROLE', 'employee');
\ No newline at end of file
diff --git a/modules/client/back/model-config.json b/modules/client/back/model-config.json
index b2e600610e..4ef34ca3a6 100644
--- a/modules/client/back/model-config.json
+++ b/modules/client/back/model-config.json
@@ -8,6 +8,9 @@
     "BankEntity": {
         "dataSource": "vn"
     },
+    "Business": {
+        "dataSource": "vn"
+    },
     "BusinessType": {
         "dataSource": "vn"
     },
diff --git a/modules/client/back/models/business.json b/modules/client/back/models/business.json
new file mode 100644
index 0000000000..7ad2d307ff
--- /dev/null
+++ b/modules/client/back/models/business.json
@@ -0,0 +1,27 @@
+{
+    "name": "Business",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "business"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        }
+    },
+    "relations": {
+        "worker": {
+            "type": "belongsTo",
+            "model": "Worker",
+            "foreignKey": "workerFk"
+        },
+        "department": {
+            "type": "belongsTo",
+            "model": "Department",
+            "foreignKey": "departmentFk"
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/ticket/back/methods/sale/specs/updatePrice.spec.js b/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
index 75be665fb3..f8cb5a4ecd 100644
--- a/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
+++ b/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
@@ -1,6 +1,6 @@
 const models = require('vn-loopback/server/server').models;
 
-describe('sale updatePrice()', () => {
+fdescribe('sale updatePrice()', () => {
     const ctx = {
         req: {
             accessToken: {userId: 18},
@@ -80,11 +80,10 @@ describe('sale updatePrice()', () => {
             const originalSalesPersonMana = await models.WorkerMana.findById(18, null, options);
             const manaComponent = await models.Component.findOne({where: {code: 'mana'}}, options);
             const teamCLopez = 96;
-            const userId = 18;
-            await models.Sale.rawSql(`UPDATE vn.business b
-                                            JOIN vn.department d ON d.id = b.departmentFk 
-                                            SET b.departmentFk = ?
-                                        WHERE b.id = ?`, [teamCLopez, userId]);
+            const userId = ctx.req.accessToken.userId;
+
+            const business = await models.Business.findOne({where: {workerFk: userId}}, options);
+            await business.updateAttribute('departmentFk', teamCLopez, options);
 
             await models.Sale.updatePrice(ctx, saleId, price, options);
             const updatedSale = await models.Sale.findById(saleId, null, options);
diff --git a/modules/ticket/back/methods/sale/specs/usesMana.spec.js b/modules/ticket/back/methods/sale/specs/usesMana.spec.js
new file mode 100644
index 0000000000..4e14ed2c96
--- /dev/null
+++ b/modules/ticket/back/methods/sale/specs/usesMana.spec.js
@@ -0,0 +1,48 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('sale usesMana()', () => {
+    const ctx = {
+        req: {
+            accessToken: {userId: 18}
+        }
+    };
+
+    it('should return that the worker uses mana', async() => {
+        const tx = await models.Sale.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const teamCLopez = 96;
+            const userId = ctx.req.accessToken.userId;
+
+            const business = await models.Business.findOne({where: {workerFk: userId}}, options);
+            await business.updateAttribute('departmentFk', teamCLopez, options);
+
+            const usesMana = await models.Sale.usesMana(ctx, options);
+
+            expect(usesMana).toBe(true);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return that the worker not uses mana', async() => {
+        const tx = await models.Sale.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const usesMana = await models.Sale.usesMana(ctx, options);
+
+            expect(usesMana).toBe(false);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

From e7261573d7954cd9ce129efc0dd945e1114febfe Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Fri, 21 Oct 2022 08:01:22 +0200
Subject: [PATCH 48/71] delete focus

---
 modules/ticket/back/methods/sale/specs/updatePrice.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ticket/back/methods/sale/specs/updatePrice.spec.js b/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
index f8cb5a4ecd..15b00a7329 100644
--- a/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
+++ b/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
@@ -1,6 +1,6 @@
 const models = require('vn-loopback/server/server').models;
 
-fdescribe('sale updatePrice()', () => {
+describe('sale updatePrice()', () => {
     const ctx = {
         req: {
             accessToken: {userId: 18},

From 2d0cb60b50825144113edde29f97f084240002ac Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Fri, 21 Oct 2022 08:55:05 +0200
Subject: [PATCH 49/71] feat: check if uses mana

---
 modules/ticket/front/sale/index.html | 14 ++++++++++++--
 modules/ticket/front/sale/index.js   |  8 ++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 42eb10cb06..35e45a8120 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -264,6 +264,16 @@
                 </div>
             </div>
         </div>
+        <vn-horizontal >
+            <vn-button
+                label="Cancel"
+                ng-click="$ctrl.cancel()">
+            </vn-button>
+            <vn-button
+                label="Save"
+                ng-click="$ctrl.save()">
+            </vn-button>
+        </vn-horizontal>
     </div>
 </vn-popover>
 
@@ -278,7 +288,7 @@
         </vn-spinner>
         <div ng-if="$ctrl.edit.mana != null">
             <section class="header vn-pa-md">
-                <h5>Mana: {{::$ctrl.edit.mana | currency: 'EUR':0}}</h5>
+                <h5>MANÁ: {{::$ctrl.edit.mana | currency: 'EUR': 0}}</h5>
             </section>
             <div class="vn-pa-md">
                 <vn-input-number
@@ -288,7 +298,7 @@
                     clear-disabled="true"
                     suffix="%">
                 </vn-input-number>
-                <vn-vertical ng-if="$ctrl.currentWorkerMana != 0">
+                <vn-vertical ng-if="$ctrl.usesMana && $ctrl.currentWorkerMana != 0">
                     <vn-radio
                         label="Promotion mana"
                         val="mana"
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index 2724bb97d9..e67f675907 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -75,6 +75,7 @@ class Controller extends Section {
                     this.$.editPricePopover.relocate();
                 });
             });
+        this.getUsesMana();
         this.getCurrentWorkerMana();
     }
 
@@ -85,6 +86,13 @@ class Controller extends Section {
             });
     }
 
+    getUsesMana() {
+        this.$http.get(`Sales/usesMana`)
+            .then(res => {
+                this.useMana = res.data;
+            });
+    }
+
     /**
      * Returns checked instances
      *

From c33cab7b10b94be095f0b96e4c2860e68e3fcf36 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Fri, 21 Oct 2022 09:01:08 +0200
Subject: [PATCH 50/71] fix: test back

---
 .../back/methods/ticket/specs/updateDiscount.spec.js   | 10 ++++++++++
 modules/ticket/back/methods/ticket/updateDiscount.js   |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/ticket/back/methods/ticket/specs/updateDiscount.spec.js b/modules/ticket/back/methods/ticket/specs/updateDiscount.spec.js
index 1873207aad..5249fe5d88 100644
--- a/modules/ticket/back/methods/ticket/specs/updateDiscount.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/updateDiscount.spec.js
@@ -110,6 +110,11 @@ describe('sale updateDiscount()', () => {
             const componentId = manaDiscount.id;
             const manaCode = 'mana';
 
+            const teamCLopez = 96;
+            const userId = ctx.req.accessToken.userId;
+            const business = await models.Business.findOne({where: {workerFk: userId}}, options);
+            await business.updateAttribute('departmentFk', teamCLopez, options);
+
             await models.Ticket.updateDiscount(ctx, ticketId, sales, newDiscount, manaCode, options);
 
             const updatedSale = await models.Sale.findById(originalSaleId, null, options);
@@ -150,6 +155,11 @@ describe('sale updateDiscount()', () => {
             const componentId = manaDiscount.id;
             const manaCode = 'manaClaim';
 
+            const teamCLopez = 96;
+            const userId = ctx.req.accessToken.userId;
+            const business = await models.Business.findOne({where: {workerFk: userId}}, options);
+            await business.updateAttribute('departmentFk', teamCLopez, options);
+
             await models.Ticket.updateDiscount(ctx, ticketId, sales, newDiscount, manaCode, options);
 
             const updatedSale = await models.Sale.findById(originalSaleId, null, options);
diff --git a/modules/ticket/back/methods/ticket/updateDiscount.js b/modules/ticket/back/methods/ticket/updateDiscount.js
index 9419b9a40b..8bc79ca9c3 100644
--- a/modules/ticket/back/methods/ticket/updateDiscount.js
+++ b/modules/ticket/back/methods/ticket/updateDiscount.js
@@ -98,7 +98,7 @@ module.exports = Self => {
             if (isLocked || (!hasAllowedRoles && alertLevel > 0))
                 throw new UserError(`The sales of this ticket can't be modified`);
 
-            const usesMana = await models.Sale.usesMana(ctx);
+            const usesMana = await models.Sale.usesMana(ctx, myOptions);
             const componentCode = usesMana ? manaCode : 'buyerDiscount';
             const discountComponent = await models.Component.findOne({
                 where: {code: componentCode}}, myOptions);

From f968b19d1e2603036050fbc2b5b17680f5b05d13 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Fri, 21 Oct 2022 09:08:17 +0200
Subject: [PATCH 51/71] fix: testFront

---
 modules/ticket/front/sale/index.spec.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/ticket/front/sale/index.spec.js b/modules/ticket/front/sale/index.spec.js
index 28d8749328..a7260a3ec4 100644
--- a/modules/ticket/front/sale/index.spec.js
+++ b/modules/ticket/front/sale/index.spec.js
@@ -115,6 +115,7 @@ describe('Ticket', () => {
                 const expectedAmount = 250;
 
                 $httpBackend.expect('GET', 'Tickets/1/getSalesPersonMana').respond(200, expectedAmount);
+                $httpBackend.expect('GET', 'Sales/usesMana').respond(200);
                 $httpBackend.expect('GET', 'WorkerManas/getCurrentWorkerMana').respond(200, expectedAmount);
                 controller.getMana();
                 $httpBackend.flush();

From 18c119c62a88a0e1959d1af2e00d22f9a91e37b1 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Fri, 21 Oct 2022 09:20:27 +0200
Subject: [PATCH 52/71] change acl

---
 db/changes/10491-august/00-aclBusiness.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/changes/10491-august/00-aclBusiness.sql b/db/changes/10491-august/00-aclBusiness.sql
index f1f7a36323..8ea2c6d83b 100644
--- a/db/changes/10491-august/00-aclBusiness.sql
+++ b/db/changes/10491-august/00-aclBusiness.sql
@@ -1,3 +1,3 @@
 INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
     VALUES
-        ('Business', '*', '*', 'ALLOW', 'ROLE', 'employee');
\ No newline at end of file
+        ('Business', '*', '*', 'ALLOW', 'ROLE', 'hr');
\ No newline at end of file

From 8a3573474a99de0a60a330ab00c0fd106273c406 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Tue, 25 Oct 2022 07:40:32 +0200
Subject: [PATCH 53/71] refactor: move 'lastEntries' to thrid position in
 descriptor

---
 modules/item/front/routes.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/item/front/routes.json b/modules/item/front/routes.json
index 52cf5d2be9..3dea69ba1b 100644
--- a/modules/item/front/routes.json
+++ b/modules/item/front/routes.json
@@ -15,12 +15,12 @@
         "card": [
             {"state": "item.card.basicData", "icon": "settings"},
             {"state": "item.card.tags", "icon": "icon-tags"},
+            {"state": "item.card.last-entries", "icon": "icon-regentry"},
             {"state": "item.card.tax", "icon": "icon-tax"},
             {"state": "item.card.botanical", "icon": "local_florist"},
             {"state": "item.card.shelving", "icon": "icon-inventory"},
             {"state": "item.card.itemBarcode", "icon": "icon-barcode"}, 
             {"state": "item.card.diary", "icon": "icon-transaction"}, 
-            {"state": "item.card.last-entries", "icon": "icon-regentry"},
             {"state": "item.card.log", "icon": "history"}
         ],
         "itemType": [

From 7f1dd801a55aff414fbaf06eacbbdb8bf25039ad Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Tue, 25 Oct 2022 07:56:17 +0200
Subject: [PATCH 54/71] refactor: change ACLs

---
 db/changes/10491-august/00-aclItemShelving.sql                | 3 ---
 db/changes/10491-august/00-aclItemShelvingPlacementSupply.sql | 3 ---
 db/changes/10500-november/00-itemShelvingACL.sql              | 4 ++++
 .../10500-november/00-itemShelvingPlacementSupplyStockACL.sql | 4 ++++
 4 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 db/changes/10491-august/00-aclItemShelving.sql
 delete mode 100644 db/changes/10491-august/00-aclItemShelvingPlacementSupply.sql
 create mode 100644 db/changes/10500-november/00-itemShelvingACL.sql
 create mode 100644 db/changes/10500-november/00-itemShelvingPlacementSupplyStockACL.sql

diff --git a/db/changes/10491-august/00-aclItemShelving.sql b/db/changes/10491-august/00-aclItemShelving.sql
deleted file mode 100644
index 3995bbe497..0000000000
--- a/db/changes/10491-august/00-aclItemShelving.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES
-        ('ItemShelving', '*', '*', 'ALLOW', 'ROLE', 'employee');
\ No newline at end of file
diff --git a/db/changes/10491-august/00-aclItemShelvingPlacementSupply.sql b/db/changes/10491-august/00-aclItemShelvingPlacementSupply.sql
deleted file mode 100644
index cc589a58f4..0000000000
--- a/db/changes/10491-august/00-aclItemShelvingPlacementSupply.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES
-        ('ItemShelvingPlacementSupplyStock', '*', '*', 'ALLOW', 'ROLE', 'employee');
\ No newline at end of file
diff --git a/db/changes/10500-november/00-itemShelvingACL.sql b/db/changes/10500-november/00-itemShelvingACL.sql
new file mode 100644
index 0000000000..fc32fe1edc
--- /dev/null
+++ b/db/changes/10500-november/00-itemShelvingACL.sql
@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+VALUES 
+    ('ItemShelving', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('ItemShelving', '*', 'WRITE', 'ALLOW', 'ROLE', 'production');
\ No newline at end of file
diff --git a/db/changes/10500-november/00-itemShelvingPlacementSupplyStockACL.sql b/db/changes/10500-november/00-itemShelvingPlacementSupplyStockACL.sql
new file mode 100644
index 0000000000..25eac8d518
--- /dev/null
+++ b/db/changes/10500-november/00-itemShelvingPlacementSupplyStockACL.sql
@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+VALUES 
+    ('ItemShelvingPlacementSupplyStock', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
+

From 23598c993b74572e0a658d66560636197832d9b4 Mon Sep 17 00:00:00 2001
From: Pau Navarro <pau@verdnatura.es>
Date: Tue, 25 Oct 2022 09:25:15 +0200
Subject: [PATCH 55/71] Change ACL from employee to hr

---
 db/changes/10491-august/00-ACL_workerDisableExcluded.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/changes/10491-august/00-ACL_workerDisableExcluded.sql b/db/changes/10491-august/00-ACL_workerDisableExcluded.sql
index 7a23ca68a6..2fd9e8b121 100644
--- a/db/changes/10491-august/00-ACL_workerDisableExcluded.sql
+++ b/db/changes/10491-august/00-ACL_workerDisableExcluded.sql
@@ -1,2 +1,2 @@
 INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalId)
-	VALUES ('WorkerDisableExcluded','*','*','ALLOW','employee');
+	VALUES ('WorkerDisableExcluded','*','*','ALLOW','hr');
\ No newline at end of file

From 07a18dc736048fd3f6304daa80a9ef0fcf985e0c Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 26 Oct 2022 08:05:11 +0200
Subject: [PATCH 56/71] delete sql

---
 db/changes/10491-august/00-itemType.sql | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 db/changes/10491-august/00-itemType.sql

diff --git a/db/changes/10491-august/00-itemType.sql b/db/changes/10491-august/00-itemType.sql
deleted file mode 100644
index d201acf370..0000000000
--- a/db/changes/10491-august/00-itemType.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `vn`.`itemType` CHANGE `transaction` transaction__ tinyint(4) DEFAULT 0 NOT NULL;
-ALTER TABLE `vn`.`itemType` CHANGE location location__ varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
-ALTER TABLE `vn`.`itemType` CHANGE hasComponents hasComponents__ tinyint(1) DEFAULT 1 NOT NULL;
-ALTER TABLE `vn`.`itemType` CHANGE warehouseFk warehouseFk__ smallint(6) unsigned DEFAULT 60 NOT NULL;
-ALTER TABLE `vn`.`itemType` CHANGE compression compression__ decimal(5,2) DEFAULT 1.00 NULL;
\ No newline at end of file

From 925565d3d24037bb53d209823db0b5cef12bc83c Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 26 Oct 2022 08:23:36 +0200
Subject: [PATCH 57/71] =?UTF-8?q?refator:=20borrada=20variable=20global=20?=
 =?UTF-8?q?y=20a=C3=B1adida=20Promesa=20al=20array?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ticket/back/methods/ticket/updateDiscount.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/ticket/back/methods/ticket/updateDiscount.js b/modules/ticket/back/methods/ticket/updateDiscount.js
index 7e7c4e06d0..a60d732b14 100644
--- a/modules/ticket/back/methods/ticket/updateDiscount.js
+++ b/modules/ticket/back/methods/ticket/updateDiscount.js
@@ -133,20 +133,20 @@ module.exports = Self => {
                     }
                 }, myOptions);
 
-                let newComponent;
+                let deletedComponent;
                 if (oldComponent) {
                     const filter = {
                         saleFk: sale.id,
                         componentFk: oldComponent.componentFk
                     };
-                    await models.SaleComponent.destroyAll(filter, myOptions);
+                    deletedComponent = await models.SaleComponent.destroyAll(filter, myOptions);
                 }
 
-                await createSaleComponent(sale.id, value, componentId, myOptions);
+                const newComponent = await createSaleComponent(sale.id, value, componentId, myOptions);
 
                 const updatedSale = sale.updateAttribute('discount', newDiscount, myOptions);
 
-                promises.push(newComponent, updatedSale);
+                promises.push(newComponent, updatedSale, deletedComponent);
 
                 const change = `${oldDiscount}% ➔ *${newDiscount}%*`;
                 changesMade += `\r\n-${sale.itemFk}: ${sale.concept} (${sale.quantity}) ${change}`;
@@ -193,7 +193,7 @@ module.exports = Self => {
     async function createSaleComponent(saleId, value, componentId, myOptions) {
         const models = Self.app.models;
 
-        newComponent = models.SaleComponent.create({
+        return models.SaleComponent.create({
             saleFk: saleId,
             value: value,
             componentFk: componentId

From d4e278363009abaa45090212dc3e50a2f0430086 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 26 Oct 2022 08:39:07 +0200
Subject: [PATCH 58/71] =?UTF-8?q?refactor:=20corregidas=20traducciones,=20?=
 =?UTF-8?q?eliminado=20destroyAll=20y=20a=C3=B1adida=20transacci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 loopback/locale/es.json                                |  2 +-
 .../back/methods/expedition/deleteExpeditions.js       | 10 +++++++---
 .../ticket/back/methods/expedition/moveExpeditions.js  |  4 ++--
 .../methods/expedition/specs/deleteExpeditions.spec.js |  2 +-
 modules/ticket/front/expedition/index.html             |  2 +-
 modules/ticket/front/expedition/locale/es.yml          |  2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index bd9de41c29..2d9bae1d83 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -236,5 +236,5 @@
 	"Modifiable user details only by an administrator": "Detalles de usuario modificables solo por un administrador",
 	"Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
 	"Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
-	"This route not exists": "Esta ruta no existe"
+	"This route does not exists": "Esta ruta no existe"
 }
\ No newline at end of file
diff --git a/modules/ticket/back/methods/expedition/deleteExpeditions.js b/modules/ticket/back/methods/expedition/deleteExpeditions.js
index 5b9d0daaa3..2419d3a5e8 100644
--- a/modules/ticket/back/methods/expedition/deleteExpeditions.js
+++ b/modules/ticket/back/methods/expedition/deleteExpeditions.js
@@ -33,9 +33,13 @@ module.exports = Self => {
         }
 
         try {
-            const deletedExpeditions = await models.Expedition.destroyAll({
-                id: {inq: expeditionIds}
-            }, myOptions);
+            const promises = [];
+            for (let expeditionId of expeditionIds) {
+                const deletedExpedition = models.Expedition.destroyById(expeditionId, myOptions);
+                promises.push(deletedExpedition);
+            }
+
+            const deletedExpeditions = await Promise.all(promises);
 
             if (tx) await tx.commit();
 
diff --git a/modules/ticket/back/methods/expedition/moveExpeditions.js b/modules/ticket/back/methods/expedition/moveExpeditions.js
index d0f8aa8939..cef35ab867 100644
--- a/modules/ticket/back/methods/expedition/moveExpeditions.js
+++ b/modules/ticket/back/methods/expedition/moveExpeditions.js
@@ -70,12 +70,12 @@ module.exports = Self => {
         try {
             if (args.routeId) {
                 const route = await models.Route.findById(args.routeId, null, myOptions);
-                if (!route) throw new UserError('This route not exists');
+                if (!route) throw new UserError('This route does not exists');
             }
             const ticket = await models.Ticket.new(ctx, myOptions);
             const promises = [];
             for (let expeditionsId of args.expeditionIds) {
-                const expeditionToUpdate = await models.Expedition.findById(expeditionsId);
+                const expeditionToUpdate = await models.Expedition.findById(expeditionsId, null, myOptions);
                 const expeditionUpdated = expeditionToUpdate.updateAttribute('ticketFk', ticket.id, myOptions);
                 promises.push(expeditionUpdated);
             }
diff --git a/modules/ticket/back/methods/expedition/specs/deleteExpeditions.spec.js b/modules/ticket/back/methods/expedition/specs/deleteExpeditions.spec.js
index 0a47c78da1..14bdf7aea6 100644
--- a/modules/ticket/back/methods/expedition/specs/deleteExpeditions.spec.js
+++ b/modules/ticket/back/methods/expedition/specs/deleteExpeditions.spec.js
@@ -10,7 +10,7 @@ describe('ticket deleteExpeditions()', () => {
             const expeditionIds = [12, 13];
             const result = await models.Expedition.deleteExpeditions(expeditionIds, options);
 
-            expect(result.count).toEqual(2);
+            expect(result.length).toEqual(2);
 
             await tx.rollback();
         } catch (e) {
diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html
index 0ebe388c12..ec6dc7ee2b 100644
--- a/modules/ticket/front/expedition/index.html
+++ b/modules/ticket/front/expedition/index.html
@@ -159,7 +159,7 @@
         </vn-date-picker>
         <vn-textfield
             ng-show="selectLanded.data == 'withRoute'"
-            label="Id route"
+            label="Route id"
             ng-model="$ctrl.newRoute">
         </vn-textfield>
     </tpl-body>
diff --git a/modules/ticket/front/expedition/locale/es.yml b/modules/ticket/front/expedition/locale/es.yml
index 68812f9850..278dcc8f2a 100644
--- a/modules/ticket/front/expedition/locale/es.yml
+++ b/modules/ticket/front/expedition/locale/es.yml
@@ -3,4 +3,4 @@ Expedition removed: Expedición eliminada
 Move: Mover
 New ticket without route: Nuevo ticket sin ruta
 New ticket with route: Nuevo ticket con ruta
-Id route: Id ruta
\ No newline at end of file
+Route id: Id ruta
\ No newline at end of file

From d1e2b1f7d5ff9b98b8d62554e879c539937337dc Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 26 Oct 2022 09:02:54 +0200
Subject: [PATCH 59/71] refactor: tranducciones

---
 modules/ticket/front/sale/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 35e45a8120..c681381411 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -244,7 +244,7 @@
         </vn-spinner>
         <div ng-if="$ctrl.edit.mana != null">
             <section class="header vn-pa-md">
-                <h5>MANÁ: {{::$ctrl.edit.mana | currency: 'EUR': 0}}</h5>
+                <h5>Mana: {{::$ctrl.edit.mana | currency: 'EUR': 0}}</h5>
             </section>
             <div class="vn-pa-md">
                 <vn-input-number
@@ -288,7 +288,7 @@
         </vn-spinner>
         <div ng-if="$ctrl.edit.mana != null">
             <section class="header vn-pa-md">
-                <h5>MANÁ: {{::$ctrl.edit.mana | currency: 'EUR': 0}}</h5>
+                <h5>Mana: {{::$ctrl.edit.mana | currency: 'EUR': 0}}</h5>
             </section>
             <div class="vn-pa-md">
                 <vn-input-number

From c671540a7f567f73df944840d5ec00e081391b55 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 26 Oct 2022 09:04:53 +0200
Subject: [PATCH 60/71] refactor: renombrada variable

---
 .../ticket/back/methods/sale/specs/updatePrice.spec.js    | 4 ++--
 modules/ticket/back/methods/sale/specs/usesMana.spec.js   | 4 ++--
 .../back/methods/ticket/specs/updateDiscount.spec.js      | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/ticket/back/methods/sale/specs/updatePrice.spec.js b/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
index 15b00a7329..51cd2403f1 100644
--- a/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
+++ b/modules/ticket/back/methods/sale/specs/updatePrice.spec.js
@@ -79,11 +79,11 @@ describe('sale updatePrice()', () => {
             const price = 5.4;
             const originalSalesPersonMana = await models.WorkerMana.findById(18, null, options);
             const manaComponent = await models.Component.findOne({where: {code: 'mana'}}, options);
-            const teamCLopez = 96;
+            const teamOne = 96;
             const userId = ctx.req.accessToken.userId;
 
             const business = await models.Business.findOne({where: {workerFk: userId}}, options);
-            await business.updateAttribute('departmentFk', teamCLopez, options);
+            await business.updateAttribute('departmentFk', teamOne, options);
 
             await models.Sale.updatePrice(ctx, saleId, price, options);
             const updatedSale = await models.Sale.findById(saleId, null, options);
diff --git a/modules/ticket/back/methods/sale/specs/usesMana.spec.js b/modules/ticket/back/methods/sale/specs/usesMana.spec.js
index 4e14ed2c96..777bdc8f0a 100644
--- a/modules/ticket/back/methods/sale/specs/usesMana.spec.js
+++ b/modules/ticket/back/methods/sale/specs/usesMana.spec.js
@@ -12,11 +12,11 @@ describe('sale usesMana()', () => {
 
         try {
             const options = {transaction: tx};
-            const teamCLopez = 96;
+            const teamOne = 96;
             const userId = ctx.req.accessToken.userId;
 
             const business = await models.Business.findOne({where: {workerFk: userId}}, options);
-            await business.updateAttribute('departmentFk', teamCLopez, options);
+            await business.updateAttribute('departmentFk', teamOne, options);
 
             const usesMana = await models.Sale.usesMana(ctx, options);
 
diff --git a/modules/ticket/back/methods/ticket/specs/updateDiscount.spec.js b/modules/ticket/back/methods/ticket/specs/updateDiscount.spec.js
index 5249fe5d88..1f6712087d 100644
--- a/modules/ticket/back/methods/ticket/specs/updateDiscount.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/updateDiscount.spec.js
@@ -110,10 +110,10 @@ describe('sale updateDiscount()', () => {
             const componentId = manaDiscount.id;
             const manaCode = 'mana';
 
-            const teamCLopez = 96;
+            const teamOne = 96;
             const userId = ctx.req.accessToken.userId;
             const business = await models.Business.findOne({where: {workerFk: userId}}, options);
-            await business.updateAttribute('departmentFk', teamCLopez, options);
+            await business.updateAttribute('departmentFk', teamOne, options);
 
             await models.Ticket.updateDiscount(ctx, ticketId, sales, newDiscount, manaCode, options);
 
@@ -155,10 +155,10 @@ describe('sale updateDiscount()', () => {
             const componentId = manaDiscount.id;
             const manaCode = 'manaClaim';
 
-            const teamCLopez = 96;
+            const teamOne = 96;
             const userId = ctx.req.accessToken.userId;
             const business = await models.Business.findOne({where: {workerFk: userId}}, options);
-            await business.updateAttribute('departmentFk', teamCLopez, options);
+            await business.updateAttribute('departmentFk', teamOne, options);
 
             await models.Ticket.updateDiscount(ctx, ticketId, sales, newDiscount, manaCode, options);
 

From 21e2945d4f6b59df9b239fd197b8845dbda7f8ef Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 26 Oct 2022 09:30:17 +0200
Subject: [PATCH 61/71] refactor: delete destroyAll

---
 .../methods/item-shelving/deleteItemShelvings.js     | 12 ++++++++----
 .../item-shelving/specs/deleteItemShelvings.spec.js  |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/item/back/methods/item-shelving/deleteItemShelvings.js b/modules/item/back/methods/item-shelving/deleteItemShelvings.js
index 0b58970d83..f534b4e9a2 100644
--- a/modules/item/back/methods/item-shelving/deleteItemShelvings.js
+++ b/modules/item/back/methods/item-shelving/deleteItemShelvings.js
@@ -1,6 +1,6 @@
 module.exports = Self => {
     Self.remoteMethod('deleteItemShelvings', {
-        description: 'Deletes the selected orders',
+        description: 'Deletes the selected item shelvings',
         accessType: 'WRITE',
         accepts: [{
             arg: 'itemShelvingIds',
@@ -32,9 +32,13 @@ module.exports = Self => {
         }
 
         try {
-            const deletedItemShelvings = await models.ItemShelving.destroyAll({
-                id: {inq: itemShelvingIds}
-            }, myOptions);
+            const promises = [];
+            for (let itemShelvingId of itemShelvingIds) {
+                const itemShelvingToDelete = models.ItemShelving.destroyById(itemShelvingId, myOptions);
+                promises.push(itemShelvingToDelete);
+            }
+
+            const deletedItemShelvings = await Promise.all(promises);
 
             if (tx) await tx.commit();
 
diff --git a/modules/item/back/methods/item-shelving/specs/deleteItemShelvings.spec.js b/modules/item/back/methods/item-shelving/specs/deleteItemShelvings.spec.js
index a152b59815..b4113d7cf5 100644
--- a/modules/item/back/methods/item-shelving/specs/deleteItemShelvings.spec.js
+++ b/modules/item/back/methods/item-shelving/specs/deleteItemShelvings.spec.js
@@ -10,7 +10,7 @@ describe('ItemShelving deleteItemShelvings()', () => {
             const itemShelvingIds = [1, 2];
             const result = await models.ItemShelving.deleteItemShelvings(itemShelvingIds, options);
 
-            expect(result.count).toEqual(2);
+            expect(result.length).toEqual(2);
 
             await tx.rollback();
         } catch (e) {

From 65e32f5e7fc1b0c3b1ff0d9a7fa5564d12f0e84b Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 26 Oct 2022 12:40:13 +0200
Subject: [PATCH 62/71] feat: client search panel add find by zone

---
 .../10500-november/00-zone_getPostalCode.sql  |  56 ++++++
 modules/client/back/methods/client/filter.js  | 174 ++++++++++++++++++
 modules/client/back/models/client-methods.js  |   1 +
 modules/client/front/main/index.html          |   5 +-
 modules/client/front/main/index.js            |  26 ---
 modules/client/front/search-panel/index.html  |   7 +
 6 files changed, 240 insertions(+), 29 deletions(-)
 create mode 100644 db/changes/10500-november/00-zone_getPostalCode.sql
 create mode 100644 modules/client/back/methods/client/filter.js

diff --git a/db/changes/10500-november/00-zone_getPostalCode.sql b/db/changes/10500-november/00-zone_getPostalCode.sql
new file mode 100644
index 0000000000..b71306a58b
--- /dev/null
+++ b/db/changes/10500-november/00-zone_getPostalCode.sql
@@ -0,0 +1,56 @@
+DROP PROCEDURE IF EXISTS `vn`.`zone_getPostalCode`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getPostalCode`(vSelf INT)
+BEGIN
+/**
+ * Devuelve los códigos postales incluidos en una zona
+ * 
+ * @return vNewTicket
+ */ 
+    DECLARE vGeoFk INT DEFAULT NULL;
+
+    DROP TEMPORARY TABLE IF EXISTS tmp.zoneNodes;
+    CREATE TEMPORARY TABLE tmp.zoneNodes (
+            geoFk INT,
+            name VARCHAR(100),
+            parentFk INT,
+            sons INT,
+            isChecked BOOL DEFAULT 0,
+            zoneFk INT,
+            PRIMARY KEY zoneNodesPk (zoneFk, geoFk),
+            INDEX(geoFk))
+            ENGINE = MEMORY;
+
+    CALL zone_getLeaves2(vSelf, NULL , NULL);
+
+       UPDATE tmp.zoneNodes zn
+           SET isChecked = 0
+       WHERE parentFk IS NULL;
+
+        myLoop: LOOP    
+            SET vGeoFk = NULL;
+            SELECT geoFk INTO vGeoFk 
+                FROM tmp.zoneNodes zn
+                WHERE NOT isChecked
+                LIMIT 1;
+
+            CALL zone_getLeaves2(vSelf, vGeoFk, NULL);
+            UPDATE tmp.zoneNodes
+                SET isChecked = TRUE 
+                WHERE geoFk = vGeoFk;
+
+            IF vGeoFk IS NULL THEN
+                LEAVE myLoop;
+            END IF;
+        END LOOP;
+
+    DELETE FROM tmp.zoneNodes 
+        WHERE sons > 0;
+
+        SELECT zn.geoFk, zn.name
+            FROM tmp.zoneNodes zn
+                JOIN zone z ON z.id = zn.zoneFk;
+END$$
+DELIMITER ;
diff --git a/modules/client/back/methods/client/filter.js b/modules/client/back/methods/client/filter.js
new file mode 100644
index 0000000000..0e9eaf160c
--- /dev/null
+++ b/modules/client/back/methods/client/filter.js
@@ -0,0 +1,174 @@
+
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const buildFilter = require('vn-loopback/util/filter').buildFilter;
+const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
+
+module.exports = Self => {
+    Self.remoteMethodCtx('filter', {
+        description: 'Find all clients matched by the filter',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'filter',
+                type: 'object',
+            },
+            {
+                arg: 'search',
+                type: 'string',
+                description: `If it's and integer searchs by id, otherwise it searchs by name`,
+            },
+            {
+                arg: 'name',
+                type: 'string',
+                description: 'The client name',
+            },
+            {
+                arg: 'salesPersonFk',
+                type: 'number',
+            },
+            {
+                arg: 'fi',
+                type: 'string',
+                description: 'The client fiscal id',
+            },
+            {
+                arg: 'socialName',
+                type: 'string',
+            },
+            {
+                arg: 'city',
+                type: 'string',
+            },
+            {
+                arg: 'postcode',
+                type: 'string',
+            },
+            {
+                arg: 'provinceFk',
+                type: 'number',
+            },
+            {
+                arg: 'email',
+                type: 'string',
+            },
+            {
+                arg: 'phone',
+                type: 'string',
+            },
+            {
+                arg: 'zoneFk',
+                type: 'number',
+            },
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/filter`,
+            verb: 'GET'
+        }
+    });
+
+    Self.filter = async(ctx, filter, options) => {
+        const conn = Self.dataSource.connector;
+        const myOptions = {};
+        const postalCode = [];
+        const args = ctx.args;
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+        if (args.zoneFk) {
+            query = `CALL vn.zone_getPostalCode(?)`;
+            const [geos] = await Self.rawSql(query, [args.zoneFk]);
+            for (let geo of geos)
+                postalCode.push(geo.name);
+        }
+
+        const where = buildFilter(ctx.args, (param, value) => {
+            switch (param) {
+            case 'search':
+                return /^\d+$/.test(value)
+                    ? {'c.id': {inq: value}}
+                    : {'c.name': {like: `%${value}%`}};
+            case 'name':
+            case 'salesPersonFk':
+            case 'fi':
+            case 'socialName':
+            case 'city':
+            case 'postcode':
+            case 'provinceFk':
+            case 'email':
+            case 'phone':
+                param = `c.${param}`;
+                return {[param]: value};
+            case 'zoneFk':
+                param = 'a.postalCode';
+                return {[param]: {inq: postalCode}};
+            }
+        });
+
+        filter = mergeFilters(filter, {where});
+
+        const stmts = [];
+        const stmt = new ParameterizedSQL(
+            `SELECT 
+                    c.id,
+                    c.name,
+                    c.socialName,
+                    c.fi,
+                    c.credit,
+                    c.creditInsurance,
+                    c.phone,
+                    c.mobile,
+                    c.street,
+                    c.city,
+                    c.postcode,
+                    c.email,
+                    c.created,
+                    c.isActive,
+                    c.isVies,
+                    c.isTaxDataChecked,
+                    c.isEqualizated,
+                    c.isFreezed,
+                    c.hasToInvoice,
+                    c.hasToInvoiceByAddress,
+                    c.isToBeMailed,
+                    c.hasSepaVnl,
+                    c.hasLcr,
+                    c.hasCoreVnl,
+                    ct.id AS countryFk,
+                    ct.country,
+                    p.id AS provinceFk,
+                    p.name AS province,
+                    u.id AS salesPersonFk,
+                    u.name AS salesPerson,
+                    bt.code AS businessTypeFk,
+                    bt.description AS businessType,
+                    pm.id AS payMethodFk,
+                    pm.name AS payMethod,
+                    sti.CodigoIva AS sageTaxTypeFk,
+                    sti.Iva AS sageTaxType,
+                    stt.CodigoTransaccion AS sageTransactionTypeFk,
+                    stt.Transaccion AS sageTransactionType
+                FROM client c
+                    LEFT JOIN account.user u ON u.id = c.salesPersonFk
+                    LEFT JOIN country ct ON ct.id = c.countryFk
+                    LEFT JOIN province p ON p.id = c.provinceFk
+                    LEFT JOIN businessType bt ON bt.code = c.businessTypeFk
+                    LEFT JOIN payMethod pm ON pm.id = c.payMethodFk
+                    LEFT JOIN sage.TiposIva sti ON sti.CodigoIva = c.taxTypeSageFk
+                    LEFT JOIN sage.TiposTransacciones stt ON stt.CodigoTransaccion = c.transactionTypeSageFk
+                    LEFT JOIN vn.address a ON a.id = c.defaultAddressFk
+                    `
+        );
+
+        stmt.merge(conn.makeWhere(filter.where));
+        stmt.merge(conn.makePagination(filter));
+
+        const clientsIndex = stmts.push(stmt) - 1;
+        const sql = ParameterizedSQL.join(stmts, ';');
+        const result = await conn.executeStmt(sql, myOptions);
+
+        return clientsIndex === 0 ? result : result[clientsIndex];
+    };
+};
diff --git a/modules/client/back/models/client-methods.js b/modules/client/back/models/client-methods.js
index 04d10413a8..5134e39422 100644
--- a/modules/client/back/models/client-methods.js
+++ b/modules/client/back/models/client-methods.js
@@ -47,4 +47,5 @@ module.exports = Self => {
     require('../methods/client/incotermsAuthorizationHtml')(Self);
     require('../methods/client/incotermsAuthorizationEmail')(Self);
     require('../methods/client/consumptionSendQueued')(Self);
+    require('../methods/client/filter')(Self);
 };
diff --git a/modules/client/front/main/index.html b/modules/client/front/main/index.html
index e8bc4b9884..0787858ae1 100644
--- a/modules/client/front/main/index.html
+++ b/modules/client/front/main/index.html
@@ -1,6 +1,6 @@
 <vn-crud-model
     vn-id="model"
-    url="Clients"
+    url="Clients/filter"
     order="id DESC"
     limit="8"
     data="clients">
@@ -10,8 +10,7 @@
         vn-focus
         panel="vn-client-search-panel"
         info="Search client by id or name"
-        model="model"
-        expr-builder="$ctrl.exprBuilder(param, value)">
+        model="model">
     </vn-searchbar>
 </vn-portal>
 <vn-portal slot="menu">
diff --git a/modules/client/front/main/index.js b/modules/client/front/main/index.js
index 1069d3487e..346880f4c5 100644
--- a/modules/client/front/main/index.js
+++ b/modules/client/front/main/index.js
@@ -2,32 +2,6 @@ import ngModule from '../module';
 import ModuleMain from 'salix/components/module-main';
 
 export default class Client extends ModuleMain {
-    exprBuilder(param, value) {
-        switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? {id: value}
-                : {or: [{name: {like: `%${value}%`}}, {socialName: {like: `%${value}%`}}]};
-        case 'phone':
-            return {
-                or: [
-                    {phone: value},
-                    {mobile: value}
-                ]
-            };
-        case 'name':
-        case 'socialName':
-        case 'city':
-        case 'email':
-            return {[param]: {like: `%${value}%`}};
-        case 'id':
-        case 'fi':
-        case 'postcode':
-        case 'provinceFk':
-        case 'salesPersonFk':
-            return {[param]: value};
-        }
-    }
 }
 
 ngModule.vnComponent('vnClient', {
diff --git a/modules/client/front/search-panel/index.html b/modules/client/front/search-panel/index.html
index 234cb6f53e..a02f93882f 100644
--- a/modules/client/front/search-panel/index.html
+++ b/modules/client/front/search-panel/index.html
@@ -58,6 +58,13 @@
             value-field="id"
             label="Province">
         </vn-autocomplete>
+        <vn-autocomplete
+            ng-model="filter.zoneFk"
+            url="Zones"
+            show-field="name"
+            value-field="id"
+            label="Zone">
+        </vn-autocomplete>
     </vn-horizontal>
     <vn-horizontal>
         <vn-textfield

From b39b28e43d011689acc911adedfe8b1e9609a5d9 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 26 Oct 2022 13:10:17 +0200
Subject: [PATCH 63/71] =?UTF-8?q?refactor:=20a=C3=B1adido=20salto=20de=20l?=
 =?UTF-8?q?ineas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/client/back/methods/client/filter.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/client/back/methods/client/filter.js b/modules/client/back/methods/client/filter.js
index 0e9eaf160c..7cf4ba2ea3 100644
--- a/modules/client/back/methods/client/filter.js
+++ b/modules/client/back/methods/client/filter.js
@@ -75,8 +75,10 @@ module.exports = Self => {
         const myOptions = {};
         const postalCode = [];
         const args = ctx.args;
+
         if (typeof options == 'object')
             Object.assign(myOptions, options);
+
         if (args.zoneFk) {
             query = `CALL vn.zone_getPostalCode(?)`;
             const [geos] = await Self.rawSql(query, [args.zoneFk]);

From fa89d1f944d724e11b8b93d4cdf389a8405a5531 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 26 Oct 2022 13:10:50 +0200
Subject: [PATCH 64/71] fix: comentario corregido

---
 db/changes/10500-november/00-zone_getPostalCode.sql | 2 --
 1 file changed, 2 deletions(-)

diff --git a/db/changes/10500-november/00-zone_getPostalCode.sql b/db/changes/10500-november/00-zone_getPostalCode.sql
index b71306a58b..58a281cb2d 100644
--- a/db/changes/10500-november/00-zone_getPostalCode.sql
+++ b/db/changes/10500-november/00-zone_getPostalCode.sql
@@ -6,8 +6,6 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getPostalCode`(vSelf INT)
 BEGIN
 /**
  * Devuelve los códigos postales incluidos en una zona
- * 
- * @return vNewTicket
  */ 
     DECLARE vGeoFk INT DEFAULT NULL;
 

From c0b95564c3fc5bd764603524fffa1e99d8125541 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 26 Oct 2022 14:25:17 +0200
Subject: [PATCH 65/71] refactor: borrado codigo sql innecesario

---
 modules/client/back/methods/client/filter.js | 37 +++-----------------
 1 file changed, 4 insertions(+), 33 deletions(-)

diff --git a/modules/client/back/methods/client/filter.js b/modules/client/back/methods/client/filter.js
index 7cf4ba2ea3..3e1ea43bb8 100644
--- a/modules/client/back/methods/client/filter.js
+++ b/modules/client/back/methods/client/filter.js
@@ -114,53 +114,24 @@ module.exports = Self => {
         const stmts = [];
         const stmt = new ParameterizedSQL(
             `SELECT 
-                    c.id,
+                    DISTINCT c.id,
                     c.name,
-                    c.socialName,
                     c.fi,
-                    c.credit,
-                    c.creditInsurance,
+                    c.socialName,
                     c.phone,
-                    c.mobile,
-                    c.street,
                     c.city,
                     c.postcode,
                     c.email,
-                    c.created,
                     c.isActive,
-                    c.isVies,
-                    c.isTaxDataChecked,
-                    c.isEqualizated,
                     c.isFreezed,
-                    c.hasToInvoice,
-                    c.hasToInvoiceByAddress,
-                    c.isToBeMailed,
-                    c.hasSepaVnl,
-                    c.hasLcr,
-                    c.hasCoreVnl,
-                    ct.id AS countryFk,
-                    ct.country,
                     p.id AS provinceFk,
                     p.name AS province,
                     u.id AS salesPersonFk,
-                    u.name AS salesPerson,
-                    bt.code AS businessTypeFk,
-                    bt.description AS businessType,
-                    pm.id AS payMethodFk,
-                    pm.name AS payMethod,
-                    sti.CodigoIva AS sageTaxTypeFk,
-                    sti.Iva AS sageTaxType,
-                    stt.CodigoTransaccion AS sageTransactionTypeFk,
-                    stt.Transaccion AS sageTransactionType
+                    u.name AS salesPerson
                 FROM client c
                     LEFT JOIN account.user u ON u.id = c.salesPersonFk
-                    LEFT JOIN country ct ON ct.id = c.countryFk
                     LEFT JOIN province p ON p.id = c.provinceFk
-                    LEFT JOIN businessType bt ON bt.code = c.businessTypeFk
-                    LEFT JOIN payMethod pm ON pm.id = c.payMethodFk
-                    LEFT JOIN sage.TiposIva sti ON sti.CodigoIva = c.taxTypeSageFk
-                    LEFT JOIN sage.TiposTransacciones stt ON stt.CodigoTransaccion = c.transactionTypeSageFk
-                    LEFT JOIN vn.address a ON a.id = c.defaultAddressFk
+                    JOIN vn.address a ON a.clientFk = c.id
                     `
         );
 

From 1d908002e22481c39bd5e72f8c0add5e45161514 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 26 Oct 2022 14:25:27 +0200
Subject: [PATCH 66/71] feat: add backTest

---
 db/dump/fixtures.sql                          |  85 ++++----
 .../back/methods/client/specs/filter.spec.js  | 199 ++++++++++++++++++
 2 files changed, 242 insertions(+), 42 deletions(-)
 create mode 100644 modules/client/back/methods/client/specs/filter.spec.js

diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 5b769e2851..beed24739d 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -353,48 +353,48 @@ INSERT INTO `vn`.`clientConfig`(`riskTolerance`, `maxCreditRows`)
 
 INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `provinceFk`, `phone`, `mobile`, `isActive`, `clientFk`, `agencyModeFk`, `longitude`, `latitude`, `isEqualizated`, `isDefaultAddress`)
     VALUES
-        (1,     'Bruce Wayne',                  '1007 Mountain Drive, Gotham',                  'Gotham', 46460, 1, 1111111111, 222222222, 1, 1101,    2, NULL, NULL, 0, 1),
-        (2,     'Petter Parker',                '20 Ingram Street',                             'Gotham', 46460, 1, 1111111111, 222222222, 1, 1102,    2, NULL, NULL, 0, 1),
-        (3,     'Clark Kent',                   '344 Clinton Street',                           'Gotham', 46460, 1, 1111111111, 222222222, 1, 1103,    2, NULL, NULL, 0, 1),
-        (4,     'Tony Stark',                   '10880 Malibu Point',                           'Gotham', 46460, 1, 1111111111, 222222222, 1, 1104,    2, NULL, NULL, 0, 1),
-        (5,     'Max Eisenhardt',               'Unknown Whereabouts',                          'Gotham', 46460, 1, 1111111111, 222222222, 1, 1105,    2, NULL, NULL, 0, 1),
-        (6,     'DavidCharlesHaller',           'Evil hideout',                                 'Gotham', 46460, 1, 1111111111, 222222222, 1, 1106,    2, NULL, NULL, 0, 1),
-        (7,     'Hank Pym',                     'Anthill',                                      'Gotham', 46460, 1, 1111111111, 222222222, 1, 1107,    2, NULL, NULL, 0, 1),
-        (8,     'Charles Xavier',               '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Gotham', 46460, 1, 1111111111, 222222222, 1, 1108,    2, NULL, NULL, 0, 1),
-        (9,     'Bruce Banner',                 'Somewhere in New York',                        'Gotham', 46460, 1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 1),
-        (10,    'Jessica Jones',                'NYCC 2015 Poster',                             'Gotham', 46460, 1, 1111111111, 222222222, 1, 1110,    2, NULL, NULL, 0, 1),
-        (11,    'Missing',                      'The space',                                    'Gotham', 46460, 1, 1111111111, 222222222, 1, 1111,   10, NULL, NULL, 0, 1),
-        (12,    'Trash',                        'New York city',                                'Gotham', 46460, 1, 1111111111, 222222222, 1, 1112,   10, NULL, NULL, 0, 1),
-        (101,   'Somewhere in Thailand',        'address 01',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
-        (102,   'Somewhere in Poland',          'address 02',                                   'Gotham', 46460, 1, 3333333333, 444444444, 1, 1109,    2, NULL, NULL, 0, 0),
-        (103,   'Somewhere in Japan',           'address 03',                                   'Gotham', 46460, 1, 3333333333, 444444444, 1, 1109,    2, NULL, NULL, 0, 0),
-        (104,   'Somewhere in Spain',           'address 04',                                   'Gotham', 46460, 1, 3333333333, 444444444, 1, 1109,    2, NULL, NULL, 0, 0),
-        (105,   'Somewhere in Potugal',         'address 05',                                   'Gotham', 46460, 1, 5555555555, 666666666, 1, 1109,    2, NULL, NULL, 0, 0),
-        (106,   'Somewhere in UK',              'address 06',                                   'Gotham', 46460, 1, 5555555555, 666666666, 1, 1109,    2, NULL, NULL, 0, 0),
-        (107,   'Somewhere in Valencia',        'address 07',                                   'Gotham', 46460, 1, 5555555555, 666666666, 1, 1109,    2, NULL, NULL, 0, 0),
-        (108,   'Somewhere in Gotham',           'address 08',                                  'Gotham', 46460, 1, 5555555555, 666666666, 1, 1109,    2, NULL, NULL, 0, 0),
-        (109,   'Somewhere in London',          'address 09',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
-        (110,   'Somewhere in Algemesi',        'address 10',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
-        (111,   'Somewhere in Carlet',          'address 11',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
-        (112,   'Somewhere in Campanar',        'address 12',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
-        (113,   'Somewhere in Malilla',         'address 13',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
-        (114,   'Somewhere in France',          'address 14',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
-        (115,   'Somewhere in Birmingham',      'address 15',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
-        (116,   'Somewhere in Scotland',        'address 16',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
-        (117,   'Somewhere in nowhere',         'address 17',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
-        (118,   'Somewhere over the rainbow',   'address 18',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
-        (119,   'Somewhere in Alberic',         'address 19',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
-        (120,   'Somewhere in Montortal',       'address 20',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
-        (121,   'the bat cave',                 'address 21',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1101,    2, NULL, NULL, 0, 0),
-        (122,   'NY roofs',                     'address 22',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1102,    2, NULL, NULL, 0, 0),
-        (123,   'The phone box',                'address 23',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1103,    2, NULL, NULL, 0, 0),
-        (124,   'Stark tower Gotham',           'address 24',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1104,    2, NULL, NULL, 0, 0),
-        (125,   'The plastic cell',             'address 25',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1105,    2, NULL, NULL, 0, 0),
-        (126,   'Many places',                  'address 26',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1106,    2, NULL, NULL, 0, 0),
-        (127,   'Your pocket',                  'address 27',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1107,    2, NULL, NULL, 0, 0),
-        (128,   'Cerebro',                      'address 28',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1108,    2, NULL, NULL, 0, 0),
-        (129,   'Luke Cages Bar',               'address 29',                                   'Gotham', 46460, 1, 1111111111, 222222222, 1, 1110,    2, NULL, NULL, 0, 0),
-        (130,   'Non valid address',            'address 30',                                   'Gotham', 46460, 1, 1111111111, 222222222, 0, 1101,    2, NULL, NULL, 0, 0);
+        (1,     'Bruce Wayne',                  '1007 Mountain Drive, Gotham',                  'Gotham', 46460,        1, 1111111111, 222222222, 1, 1101,    2, NULL, NULL, 0, 1),
+        (2,     'Petter Parker',                '20 Ingram Street',                             'Gotham', 46460,        1, 1111111111, 222222222, 1, 1102,    2, NULL, NULL, 0, 1),
+        (3,     'Clark Kent',                   '344 Clinton Street',                           'Gotham', 46460,        1, 1111111111, 222222222,  1, 1103,    2, NULL, NULL, 0,    1),
+        (4,     'Tony Stark',                   '10880 Malibu Point',                           'Gotham', 46460,        1, 1111111111, 222222222, 1    , 1104,    2, NULL, NULL, 0,    1),
+        (5,     'Max Eisenhardt',               'Unknown Whereabouts',                          'Gotham', 46460,        1, 1111111111, 222222222, 1, 1105,    2, NULL, NULL, 0, 1),
+        (6,     'DavidCharlesHaller',           'Evil hideout',                                 'Gotham', 46460,        1, 1111111111, 222222222, 1, 1106,    2, NULL, NULL, 0, 1),
+        (7,     'Hank Pym',                     'Anthill',                                      'Gotham', 46460,        1, 1111111111, 222222222, 1, 1107,    2, NULL, NULL, 0, 1),
+        (8,     'Charles Xavier',               '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Gotham', 46460,        1, 1111111111, 222222222, 1, 1108,    2, NULL, NULL, 0, 1),
+        (9,     'Bruce Banner',                 'Somewhere in New York',                        'Gotham', 46460,        1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 1),
+        (10,    'Jessica Jones',                'NYCC 2015 Poster',                             'Gotham', 46460,        1, 1111111111, 222222222, 1, 1110,    2, NULL, NULL, 0, 1),
+        (11,    'Missing',                      'The space',                                    'Gotham', 46460,        1, 1111111111, 222222222, 1, 1111,   10, NULL, NULL, 0, 1),
+        (12,    'Trash',                        'New York city',                                'Gotham', 46460,        1, 1111111111, 222222222, 1, 1112,   10, NULL, NULL, 0, 1),
+        (101,   'Somewhere in Thailand',        'address 01',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
+        (102,   'Somewhere in Poland',          'address 02',                                   'Gotham', 46460,        1, 3333333333, 444444444, 1, 1109,    2, NULL, NULL, 0, 0),
+        (103,   'Somewhere in Japan',           'address 03',                                   'Gotham', 46460,        1, 3333333333, 444444444, 1, 1109,    2, NULL, NULL, 0, 0),
+        (104,   'Somewhere in Spain',           'address 04',                                   'Gotham', 46460,        1, 3333333333, 444444444, 1, 1109,    2, NULL, NULL, 0, 0),
+        (105,   'Somewhere in Potugal',         'address 05',                                   'Gotham', 46460,        1, 5555555555, 666666666, 1, 1109,    2, NULL, NULL, 0, 0),
+        (106,   'Somewhere in UK',              'address 06',                                   'Gotham', 46460,        1, 5555555555, 666666666, 1, 1109,    2, NULL, NULL, 0, 0),
+        (107,   'Somewhere in Valencia',        'address 07',                                   'Gotham', 46460,        1, 5555555555, 666666666, 1, 1109,    2, NULL, NULL, 0, 0),
+        (108,   'Somewhere in Gotham',           'address 08',                                  'Gotham', 46460,        1, 5555555555, 666666666, 1, 1109,    2, NULL, NULL, 0, 0),
+        (109,   'Somewhere in London',          'address 09',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
+        (110,   'Somewhere in Algemesi',        'address 10',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
+        (111,   'Somewhere in Carlet',          'address 11',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
+        (112,   'Somewhere in Campanar',        'address 12',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
+        (113,   'Somewhere in Malilla',         'address 13',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
+        (114,   'Somewhere in France',          'address 14',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
+        (115,   'Somewhere in Birmingham',      'address 15',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
+        (116,   'Somewhere in Scotland',        'address 16',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
+        (117,   'Somewhere in nowhere',         'address 17',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
+        (118,   'Somewhere over the rainbow',   'address 18',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
+        (119,   'Somewhere in Alberic',         'address 19',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
+        (120,   'Somewhere in Montortal',       'address 20',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 0),
+        (121,   'the bat cave',                 'address 21',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1101,    2, NULL, NULL, 0, 0),
+        (122,   'NY roofs',                     'address 22',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1102,    2, NULL, NULL, 0, 0),
+        (123,   'The phone box',                'address 23',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1103,    2, NULL, NULL, 0, 0),
+        (124,   'Stark tower Gotham',           'address 24',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1104,    2, NULL, NULL, 0, 0),
+        (125,   'The plastic cell',             'address 25',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1105,    2, NULL, NULL, 0, 0),
+        (126,   'Many places',                  'address 26',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1106,    2, NULL, NULL, 0, 0),
+        (127,   'Your pocket',                  'address 27',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1107,    2, NULL, NULL, 0, 0),
+        (128,   'Cerebro',                      'address 28',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1108,    2, NULL, NULL, 0, 0),
+        (129,   'Luke Cages Bar',               'address 29',                                   'Gotham', 'EC170150',   1, 1111111111, 222222222, 1, 1110,    2, NULL, NULL, 0, 0),
+        (130,   'Non valid address',            'address 30',                                   'Gotham', 46460,        1, 1111111111, 222222222, 0, 1101,    2, NULL, NULL, 0, 0);
 
 INSERT INTO `vn`.`address`( `nickname`, `street`, `city`, `postalCode`, `provinceFk`, `isActive`, `clientFk`, `agencyModeFk`, `isDefaultAddress`)
     SELECT name, CONCAT(name, 'Street'), 'GOTHAM', 46460, 1, 1, id, 2, 1
@@ -2047,6 +2047,7 @@ INSERT INTO `vn`.`zoneIncluded` (`zoneFk`, `geoFk`, `isIncluded`)
         (8, 4,   0),
         (8, 5,   0),
         (8, 1,   1),
+        (9, 7,   1),
         (10, 14, 1);
 
 INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `dated`)
diff --git a/modules/client/back/methods/client/specs/filter.spec.js b/modules/client/back/methods/client/specs/filter.spec.js
new file mode 100644
index 0000000000..6795850508
--- /dev/null
+++ b/modules/client/back/methods/client/specs/filter.spec.js
@@ -0,0 +1,199 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('client filter()', () => {
+    it('should return the clients matching the filter with a limit of 20 rows', async() => {
+        const tx = await models.Client.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const ctx = {req: {accessToken: {userId: 1}}, args: {}};
+            const filter = {limit: '8'};
+            const result = await models.Client.filter(ctx, filter, options);
+
+            expect(result.length).toEqual(8);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return the client "Bruce Wayne" matching the search argument with his name', async() => {
+        const tx = await models.Client.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const ctx = {req: {accessToken: {userId: 1}}, args: {search: 'Bruce Wayne'}};
+            const filter = {};
+            const result = await models.Client.filter(ctx, filter, options);
+
+            const firstResult = result[0];
+
+            expect(result.length).toEqual(1);
+            expect(firstResult.name).toEqual('Bruce Wayne');
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return the client "Bruce Wayne" matching the search argument with his id', async() => {
+        const tx = await models.Client.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const ctx = {req: {accessToken: {userId: 1}}, args: {search: '1101'}};
+            const filter = {};
+            const result = await models.Client.filter(ctx, filter, options);
+
+            const firstResult = result[0];
+
+            expect(result.length).toEqual(1);
+            expect(firstResult.name).toEqual('Bruce Wayne');
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return the client "Bruce Wayne" matching the name argument', async() => {
+        const tx = await models.Client.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const ctx = {req: {accessToken: {userId: 1}}, args: {name: 'Bruce Wayne'}};
+            const filter = {};
+            const result = await models.Client.filter(ctx, filter, options);
+
+            const firstResult = result[0];
+
+            expect(result.length).toEqual(1);
+            expect(firstResult.name).toEqual('Bruce Wayne');
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return the clients matching the "salesPersonFk" argument', async() => {
+        const tx = await models.Client.beginTransaction({});
+        const salesPersonId = 18;
+
+        try {
+            const options = {transaction: tx};
+
+            const ctx = {req: {accessToken: {userId: 1}}, args: {salesPersonFk: salesPersonId}};
+            const filter = {};
+            const result = await models.Client.filter(ctx, filter, options);
+
+            const randomIndex = Math.floor(Math.random() * result.length);
+            const randomResultClient = result[randomIndex];
+
+            expect(result.length).toBeGreaterThanOrEqual(5);
+            expect(randomResultClient.salesPersonFk).toEqual(salesPersonId);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return the clients matching the "fi" argument', async() => {
+        const tx = await models.Client.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const ctx = {req: {accessToken: {userId: 1}}, args: {fi: '251628698'}};
+            const filter = {};
+            const result = await models.Client.filter(ctx, filter, options);
+
+            const firstClient = result[0];
+
+            expect(result.length).toEqual(1);
+            expect(firstClient.name).toEqual('Max Eisenhardt');
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return the clients matching the "city" argument', async() => {
+        const tx = await models.Client.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const ctx = {req: {accessToken: {userId: 1}}, args: {city: 'Gotham'}};
+            const filter = {};
+            const result = await models.Client.filter(ctx, filter, options);
+
+            const randomIndex = Math.floor(Math.random() * result.length);
+            const randomResultClient = result[randomIndex];
+
+            expect(result.length).toBeGreaterThanOrEqual(20);
+            expect(randomResultClient.city.toLowerCase()).toEqual('gotham');
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return the clients matching the "postcode" argument', async() => {
+        const tx = await models.Client.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const ctx = {req: {accessToken: {userId: 1}}, args: {postcode: '46460'}};
+            const filter = {};
+            const result = await models.Client.filter(ctx, filter, options);
+
+            const randomIndex = Math.floor(Math.random() * result.length);
+            const randomResultClient = result[randomIndex];
+
+            expect(result.length).toBeGreaterThanOrEqual(20);
+            expect(randomResultClient.postcode).toEqual('46460');
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return the clients matching the "zoneFk" argument', async() => {
+        const tx = await models.Client.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const ctx = {req: {accessToken: {userId: 1}}, args: {zoneFk: 9}};
+            const filter = {};
+            const result = await models.Client.filter(ctx, filter, options);
+
+            expect(result.length).toBe(1);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

From 736de00e77da5cf492a7e1e9a433233d97053c71 Mon Sep 17 00:00:00 2001
From: Pau Navarro <pau@verdnatura.es>
Date: Thu, 27 Oct 2022 09:18:00 +0200
Subject: [PATCH 67/71] deleted the test as requested on #1885

---
 db/tests/vn/orderConfirmWithUser.spec.js | 37 ------------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 db/tests/vn/orderConfirmWithUser.spec.js

diff --git a/db/tests/vn/orderConfirmWithUser.spec.js b/db/tests/vn/orderConfirmWithUser.spec.js
deleted file mode 100644
index f2a3d0c4e3..0000000000
--- a/db/tests/vn/orderConfirmWithUser.spec.js
+++ /dev/null
@@ -1,37 +0,0 @@
-const app = require('vn-loopback/server/server');
-const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
-
-// #1885
-xdescribe('order_confirmWithUser()', () => {
-    it('should confirm an order', async() => {
-        let stmts = [];
-        let stmt;
-
-        stmts.push('START TRANSACTION');
-
-        let params = {
-            orderFk: 10,
-            userId: 9
-        };
-        // problema: la funcion order_confirmWithUser tiene una transacción, por tanto esta nunca hace rollback
-        stmt = new ParameterizedSQL('CALL hedera.order_confirmWithUser(?, ?)', [
-            params.orderFk,
-            params.userId
-        ]);
-        stmts.push(stmt);
-
-        stmt = new ParameterizedSQL('SELECT confirmed FROM hedera.order WHERE id = ?', [
-            params.orderFk
-        ]);
-        let orderIndex = stmts.push(stmt) - 1;
-
-        stmts.push('ROLLBACK');
-
-        let sql = ParameterizedSQL.join(stmts, ';');
-        let result = await app.models.Ticket.rawStmt(sql);
-
-        savedDescription = result[orderIndex][0].confirmed;
-
-        expect(savedDescription).toBeTruthy();
-    });
-});

From 9225e8f176c192464bae875f4324ca393ab8734e Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 27 Oct 2022 15:11:57 +0200
Subject: [PATCH 68/71] fix tests

---
 back/methods/chat/sendCheckingPresence.js     |  4 ++
 .../10500-november/00-deletePickupContact.sql |  1 +
 db/dump/fixtures.sql                          |  8 ++--
 .../back/methods/claim/claimPickupEmail.js    | 41 +++++++++----------
 modules/claim/front/descriptor/index.js       |  5 +--
 modules/claim/front/descriptor/index.spec.js  | 12 +-----
 package.json                                  |  2 +-
 .../claim-pickup-order/claim-pickup-order.js  | 21 +++++-----
 .../email/claim-pickup-order/sql/ticket.sql   |  4 ++
 9 files changed, 47 insertions(+), 51 deletions(-)
 create mode 100644 db/changes/10500-november/00-deletePickupContact.sql
 create mode 100644 print/templates/email/claim-pickup-order/sql/ticket.sql

diff --git a/back/methods/chat/sendCheckingPresence.js b/back/methods/chat/sendCheckingPresence.js
index 3bc022429c..556a16260e 100644
--- a/back/methods/chat/sendCheckingPresence.js
+++ b/back/methods/chat/sendCheckingPresence.js
@@ -25,6 +25,7 @@ module.exports = Self => {
     });
 
     Self.sendCheckingPresence = async(ctx, recipientId, message, options) => {
+        console.log(ctx, recipientId, message, options);
         if (!recipientId) return false;
 
         const myOptions = {};
@@ -38,7 +39,10 @@ module.exports = Self => {
         const recipient = await models.Account.findById(recipientId, null, myOptions);
 
         // Prevent sending messages to yourself
+        console.log('llega');
+        console.log(recipientId, userId);
         if (recipientId == userId) return false;
+        console.log('llega2');
 
         if (!recipient)
             throw new Error(`Could not send message "${message}" to worker id ${recipientId} from user ${userId}`);
diff --git a/db/changes/10500-november/00-deletePickupContact.sql b/db/changes/10500-november/00-deletePickupContact.sql
new file mode 100644
index 0000000000..6bfa662c5e
--- /dev/null
+++ b/db/changes/10500-november/00-deletePickupContact.sql
@@ -0,0 +1 @@
+ALTER TABLE `vn`.`claimConfig` DROP COLUMN `pickupContact`;
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 9a0a1fff6e..34e592b9a0 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -1778,10 +1778,10 @@ INSERT INTO `vn`.`claimEnd`(`id`, `saleFk`, `claimFk`, `workerFk`, `claimDestina
         (1, 31, 4, 21, 2),
         (2, 32, 3, 21, 3);
 
-INSERT INTO `vn`.`claimConfig`(`id`, `pickupContact`, `maxResponsibility`)
+INSERT INTO `vn`.`claimConfig`(`id`, `maxResponsibility`)
     VALUES
-        (1, 'Contact description', 50),
-        (2, 'Contact description', 30);
+        (1, 50),
+        (2, 30);
 
 INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRate`, `priceIncreasing`, `packingRate`)
     VALUES
@@ -1791,7 +1791,7 @@ INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRa
         (1104, 2500, 150.00, 0.02, 0.10, 1.00);
 
 INSERT INTO vn.claimRma (`id`, `code`, `created`, `workerFk`)
-VALUES 
+    VALUES
         (1, '02676A049183', DEFAULT, 1106),
         (2, '02676A049183', DEFAULT, 1106),
         (3, '02676A049183', DEFAULT, 1107),
diff --git a/modules/claim/back/methods/claim/claimPickupEmail.js b/modules/claim/back/methods/claim/claimPickupEmail.js
index 4c9b865025..23f0e31ef7 100644
--- a/modules/claim/back/methods/claim/claimPickupEmail.js
+++ b/modules/claim/back/methods/claim/claimPickupEmail.js
@@ -9,7 +9,7 @@ module.exports = Self => {
                 arg: 'id',
                 type: 'number',
                 required: true,
-                description: 'The client id',
+                description: 'The claim id',
                 http: {source: 'path'}
             },
             {
@@ -29,24 +29,6 @@ module.exports = Self => {
                 type: 'number',
                 description: 'The recipient id to send to the recipient preferred language',
                 required: false
-            },
-            {
-                arg: 'ticketId',
-                type: 'number',
-                description: 'The ticket id',
-                required: true
-            },
-            {
-                arg: 'salesPersonId',
-                type: 'number',
-                description: 'The salesPerson id',
-                required: false
-            },
-            {
-                arg: 'clientName',
-                type: 'string',
-                description: 'The client name',
-                required: true
             }
         ],
         returns: {
@@ -75,14 +57,29 @@ module.exports = Self => {
         for (const param in args)
             params[param] = args[param];
 
+        const claim = await models.Claim.findById(args.id, {
+            fields: ['id', 'clientFk'],
+            include: {
+                relation: 'client',
+                scope: {
+                    fields: ['name', 'salesPersonFk']
+                }
+            }
+        });
+        console.log(claim);
+
         const message = $t('Claim pickup order sent', {
             claimId: args.id,
-            clientName: args.clientName,
+            clientName: claim.client.name,
             claimUrl: `${origin}/#!/claim/${args.id}/summary`,
         });
 
-        if (args.salesPersonId)
-            await models.Chat.sendCheckingPresence(ctx, args.salesPersonId, message);
+        console.log(claim.client());
+        const salesPersonId = claim.client().salesPersonFk;
+        if (claim.client().salesPersonFk)
+            console.log(await models.Chat.sendCheckingPresence(ctx, 25, message));
+
+        console.log(claim.client().salesPersonFk);
 
         await models.ClaimLog.create({
             originFk: args.id,
diff --git a/modules/claim/front/descriptor/index.js b/modules/claim/front/descriptor/index.js
index b36fae3211..0dddadbe14 100644
--- a/modules/claim/front/descriptor/index.js
+++ b/modules/claim/front/descriptor/index.js
@@ -19,10 +19,7 @@ class Controller extends Descriptor {
     sendPickupOrder() {
         return this.vnEmail.send(`Claims/${this.claim.id}/claim-pickup-email`, {
             recipient: this.claim.client.email,
-            recipientId: this.claim.clientFk,
-            clientName: this.claim.client.name,
-            ticketId: this.claim.ticket.id,
-            salesPersonId: this.claim.client.salesPersonFk
+            recipientId: this.claim.clientFk
         });
     }
 
diff --git a/modules/claim/front/descriptor/index.spec.js b/modules/claim/front/descriptor/index.spec.js
index 18ccdaff5e..e6785d3d8a 100644
--- a/modules/claim/front/descriptor/index.spec.js
+++ b/modules/claim/front/descriptor/index.spec.js
@@ -7,12 +7,7 @@ describe('Item Component vnClaimDescriptor', () => {
     const claim = {
         id: 2,
         clientFk: 1101,
-        client: {
-            email: 'client@email',
-            name: 'clientName',
-            salesPersonFk: 18
-        },
-        ticket: {id: 2}
+        client: {email: 'client@email'}
     };
 
     beforeEach(ngModule('claim'));
@@ -45,10 +40,7 @@ describe('Item Component vnClaimDescriptor', () => {
 
             const params = {
                 recipient: claim.client.email,
-                recipientId: claim.clientFk,
-                clientName: claim.client.name,
-                ticketId: claim.ticket.id,
-                salesPersonId: claim.client.salesPersonFk
+                recipientId: claim.clientFk
             };
             controller.sendPickupOrder();
 
diff --git a/package.json b/package.json
index 26c164832a..be6db46a82 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
         "node-ssh": "^11.0.0",
         "object-diff": "0.0.4",
         "object.pick": "^1.3.0",
-        "puppeteer": "^18.0.5",
+        "puppeteer": "^19.2.0",
         "read-chunk": "^3.2.0",
         "require-yaml": "0.0.1",
         "sharp": "^0.31.0",
diff --git a/print/templates/email/claim-pickup-order/claim-pickup-order.js b/print/templates/email/claim-pickup-order/claim-pickup-order.js
index 51db21cb52..b8804c6040 100755
--- a/print/templates/email/claim-pickup-order/claim-pickup-order.js
+++ b/print/templates/email/claim-pickup-order/claim-pickup-order.js
@@ -8,22 +8,23 @@ module.exports = {
         'email-header': emailHeader.build(),
         'email-footer': emailFooter.build()
     },
-    created() {
-        this.instructions = this.$t('description.instructions', [this.id, this.ticketId]);
+    async serverPrefetch() {
+        this.ticket = await this.fetchTicket(this.id);
+
+        if (!this.ticket)
+            throw new Error('Something went wrong');
+        console.log();
+        this.instructions = this.$t('description.instructions', [this.id, this.ticket.id]);
     },
-    data() {
-        return {
-            instructions: String
-        };
+    methods: {
+        fetchTicket(id) {
+            return this.findOneFromDef('ticket', [id]);
+        }
     },
     props: {
         id: {
             type: [Number, String],
             required: true
-        },
-        ticketId: {
-            type: [Number, String],
-            required: true
         }
     }
 };
diff --git a/print/templates/email/claim-pickup-order/sql/ticket.sql b/print/templates/email/claim-pickup-order/sql/ticket.sql
new file mode 100644
index 0000000000..28b78c9875
--- /dev/null
+++ b/print/templates/email/claim-pickup-order/sql/ticket.sql
@@ -0,0 +1,4 @@
+SELECT
+    c.ticketFk as id
+FROM claim c
+WHERE c.id = ?

From 9170c22d6f80515a3251ba003ac8494fc0c5b262 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 28 Oct 2022 09:21:28 +0200
Subject: [PATCH 69/71] fix send email

---
 back/methods/chat/sendCheckingPresence.js              |  4 ----
 modules/claim/back/methods/claim/claimPickupEmail.js   | 10 +++-------
 .../email/claim-pickup-order/claim-pickup-order.js     |  2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/back/methods/chat/sendCheckingPresence.js b/back/methods/chat/sendCheckingPresence.js
index 556a16260e..3bc022429c 100644
--- a/back/methods/chat/sendCheckingPresence.js
+++ b/back/methods/chat/sendCheckingPresence.js
@@ -25,7 +25,6 @@ module.exports = Self => {
     });
 
     Self.sendCheckingPresence = async(ctx, recipientId, message, options) => {
-        console.log(ctx, recipientId, message, options);
         if (!recipientId) return false;
 
         const myOptions = {};
@@ -39,10 +38,7 @@ module.exports = Self => {
         const recipient = await models.Account.findById(recipientId, null, myOptions);
 
         // Prevent sending messages to yourself
-        console.log('llega');
-        console.log(recipientId, userId);
         if (recipientId == userId) return false;
-        console.log('llega2');
 
         if (!recipient)
             throw new Error(`Could not send message "${message}" to worker id ${recipientId} from user ${userId}`);
diff --git a/modules/claim/back/methods/claim/claimPickupEmail.js b/modules/claim/back/methods/claim/claimPickupEmail.js
index 23f0e31ef7..c688d6ded2 100644
--- a/modules/claim/back/methods/claim/claimPickupEmail.js
+++ b/modules/claim/back/methods/claim/claimPickupEmail.js
@@ -66,20 +66,16 @@ module.exports = Self => {
                 }
             }
         });
-        console.log(claim);
 
         const message = $t('Claim pickup order sent', {
             claimId: args.id,
-            clientName: claim.client.name,
+            clientName: claim.client().name,
             claimUrl: `${origin}/#!/claim/${args.id}/summary`,
         });
 
-        console.log(claim.client());
         const salesPersonId = claim.client().salesPersonFk;
-        if (claim.client().salesPersonFk)
-            console.log(await models.Chat.sendCheckingPresence(ctx, 25, message));
-
-        console.log(claim.client().salesPersonFk);
+        if (salesPersonId)
+            await models.Chat.sendCheckingPresence(ctx, salesPersonId, message);
 
         await models.ClaimLog.create({
             originFk: args.id,
diff --git a/print/templates/email/claim-pickup-order/claim-pickup-order.js b/print/templates/email/claim-pickup-order/claim-pickup-order.js
index b8804c6040..29f295b1ee 100755
--- a/print/templates/email/claim-pickup-order/claim-pickup-order.js
+++ b/print/templates/email/claim-pickup-order/claim-pickup-order.js
@@ -13,7 +13,7 @@ module.exports = {
 
         if (!this.ticket)
             throw new Error('Something went wrong');
-        console.log();
+
         this.instructions = this.$t('description.instructions', [this.id, this.ticket.id]);
     },
     methods: {

From 57e74fab38f00017cd2cc41621dfa475b5724e2a Mon Sep 17 00:00:00 2001
From: alexandre <alexandre@verdnatura.es>
Date: Fri, 28 Oct 2022 15:53:57 +0200
Subject: [PATCH 70/71] refs #4716 tipos actualizados

---
 print/templates/email/campaign-metrics/campaign-metrics.js    | 2 +-
 .../templates/email/claim-pickup-order/claim-pickup-order.js  | 2 +-
 .../email/client-debt-statement/client-debt-statement.js      | 2 +-
 print/templates/email/client-welcome/client-welcome.js        | 2 +-
 .../templates/email/delivery-note-link/delivery-note-link.js  | 2 +-
 print/templates/email/delivery-note/delivery-note.js          | 2 +-
 print/templates/email/driver-route/driver-route.js            | 2 +-
 .../email/incoterms-authorization/incoterms-authorization.js  | 4 ++--
 print/templates/email/invoice/invoice.js                      | 2 +-
 print/templates/email/letter-debtor-nd/letter-debtor-nd.js    | 4 ++--
 print/templates/email/letter-debtor-st/letter-debtor-st.js    | 4 ++--
 print/templates/email/payment-update/payment-update.js        | 2 +-
 print/templates/email/printer-setup/printer-setup.js          | 2 +-
 print/templates/email/sepa-core/sepa-core.js                  | 4 ++--
 .../supplier-campaign-metrics/supplier-campaign-metrics.js    | 2 +-
 print/templates/reports/campaign-metrics/campaign-metrics.js  | 2 +-
 .../reports/claim-pickup-order/claim-pickup-order.js          | 2 +-
 .../reports/client-debt-statement/client-debt-statement.js    | 2 +-
 print/templates/reports/delivery-note/delivery-note.js        | 2 +-
 print/templates/reports/driver-route/driver-route.js          | 2 +-
 print/templates/reports/entry-order/entry-order.js            | 2 +-
 print/templates/reports/exportation/exportation.js            | 2 +-
 .../incoterms-authorization/incoterms-authorization.js        | 4 ++--
 .../templates/reports/invoice-incoterms/invoice-incoterms.js  | 2 +-
 print/templates/reports/letter-debtor/letter-debtor.js        | 4 ++--
 print/templates/reports/receipt/receipt.js                    | 2 +-
 print/templates/reports/sepa-core/sepa-core.js                | 4 ++--
 .../supplier-campaign-metrics/supplier-campaign-metrics.js    | 2 +-
 print/templates/reports/zone/zone.js                          | 2 +-
 29 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/print/templates/email/campaign-metrics/campaign-metrics.js b/print/templates/email/campaign-metrics/campaign-metrics.js
index 0c3a01991d..c3ff4a5cac 100755
--- a/print/templates/email/campaign-metrics/campaign-metrics.js
+++ b/print/templates/email/campaign-metrics/campaign-metrics.js
@@ -21,7 +21,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true
         },
         from: {
diff --git a/print/templates/email/claim-pickup-order/claim-pickup-order.js b/print/templates/email/claim-pickup-order/claim-pickup-order.js
index d3836db392..bdb3386283 100755
--- a/print/templates/email/claim-pickup-order/claim-pickup-order.js
+++ b/print/templates/email/claim-pickup-order/claim-pickup-order.js
@@ -10,7 +10,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true
         }
     }
diff --git a/print/templates/email/client-debt-statement/client-debt-statement.js b/print/templates/email/client-debt-statement/client-debt-statement.js
index 85b3c5cc3f..06b81199b0 100755
--- a/print/templates/email/client-debt-statement/client-debt-statement.js
+++ b/print/templates/email/client-debt-statement/client-debt-statement.js
@@ -23,7 +23,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true
         },
         from: {
diff --git a/print/templates/email/client-welcome/client-welcome.js b/print/templates/email/client-welcome/client-welcome.js
index 380837877c..8fcba39adc 100755
--- a/print/templates/email/client-welcome/client-welcome.js
+++ b/print/templates/email/client-welcome/client-welcome.js
@@ -18,7 +18,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true
         }
     }
diff --git a/print/templates/email/delivery-note-link/delivery-note-link.js b/print/templates/email/delivery-note-link/delivery-note-link.js
index 1804bf1446..8df9826c2f 100755
--- a/print/templates/email/delivery-note-link/delivery-note-link.js
+++ b/print/templates/email/delivery-note-link/delivery-note-link.js
@@ -10,7 +10,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true
         }
     }
diff --git a/print/templates/email/delivery-note/delivery-note.js b/print/templates/email/delivery-note/delivery-note.js
index ba3d440016..672f70b181 100755
--- a/print/templates/email/delivery-note/delivery-note.js
+++ b/print/templates/email/delivery-note/delivery-note.js
@@ -10,7 +10,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true
         }
     }
diff --git a/print/templates/email/driver-route/driver-route.js b/print/templates/email/driver-route/driver-route.js
index 0895ccc8c0..fb459fa935 100755
--- a/print/templates/email/driver-route/driver-route.js
+++ b/print/templates/email/driver-route/driver-route.js
@@ -10,7 +10,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true
         }
     }
diff --git a/print/templates/email/incoterms-authorization/incoterms-authorization.js b/print/templates/email/incoterms-authorization/incoterms-authorization.js
index b1c7286ddf..1665fb5805 100755
--- a/print/templates/email/incoterms-authorization/incoterms-authorization.js
+++ b/print/templates/email/incoterms-authorization/incoterms-authorization.js
@@ -23,12 +23,12 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true,
             description: 'The client id'
         },
         companyId: {
-            type: [Number, String],
+            type: Number,
             required: true
         }
     }
diff --git a/print/templates/email/invoice/invoice.js b/print/templates/email/invoice/invoice.js
index fe66062aa1..6720e7102e 100755
--- a/print/templates/email/invoice/invoice.js
+++ b/print/templates/email/invoice/invoice.js
@@ -18,7 +18,7 @@ module.exports = {
     },
     props: {
         reference: {
-            type: [Number, String],
+            type: Number,
             required: true
         }
     }
diff --git a/print/templates/email/letter-debtor-nd/letter-debtor-nd.js b/print/templates/email/letter-debtor-nd/letter-debtor-nd.js
index cf9cc7ddd5..35a7d86557 100755
--- a/print/templates/email/letter-debtor-nd/letter-debtor-nd.js
+++ b/print/templates/email/letter-debtor-nd/letter-debtor-nd.js
@@ -34,11 +34,11 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true
         },
         companyId: {
-            type: [Number, String],
+            type: Number,
             required: true
         }
     }
diff --git a/print/templates/email/letter-debtor-st/letter-debtor-st.js b/print/templates/email/letter-debtor-st/letter-debtor-st.js
index 1a65556734..0fd2b45c71 100755
--- a/print/templates/email/letter-debtor-st/letter-debtor-st.js
+++ b/print/templates/email/letter-debtor-st/letter-debtor-st.js
@@ -34,11 +34,11 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true
         },
         companyId: {
-            type: [Number, String],
+            type: Number,
             required: true
         },
     }
diff --git a/print/templates/email/payment-update/payment-update.js b/print/templates/email/payment-update/payment-update.js
index a9d99d4ef6..11ace34109 100755
--- a/print/templates/email/payment-update/payment-update.js
+++ b/print/templates/email/payment-update/payment-update.js
@@ -26,7 +26,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true,
             description: 'The client id'
         }
diff --git a/print/templates/email/printer-setup/printer-setup.js b/print/templates/email/printer-setup/printer-setup.js
index a7d3c40bf9..8de0fc54fc 100755
--- a/print/templates/email/printer-setup/printer-setup.js
+++ b/print/templates/email/printer-setup/printer-setup.js
@@ -24,7 +24,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true
         }
     }
diff --git a/print/templates/email/sepa-core/sepa-core.js b/print/templates/email/sepa-core/sepa-core.js
index 00cc527dc6..33eb86bce2 100755
--- a/print/templates/email/sepa-core/sepa-core.js
+++ b/print/templates/email/sepa-core/sepa-core.js
@@ -16,11 +16,11 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true
         },
         companyId: {
-            type: [Number, String],
+            type: Number,
             required: true
         }
     }
diff --git a/print/templates/email/supplier-campaign-metrics/supplier-campaign-metrics.js b/print/templates/email/supplier-campaign-metrics/supplier-campaign-metrics.js
index 9cb9210ef7..dee227ea2b 100755
--- a/print/templates/email/supplier-campaign-metrics/supplier-campaign-metrics.js
+++ b/print/templates/email/supplier-campaign-metrics/supplier-campaign-metrics.js
@@ -21,7 +21,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true
         },
         from: {
diff --git a/print/templates/reports/campaign-metrics/campaign-metrics.js b/print/templates/reports/campaign-metrics/campaign-metrics.js
index b60a2b7eb6..7c3913549a 100755
--- a/print/templates/reports/campaign-metrics/campaign-metrics.js
+++ b/print/templates/reports/campaign-metrics/campaign-metrics.js
@@ -25,7 +25,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true,
             description: 'The client id'
         },
diff --git a/print/templates/reports/claim-pickup-order/claim-pickup-order.js b/print/templates/reports/claim-pickup-order/claim-pickup-order.js
index f7d21a2d39..358adbadd0 100755
--- a/print/templates/reports/claim-pickup-order/claim-pickup-order.js
+++ b/print/templates/reports/claim-pickup-order/claim-pickup-order.js
@@ -36,7 +36,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true,
             description: 'The claim id'
         }
diff --git a/print/templates/reports/client-debt-statement/client-debt-statement.js b/print/templates/reports/client-debt-statement/client-debt-statement.js
index 80c83b4947..81e9d7f43b 100755
--- a/print/templates/reports/client-debt-statement/client-debt-statement.js
+++ b/print/templates/reports/client-debt-statement/client-debt-statement.js
@@ -69,7 +69,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true,
             description: 'The client id'
         },
diff --git a/print/templates/reports/delivery-note/delivery-note.js b/print/templates/reports/delivery-note/delivery-note.js
index 1037e51296..7045ef709a 100755
--- a/print/templates/reports/delivery-note/delivery-note.js
+++ b/print/templates/reports/delivery-note/delivery-note.js
@@ -127,7 +127,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true,
             description: 'The ticket id'
         },
diff --git a/print/templates/reports/driver-route/driver-route.js b/print/templates/reports/driver-route/driver-route.js
index 2de3d51924..0015379419 100755
--- a/print/templates/reports/driver-route/driver-route.js
+++ b/print/templates/reports/driver-route/driver-route.js
@@ -44,7 +44,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true,
             description: 'The route id'
         }
diff --git a/print/templates/reports/entry-order/entry-order.js b/print/templates/reports/entry-order/entry-order.js
index ff4a65e0cb..18fc4a5ea2 100755
--- a/print/templates/reports/entry-order/entry-order.js
+++ b/print/templates/reports/entry-order/entry-order.js
@@ -40,7 +40,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true,
             description: 'The entry id'
         }
diff --git a/print/templates/reports/exportation/exportation.js b/print/templates/reports/exportation/exportation.js
index 630baf421b..0aab05feec 100755
--- a/print/templates/reports/exportation/exportation.js
+++ b/print/templates/reports/exportation/exportation.js
@@ -30,7 +30,7 @@ module.exports = {
     },
     props: {
         reference: {
-            type: [Number, String],
+            type: Number,
             required: true,
             description: 'The invoice ref'
         }
diff --git a/print/templates/reports/incoterms-authorization/incoterms-authorization.js b/print/templates/reports/incoterms-authorization/incoterms-authorization.js
index 26637b8c21..3eb5b65ea7 100755
--- a/print/templates/reports/incoterms-authorization/incoterms-authorization.js
+++ b/print/templates/reports/incoterms-authorization/incoterms-authorization.js
@@ -21,12 +21,12 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true,
             description: 'The client id'
         },
         companyId: {
-            type: [Number, String],
+            type: Number,
             required: true
         }
     }
diff --git a/print/templates/reports/invoice-incoterms/invoice-incoterms.js b/print/templates/reports/invoice-incoterms/invoice-incoterms.js
index 3dbe76ac32..ba9981373d 100755
--- a/print/templates/reports/invoice-incoterms/invoice-incoterms.js
+++ b/print/templates/reports/invoice-incoterms/invoice-incoterms.js
@@ -32,7 +32,7 @@ module.exports = {
     },
     props: {
         reference: {
-            type: [Number, String],
+            type: Number,
             required: true,
             description: 'The invoice ref'
         }
diff --git a/print/templates/reports/letter-debtor/letter-debtor.js b/print/templates/reports/letter-debtor/letter-debtor.js
index 80d4cba9b6..083d9fd710 100755
--- a/print/templates/reports/letter-debtor/letter-debtor.js
+++ b/print/templates/reports/letter-debtor/letter-debtor.js
@@ -63,12 +63,12 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true,
             description: 'The client id'
         },
         companyId: {
-            type: [Number, String],
+            type: Number,
             required: true
         }
     }
diff --git a/print/templates/reports/receipt/receipt.js b/print/templates/reports/receipt/receipt.js
index 401aa1ef36..b368764b16 100755
--- a/print/templates/reports/receipt/receipt.js
+++ b/print/templates/reports/receipt/receipt.js
@@ -25,7 +25,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true,
             description: 'Receipt id'
         }
diff --git a/print/templates/reports/sepa-core/sepa-core.js b/print/templates/reports/sepa-core/sepa-core.js
index 73e0beaaa3..85121b3921 100755
--- a/print/templates/reports/sepa-core/sepa-core.js
+++ b/print/templates/reports/sepa-core/sepa-core.js
@@ -40,12 +40,12 @@ const rptSepaCore = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true,
             description: 'The client id'
         },
         companyId: {
-            type: [Number, String],
+            type: Number,
             required: true
         }
     }
diff --git a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js
index 6a58cbd0e3..fee5796d22 100755
--- a/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js
+++ b/print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js
@@ -49,7 +49,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true,
             description: 'The supplier id'
         },
diff --git a/print/templates/reports/zone/zone.js b/print/templates/reports/zone/zone.js
index bbce9df36a..d237c50c0c 100755
--- a/print/templates/reports/zone/zone.js
+++ b/print/templates/reports/zone/zone.js
@@ -13,7 +13,7 @@ module.exports = {
     },
     props: {
         id: {
-            type: [Number, String],
+            type: Number,
             required: true,
             description: 'The zone id'
         }

From a7b1ee85fec2bcd7eab29fed84c642de265224f7 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 2 Nov 2022 07:27:57 +0100
Subject: [PATCH 71/71] fix changes folder

---
 .../{10490-goldenSummer => 10500-november}/00-aclNotification.sql | 0
 .../{10490-august => 10500-november}/00-packingSiteConfig.sql     | 0
 .../{10490-august => 10500-november}/00-packingSiteUpdate.sql     | 0
 db/changes/{10490-august => 10500-november}/00-salix_url.sql      | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename db/changes/{10490-goldenSummer => 10500-november}/00-aclNotification.sql (100%)
 rename db/changes/{10490-august => 10500-november}/00-packingSiteConfig.sql (100%)
 rename db/changes/{10490-august => 10500-november}/00-packingSiteUpdate.sql (100%)
 rename db/changes/{10490-august => 10500-november}/00-salix_url.sql (100%)

diff --git a/db/changes/10490-goldenSummer/00-aclNotification.sql b/db/changes/10500-november/00-aclNotification.sql
similarity index 100%
rename from db/changes/10490-goldenSummer/00-aclNotification.sql
rename to db/changes/10500-november/00-aclNotification.sql
diff --git a/db/changes/10490-august/00-packingSiteConfig.sql b/db/changes/10500-november/00-packingSiteConfig.sql
similarity index 100%
rename from db/changes/10490-august/00-packingSiteConfig.sql
rename to db/changes/10500-november/00-packingSiteConfig.sql
diff --git a/db/changes/10490-august/00-packingSiteUpdate.sql b/db/changes/10500-november/00-packingSiteUpdate.sql
similarity index 100%
rename from db/changes/10490-august/00-packingSiteUpdate.sql
rename to db/changes/10500-november/00-packingSiteUpdate.sql
diff --git a/db/changes/10490-august/00-salix_url.sql b/db/changes/10500-november/00-salix_url.sql
similarity index 100%
rename from db/changes/10490-august/00-salix_url.sql
rename to db/changes/10500-november/00-salix_url.sql