Merge branch 'dev' into 2381-mariaDB

back/model-config.json

@@ -79,12 +79,6 @@
     },
     "WorkerTimeControlMail": {
         "dataSource": "vn"
-    },
-    "Mail": {
-        "dataSource": "vn"
-    },
-    "MailForward": {
-        "dataSource": "vn"
     }
 }
 

back/models/mail-forward.json

@@ -1,26 +0,0 @@
-{
-    "name": "MailForward",
-    "base": "VnModel",
-    "options": {
-        "mysql": {
-            "table": "account.mailForward"
-        }
-    },
-    "properties": {
-        "account": {
-            "id": true,
-            "type": "Number"
-        },
-        "forwardTo": {
-            "type": "String"
-        }
-    },
-    "acls": [
-      {
-        "accessType": "READ",
-        "principalType": "ROLE",
-        "principalId": "$everyone",
-        "permission": "ALLOW"
-      }
-    ]
-}

db/dump/fixtures.sql

@@ -774,10 +774,16 @@ INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `d
         (12, 3, 30,   'RED', 1,    2, NULL,              2,    06021010, 1, 4751000000, 0, NULL, 0, 82,     2, NULL, 0),
         (13, 5, 30,   'RED', 1,    2, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, 83,     2, NULL, 0),
         (14, 5, 90,   'BLU', 1,    2, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, 84,     2, NULL, 0),
-        (15, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350,  2, NULL, 0),
+        (15, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, 88,     2, NULL, 0),
-        (16, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350,  2, NULL, 0),
+        (16, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 0, 4751000000, 0, NULL, 0, 88,     2, NULL, 0),
         (71, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 1, 4751000000, 0, NULL, 0, 88,     2, NULL, 0);
 
+INSERT INTO `vn`.`priceFixed`(`id`, `itemFk`, `rate0`, `rate1`, `rate2`, `rate3`, `started`, `ended`, `bonus`, `warehouseFk`, `created`)
+    VALUES
+        (1, 1, 0,   0,  2.5,    2,  CURDATE(), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), 0, 1, CURDATE()),
+        (3, 3, 10,  10, 10,     10, CURDATE(), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), 0, 1, CURDATE()),
+        (4, 5, 8.5, 10, 7.5,    6,  CURDATE(), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), 1, 2, CURDATE());
+
 INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `checked`, `workerFk`)
     VALUES
         (1,  1, 1, 71, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 1, 1, 18),
@@ -1167,7 +1173,9 @@ INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
         (96,    14, 1,  'White',                    5),
         (97,    14, 67, 'supply',                   6),
         (98,    14, 23, '1',                        7),
-        (99, 71, 92, 'Shipping cost',            2);
+        (99,    15, 92, 'Shipping cost',            2),
+        (100,   16, 92, 'Shipping cost',            2),
+        (101,   71, 92, 'Shipping cost',            2);
 
 INSERT INTO `vn`.`itemTypeTag`(`id`, `itemTypeFk`, `tagFk`, `priority`)
     VALUES
@@ -2061,9 +2069,9 @@ INSERT INTO `vn`.`queuePriority`(`id`, `priority`)
         (2, 'Normal'),
         (3, 'Baja');
 
-INSERT INTO `vn`.`workerTimeControlParams` (`id`, `dayBreak`, `weekBreak`, `weekScope`, `dayWorkMax`, `dayStayMax`, `weekMaxBreak`, `weekMaxScope`, `askInOut`, `mailSuccessFolder`, `mailErrorFolder`)
+INSERT INTO `vn`.`workerTimeControlParams` (`id`, `dayBreak`, `weekBreak`, `weekScope`, `dayWorkMax`, `dayStayMax`, `weekMaxBreak`, `weekMaxScope`, `askInOut`)
     VALUES
-        (1, 43200, 129600, 734400, 43200, 50400, 259200, 1296000, 36000, 'Leidos.exito', 'Leidos.error');
+        (1, 43200, 129600, 734400, 43200, 50400, 259200, 1296000, 36000);
 
 INSERT IGNORE INTO `vn`.`greugeConfig` (`id`, `freightPickUpPrice`) VALUES ('1', '11');
 

modules/account/back/model-config.json

@@ -34,5 +34,8 @@
     },
     "UserSync": {
         "dataSource": "vn"
+    },
+    "Mail": {
+        "dataSource": "vn"
     }
 }

modules/ticket/back/methods/state/specs/editableState.spec.js

@@ -29,6 +29,6 @@ describe('ticket editableStates()', () => {
         let result = await app.models.State.editableStates(ctx, filter);
         let pickerDesignedState = result.some(state => state.code == 'PICKER_DESIGNED');
 
-        expect(pickerDesignedState).toBeFalsy();
+        expect(pickerDesignedState).toBeTruthy();
     });
 });

modules/ticket/back/methods/state/specs/isEditable.spec.js

@@ -30,7 +30,7 @@ describe('state isEditable()', () => {
 
     it('should return false if the state is not editable for the given role', async() => {
         const employeeRole = 1;
-        const asignedState = 20;
+        const asignedState = 13;
         let ctx = {req: {accessToken: {userId: employeeRole}}};
         let result = await app.models.State.isEditable(ctx, asignedState);