verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge branch 'dev' into 2350-order_index
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2020-07-16 11:18:22 +00:00
parent 171deeb82c 6e93d58ab4
commit cfceaa531e
6 changed files with 2176 additions and 675 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
db/dump/dumpedFixtures.sql
View File

File diff suppressed because one or more lines are too long

2
db/dump/fixtures.sql
View File

@ -605,7 +605,7 @@ INSERT INTO `vn`.`ticketTracking`(`ticketFk`, `stateFk`, `workerFk`, `created`)
(16, 3, 19, NOW()), (16, 3, 19, NOW()),
(17, 3, 19, NOW()), (17, 3, 19, NOW()),
(18, 3, 19, NOW()), (18, 3, 19, NOW()),
(19, 17, 19, NOW()), (19, 3, 19, NOW()),
(20, 1, 19, DATE_ADD(NOW(), INTERVAL +1 MONTH)), (20, 1, 19, DATE_ADD(NOW(), INTERVAL +1 MONTH)),
(21, 1, 19, DATE_ADD(NOW(), INTERVAL +1 MONTH)), (21, 1, 19, DATE_ADD(NOW(), INTERVAL +1 MONTH)),
(22, 1, 19, DATE_ADD(NOW(), INTERVAL +1 MONTH)), (22, 1, 19, DATE_ADD(NOW(), INTERVAL +1 MONTH)),

2816
db/dump/structure.sql
View File

File diff suppressed because it is too large Load Diff

1
db/export-structure.sh
View File

@ -80,7 +80,6 @@ IGNORETABLES=(
--ignore-table=vn.ticketRequest__ --ignore-table=vn.ticketRequest__
--ignore-table=vn.ticketToPrepare --ignore-table=vn.ticketToPrepare
--ignore-table=vn.till__ --ignore-table=vn.till__
--ignore-table=vn.time
--ignore-table=vn.travelThermograph__ --ignore-table=vn.travelThermograph__
--ignore-table=vn.travel_cloneWeekly --ignore-table=vn.travel_cloneWeekly
--ignore-table=vn.unary --ignore-table=vn.unary

2
modules/client/back/methods/client/specs/activeWorkersWithRole.spec.js
View File

@ -17,7 +17,7 @@ describe('Client activeWorkersWithRole', () => {
let isBuyer = await app.models.Account.hasRole(result[0].id, 'buyer'); let isBuyer = await app.models.Account.hasRole(result[0].id, 'buyer');
expect(result.length).toEqual(13); expect(result.length).toEqual(15);
expect(isBuyer).toBeTruthy(); expect(isBuyer).toBeTruthy();
}); });
}); });

2
modules/ticket/back/methods/ticket/specs/filter.spec.js
View File

@ -66,7 +66,7 @@ describe('ticket filter()', () => {
const secondRow = result[1]; const secondRow = result[1];
const thirdRow = result[2]; const thirdRow = result[2];
expect(result.length).toEqual(13); expect(result.length).toEqual(12);
expect(firstRow.state).toEqual('Entregado'); expect(firstRow.state).toEqual('Entregado');
expect(secondRow.state).toEqual('Entregado'); expect(secondRow.state).toEqual('Entregado');
expect(thirdRow.state).toEqual('Entregado'); expect(thirdRow.state).toEqual('Entregado');