Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5240-ticket.sale-tracking

CHANGELOG.md

@@ -8,7 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [2308.01] - 2023-03-09
 
 ### Added
--
+- (Client -> Descriptor) Nuevo icono $ con barrotes para los clientes con impago
+- (Trabajador -> Datos Básicos) Añadido nuevo campo Taquilla
+- (Trabajador -> PDA) Nueva sección
 
 ### Changed
 -

back/models/image.js

@@ -101,7 +101,8 @@ module.exports = Self => {
                         width: bmpData.width,
                         height: bmpData.height,
                         channels: 4
-                    }
+                    },
+                    failOn: 'none'
                 };
             }
 

db/changes/230801/00-workerLocker.sql

@@ -0,0 +1,15 @@
+ALTER TABLE `vn`.`worker` ADD locker INT UNSIGNED NULL UNIQUE;
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('DeviceProduction', '*', '*', 'ALLOW', 'ROLE', 'hr'),
+        ('DeviceProductionModels', '*', '*', 'ALLOW', 'ROLE', 'hr'),
+        ('DeviceProductionState', '*', '*', 'ALLOW', 'ROLE', 'hr'),
+        ('DeviceProductionUser', '*', '*', 'ALLOW', 'ROLE', 'hr'),
+        ('DeviceProduction', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'),
+        ('DeviceProductionModels', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'),
+        ('DeviceProductionState', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'),
+        ('DeviceProductionUser', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'),
+        ('Worker', 'deallocatePDA', '*', 'ALLOW', 'ROLE', 'hr'),
+        ('Worker', 'allocatePDA', '*', 'ALLOW', 'ROLE', 'hr'),
+        ('Worker', 'deallocatePDA', '*', 'ALLOW', 'ROLE', 'productionAssi'),
+        ('Worker', 'allocatePDA', '*', 'ALLOW', 'ROLE', 'productionAssi');

db/dump/fixtures.sql

@@ -228,13 +228,13 @@ 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`)
+INSERT INTO `vn`.`accounting`(`id`, `bank`, `account`, `accountingTypeFk`, `entityFk`, `isActive`, `currencyFk`, `code`)
     VALUES
-        (1,     'Pay on receipt',           '5720000001', 3, 128,     1, 1),
-        (2,     'Cash',                     '5700000001', 2, 128,     1, 1),
-        (3,     'Compensation',             '4000000000', 8, 128,     1, 1),
-        (4,     'Transfers',                '4000000001', 1, 128,     1, 1),
-        (3117,  'Caixa Rural d''Algemesi',  '5720000000', 8, 2100,  1, 1);
+        (1,     'Pay on receipt',           '5720000001', 3, 128,     1, 1, 'payOnReceipt'),
+        (2,     'Cash',                     '5700000001', 2, 128,     1, 1, 'cash'),
+        (3,     'Compensation',             '4000000000', 8, 128,     1, 1, 'compensation'),
+        (4,     'Transfers',                '4000000001', 1, 128,     1, 1, 'transfers'),
+        (3117,  'Caixa Rural d''Algemesi',  '5720000000', 8, 2100,  1, 1, 'cra');
 
 INSERT INTO `vn`.`deliveryMethod`(`id`, `code`, `description`)
     VALUES
@@ -359,8 +359,8 @@ INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city
         (1108,     'Charles Xavier',     '22641921P',  'Professor X',    'Beast',            '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, 1, NULL, 0, 0, 19,   0, 1, 'florist'),
         (1109,     'Bruce Banner',       '16104829E',  'Hulk',           'Black widow',      'Somewhere in New York',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, 0, NULL, 0, 0, 9,    0, 1, 'florist'),
         (1110,     'Jessica Jones',      '58282869H',  'Jessica Jones',  'Luke Cage',        'NYCC 2015 Poster',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, 0, NULL, 0, 0, NULL, 0, 1, 'florist'),
-        (1111,     'Missing',            NULL,         'Missing man',    'Anton',            'The space, Universe far away',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, NULL),
-        (1112,     'Trash',              NULL,         'Garbage man',    'Unknown name',     'New York city, Underground',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, NULL);
+        (1111,     'Missing',            NULL,         'Missing man',    'Anton',            'The space, Universe far away',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others'),
+        (1112,     'Trash',              NULL,         'Garbage man',    'Unknown name',     'New York city, Underground',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others');
 
 INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `gestdocFk`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
     SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), CONCAT(name, 'Social'), CONCAT(name, 'Contact'), CONCAT(name, 'Street'), 'GOTHAM', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5, util.VN_CURDATE(), 1
@@ -736,7 +736,7 @@ INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `des
         (12, 11, 3, 'Delivery after 10am');
 
 -- FIX for state hours on local, inter_afterInsert
-UPDATE vncontrol.inter SET odbc_date = DATE_ADD(util.VN_CURDATE(), INTERVAL -10 SECOND);
+-- UPDATE vncontrol.inter SET odbc_date = DATE_ADD(util.VN_CURDATE(), INTERVAL -10 SECOND);
 
 INSERT INTO `vn`.`ticketTracking`(`ticketFk`, `stateFk`, `workerFk`, `created`)
     VALUES
@@ -1019,16 +1019,11 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
         (33, 5, 14, 'Ranged weapon pistol 9mm',         50, 1.79,   0, 0, 0, util.VN_CURDATE()),
         (34, 4, 28, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (35, 4, 29, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (36, 4, 30, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (37, 4, 31, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (36, 4, 30, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (38, 2, 32, 'Melee weapon combat fist 15cm',    30, 7.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
         (39, 1, 32,  'Ranged weapon longbow 2m',         2, 103.49, 0, 0, 0, util.VN_CURDATE());
 
-INSERT INTO `vn`.`saleChecked`(`saleFk`, `isChecked`)
-    VALUES
-        (1, 0),
-        (2, 1);
-
 INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
     VALUES
         (1,     28, 50),
@@ -1177,18 +1172,13 @@ INSERT INTO `vn`.`itemShelvingSale` (`itemShelvingFk`, `saleFk`, `quantity`, `cr
         ('1', '7', '1', util.VN_CURDATE(), '1106'),
         ('2', '8', '5', util.VN_CURDATE(), '1106');
 
-INSERT INTO `vncontrol`.`accion`(`accion_id`, `accion`)
+INSERT INTO `vn`.`saleTracking`(`saleFk`, `isChecked`, `created`, `originalQuantity`, `workerFk`, `id`, `stateFk`)
     VALUES
-        (3,	'ACTION ONE'),
-        (4,	'ACTIOn TWO');
-
-INSERT INTO `vn`.`saleTracking`(`saleFk`, `isChecked`, `created`, `originalQuantity`, `workerFk`, `actionFk`, `id`, `stateFk`)
-    VALUES
-        (1,     0,  util.VN_CURDATE(), 5,  55, 3, 1, 14),
-        (1,     1,  util.VN_CURDATE(), 5,  54, 3, 2, 8),
-        (2,     1,  util.VN_CURDATE(), 10, 40, 4, 3, 8),
-        (3,     1,  util.VN_CURDATE(), 2,  40, 4, 4, 8),
-        (31,    1,  util.VN_CURDATE(), -5,  40, 4, 5, 8);
+        (1,     0,  util.VN_CURDATE(), 5,  55, 1, 14),
+        (1,     1,  util.VN_CURDATE(), 5,  54, 2, 8),
+        (2,     1,  util.VN_CURDATE(), 10, 40, 3, 8),
+        (3,     1,  util.VN_CURDATE(), 2,  40, 4, 8),
+        (31,    1,  util.VN_CURDATE(), -5,  40, 5, 8);
 
 INSERT INTO `vn`.`itemBarcode`(`id`, `itemFk`, `code`)
     VALUES
@@ -1375,7 +1365,7 @@ INSERT INTO `vn`.`recovery`(`id`, `clientFk`, `started`, `finished`, `amount`, `
         (3, 1102, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(),INTERVAL 1 MONTH), 50, 7),
         (4, 1103, util.VN_CURDATE(), NULL, 50, 7);
 
-INSERT INTO `vn`.`annualAverageInvoiced`(`clientFk`, `invoiced`)
+INSERT INTO `bs`.`clientAnnualConsumption`(`clientFk`, `invoiced`)
     VALUES
         (1101, 1500),
         (1102, 100),
@@ -1949,7 +1939,7 @@ DROP TEMPORARY TABLE IF EXISTS tmp.worker;
 CREATE TEMPORARY TABLE tmp.worker
     (PRIMARY KEY (id))
     ENGINE = MEMORY
-    SELECT '1111' as 'id', w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -2 YEAR)), '-12-25') as started, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)) as ended, '-12-24'), CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
+    SELECT '1111' as 'id', w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -2 YEAR)), '-12-25') as started, CONCAT(YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)), '-12-24') as ended, CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
 		FROM `vn`.`worker` `w`
 			WHERE `w`.`id` = 1109;
 
@@ -1985,28 +1975,24 @@ INSERT INTO `vn`.`workerBusinessType` (`id`, `name`, `isFullTime`, `isPermanent`
 
 UPDATE `vn`.`business` b
     SET `rate` = 7,
-        `workerBusinessCategoryFk` = 1,
         `workerBusinessTypeFk` = 100,
         `amount` = 900.50
     WHERE b.id = 1;
 
 UPDATE `vn`.`business` b
     SET `rate` = 7,
-        `workerBusinessCategoryFk` = 1,
         `workerBusinessTypeFk` = 100,
         `amount` = 1263.03
     WHERE b.id = 1106;
 
 UPDATE `vn`.`business` b
     SET `rate` = 7,
-        `workerBusinessCategoryFk` = 1,
         `workerBusinessTypeFk` = 100,
         `amount` = 2000
     WHERE b.id = 1107;
 
 UPDATE `vn`.`business` b
     SET `rate` = 7,
-        `workerBusinessCategoryFk` = 1,
         `workerBusinessTypeFk` = 100,
         `amount` = 1500
     WHERE b.id = 1108;
@@ -2020,7 +2006,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);
 
-INSERT INTO `postgresql`.`calendar_employee` (`businessFk`, `calendar_state_id`, `date`)
+INSERT INTO `vn`.`calendar` (`businessFk`, `dayOffTypeFk`, `dated`)
     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))),
@@ -2491,6 +2477,10 @@ REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issu
         (9,  1009,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1242, 1, 442, 1),
         (10, 1010,  'R', 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1243, 1, 442, 1);
 
+INSERT INTO `vn`.`invoiceInConfig` (`id`, `retentionRate`, `retentionName`, `sageWithholdingFk`)
+    VALUES
+        (1, -2, '2% retention', 2);
+
 INSERT INTO `vn`.`invoiceInDueDay`(`invoiceInFk`, `dueDated`, `bankFk`, `amount`)
     VALUES
         (1, util.VN_CURDATE(), 1, 336.99),
@@ -2730,7 +2720,7 @@ INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
     VALUES
         (1, 1109),
         (1, 1110),
-        (3, 1109),
+        (2, 1109),
 	    (1,9),
         (1,3);
 
@@ -2784,10 +2774,6 @@ INSERT INTO `vn`.`profileType` (`id`, `name`)
     VALUES
         (1, 'working');
 
-INSERT INTO `vn`.`newWorkerConfig` (`id`, `street`, `provinceFk`, `companyFk`, `profileTypeFk`, `roleFk`)
-    VALUES
-        (1, 'S/ ', 1, 442, 1, 1);
-
 INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
     VALUES
         ('lilium', 'dev', 'http://localhost:8080/#/'),
@@ -2801,3 +2787,30 @@ INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`)
     VALUES
         (1, NULL, 1);
 
+INSERT INTO `vn`.`deviceProductionModels` (`code`)
+    VALUES
+        ('BLACKVIEW'),
+        ('DODGEE'),
+        ('ZEBRA');
+
+INSERT INTO `vn`.`deviceProductionState` (`code`, `description`)
+    VALUES
+        ('active', 'activo'),
+        ('idle', 'inactivo'),
+        ('lost', 'perdida'),
+        ('repair', 'reparación'),
+        ('retired', 'retirada');
+
+INSERT INTO `vn`.`deviceProduction` (`imei`, `modelFk`, `macWifi`, `serialNumber`, `android_id`, `purchased`, `stateFk`, `isInScalefusion`, `description`)
+    VALUES
+        ('ime1', 'BLACKVIEW', 'macWifi1', 'serialNumber1', 'android_id1', util.VN_NOW(), 'active', 0, NULL),
+        ('ime2', 'DODGEE', 'macWifi2', 'serialNumber2', 'android_id2', util.VN_NOW(), 'idle', 0, NULL),
+        ('ime3', 'ZEBRA', 'macWifi3', 'serialNumber3', 'android_id3', util.VN_NOW(), 'active', 0, NULL),
+        ('ime4', 'BLACKVIEW', 'macWifi4', 'serialNumber4', 'android_id4', util.VN_NOW(), 'idle', 0, NULL);
+
+INSERT INTO `vn`.`deviceProductionUser` (`deviceProductionFk`, `userFk`, `created`)
+    VALUES
+        (1, 1, util.VN_NOW()),
+        (3, 3, util.VN_NOW());
+
+

db/export-structure.sh

@@ -13,7 +13,6 @@ SCHEMAS=(
     stock
     util
     vn
-    vncontrol
 )
 
 IGNORETABLES=(

e2e/helpers/selectors.js

@@ -973,6 +973,7 @@ export default {
         id: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(3) > section > span',
         email: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(4) > section > span',
         department: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(5) > section > span',
+        locker: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(10) > section > span',
         userId: 'vn-worker-summary vn-one:nth-child(2) > vn-label-value:nth-child(2) > section > span',
         userName: 'vn-worker-summary vn-one:nth-child(2) > vn-label-value:nth-child(3) > section > span',
         role: 'vn-worker-summary vn-one:nth-child(2) > vn-label-value:nth-child(4) > section > span',
@@ -983,6 +984,7 @@ export default {
         name: 'vn-worker-basic-data vn-textfield[ng-model="$ctrl.worker.firstName"]',
         surname: 'vn-worker-basic-data vn-textfield[ng-model="$ctrl.worker.lastName"]',
         phone: 'vn-worker-basic-data vn-textfield[ng-model="$ctrl.worker.phone"]',
+        locker: 'vn-worker-basic-data vn-input-number[ng-model="$ctrl.worker.locker"]',
         saveButton: 'vn-worker-basic-data button[type=submit]'
     },
     workerPbx: {
@@ -1040,6 +1042,12 @@ export default {
         switft: 'vn-worker-create vn-autocomplete[ng-model="$ctrl.worker.bankEntityFk"]',
         createButton: 'vn-worker-create vn-submit[label="Create"]',
     },
+    workerPda: {
+        currentPDA: 'vn-worker-pda vn-textfield[ng-model="$ctrl.currentPDA.description"]',
+        newPDA: 'vn-worker-pda vn-autocomplete[ng-model="$ctrl.newPDA"]',
+        delete: 'vn-worker-pda vn-icon-button[icon=delete]',
+        submit: 'vn-worker-pda vn-submit[label="Assign"]',
+    },
     invoiceOutIndex: {
         topbarSearch: 'vn-searchbar',
         searchResult: 'vn-invoice-out-index vn-card > vn-table > div > vn-tbody > a.vn-tr',

e2e/paths/03-worker/01_summary.spec.js

@@ -29,5 +29,6 @@ describe('Worker summary path', () => {
         expect(await page.getProperty(selectors.workerSummary.userName, 'innerText')).toEqual('agency');
         expect(await page.getProperty(selectors.workerSummary.role, 'innerText')).toEqual('agency');
         expect(await page.getProperty(selectors.workerSummary.extension, 'innerText')).toEqual('1101');
+        expect(await page.getProperty(selectors.workerSummary.locker, 'innerText')).toEqual('-');
     });
 });

e2e/paths/03-worker/02_basicData.spec.js

@@ -25,6 +25,7 @@ describe('Worker basic data path', () => {
         await page.overwrite(selectors.workerBasicData.name, 'David C.');
         await page.overwrite(selectors.workerBasicData.surname, 'H.');
         await page.overwrite(selectors.workerBasicData.phone, '444332211');
+        await page.overwrite(selectors.workerBasicData.locker, '1');
         await page.click(selectors.workerBasicData.saveButton);
 
         const message = await page.waitForSnackbar();
@@ -36,5 +37,6 @@ describe('Worker basic data path', () => {
         expect(await page.waitToGetProperty(selectors.workerBasicData.name, 'value')).toEqual('David C.');
         expect(await page.waitToGetProperty(selectors.workerBasicData.surname, 'value')).toEqual('H.');
         expect(await page.waitToGetProperty(selectors.workerBasicData.phone, 'value')).toEqual('444332211');
+        expect(await page.waitToGetProperty(selectors.workerBasicData.locker, 'value')).toEqual('1');
     });
 });

e2e/paths/03-worker/07_pda.spec.js

@@ -0,0 +1,41 @@
+import selectors from '../../helpers/selectors.js';
+import getBrowser from '../../helpers/puppeteer';
+
+describe('Worker pda path', () => {
+    let browser;
+    let page;
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+        await page.loginAndModule('hr', 'worker');
+        await page.accessToSearchResult('employeeNick');
+        await page.accessToSection('worker.card.pda');
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    it('should check if worker has already a PDA allocated', async() => {
+        expect(await page.waitToGetProperty(selectors.workerPda.currentPDA, 'value')).toContain('serialNumber1');
+    });
+
+    it('should deallocate the PDA', async() => {
+        await page.waitToClick(selectors.workerPda.delete);
+        let message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('PDA deallocated');
+    });
+
+    it('should allocate a new PDA', async() => {
+        await page.autocompleteSearch(selectors.workerPda.newPDA, 'serialNumber2');
+        await page.waitToClick(selectors.workerPda.submit);
+        let message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('PDA allocated');
+    });
+
+    it('should check if a new PDA has been allocated', async() => {
+        expect(await page.waitToGetProperty(selectors.workerPda.currentPDA, 'value')).toContain('serialNumber2');
+    });
+});

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

@@ -197,6 +197,7 @@ describe('Ticket Edit sale path', () => {
     });
 
     it('should check in the history that logs has been added', async() => {
+        await page.reload({waitUntil: ['networkidle0', 'domcontentloaded']});
         await page.waitToClick(selectors.ticketSales.firstSaleHistoryButton);
         await page.waitForSelector(selectors.ticketSales.firstSaleHistory);
         const result = await page.countElement(selectors.ticketSales.firstSaleHistory);

e2e/paths/05-ticket/18_index_payout.spec.js

@@ -63,6 +63,6 @@ describe('Ticket index payout path', () => {
         const reference = await page.waitToGetProperty(selectors.clientBalance.firstLineReference, 'innerText');
 
         expect(count).toEqual(4);
-        expect(reference).toContain('Cash,Albaran: 7, 8Payment');
+        expect(reference).toContain('Cash, Albaran: 7, 8Payment');
     });
 });

e2e/paths/10-travel/03_descriptor.spec.js

@@ -113,15 +113,6 @@ describe('Travel descriptor path', () => {
         expect(message.text).toContain('Data saved!');
     });
 
-    it('should atempt to clone the travel and its entries using the descriptor menu but receive an error', async() => {
-        await page.waitToClick(selectors.travelDescriptor.dotMenu);
-        await page.waitToClick(selectors.travelDescriptor.dotMenuCloneWithEntries);
-        await page.waitToClick(selectors.travelDescriptor.acceptClonation);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Unable to clone this travel');
-    });
-
     it('should update the landed date to a future date to enable cloneWithEntries', async() => {
         const nextMonth = Date.vnNew();
         nextMonth.setMonth(nextMonth.getMonth() + 1);

front/salix/locale/es.yml

@@ -23,6 +23,7 @@ There is a new version, click here to reload: Hay una nueva versión, pulse aqu
 
 Back: Volver
 Save: Guardar
+Assign: Asignar
 Create: Crear
 Send: Enviar
 Delete: Eliminar

loopback/common/methods/application/post.js

@@ -12,6 +12,7 @@ module.exports = Self => {
     });
 
     Self.post = async ctx => {
+        console.log(ctx.req.body);
         return ctx.req.body;
     };
 };

loopback/locale/es.json

@@ -263,6 +263,7 @@
     "It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
     "It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
 	"A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
-	"There is no assigned email for this client": "No hay correo asignado para este cliente"
+	"There is no assigned email for this client": "No hay correo asignado para este cliente",
+    "This locker has already been assigned": "Esta taquilla ya ha sido asignada"
 }
 

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

@@ -166,7 +166,8 @@ module.exports = Self => {
                     c.name AS clientName,
                     cl.workerFk,
                     u.name AS workerName,
-                    cs.description,
+                    cs.code stateCode,
+                    cs.description stateDescription,
                     cl.created
                 FROM claim cl
                     LEFT JOIN client c ON c.id = cl.clientFk

modules/claim/back/models/claim.json

@@ -77,6 +77,11 @@
             "type": "belongsTo",
             "model": "Ticket",
             "foreignKey": "ticketFk"
-        }               
+        },
+        "claimDms": {
+            "type": "hasMany",
+            "model": "ClaimDms",
+            "foreignKey": "claimFk"
+        }
     }
 }