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

7642_createNewState #2736

Closed
sergiodt wants to merge 32 commits from 7642_createNewState into dev
pull from: 7642_createNewState
merge into: verdnatura:dev
Conversation 0 Commits 32 Files Changed 26 +8 -14
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1d66a2e752 - Show all commits

3
db/versions/11153-purpleMedeola/00-firstScript.sql
View File

@ -1,3 +0,0 @@
ALTER TABLE vn.ticketLastState MODIFY COLUMN name varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;

3
db/versions/11153-purpleMedeola/00-firstScript.vn.sql
View File

@ -1,3 +0,0 @@
INSERT INTO vn.state ( name, `order`, alertLevel, code, sectorProdPriority, nextStateFk, isPreviousPreparable, isPicked, isPreparable, semaphore, isPrintable, isOK, graphCategory, isNotValidated, classColor) VALUES('Entregado en parte', 13, 3, 'PARTIAL_DELIVERED', NULL, 16, 0, 1, 0, 0, 0, 0, 0, 0, NULL);

16
modules/ticket/back/methods/ticket/specs/saveSign.spec.js
View File

@ -27,17 +27,17 @@ describe('Ticket saveSign()', () => {
expect(error).toBeDefined(); expect(error).toBeDefined();
}); });
fit('should change state for ticket', async() => { it('should change state for ticket', async() => {
const tx = await models.Ticket.beginTransaction({}); const tx = await models.State.beginTransaction({});
const ticketWithPackedState = 7; const ticketWithOkState = 7;
const ticketStateId = 16; const ticketStateId = 16;
const ticketCode = 'PARTIAL_DELIVERED'; const ticketCode = 'PARTIAL_DELIVERED';
spyOn(models.Dms, 'uploadFile').and.returnValue([{id: 1}]); spyOn(models.Dms, 'uploadFile').and.returnValue([{id: 1}]);
let ticketLastState; let ticketTrackingAfter;
try { try {
const options = {transaction: tx}; const options = {transaction: tx};
const tickets = [ticketWithPackedState]; const tickets = [ticketWithOkState];
const state = await models.State.findById(ticketStateId, null, options); const state = await models.State.findById(ticketStateId, null, options);
await state.updateAttributes({ await state.updateAttributes({
@ -46,8 +46,8 @@ describe('Ticket saveSign()', () => {
}, options); }, options);
await models.Ticket.saveSign(ctx, tickets, null, null, options); await models.Ticket.saveSign(ctx, tickets, null, null, options);
ticketLastState = await models.TicketLastState.findOne({ ticketTrackingAfter = await models.TicketLastState.findOne({
where: {ticketFk: ticketWithPackedState} where: {ticketFk: ticketWithOkState}
}, options); }, options);
await tx.rollback(); await tx.rollback();
@ -56,6 +56,6 @@ describe('Ticket saveSign()', () => {
throw e; throw e;
} }
expect(ticketLastState.name).toBe('PARTIAL_DELIVERED'); expect(ticketTrackingAfter.name).toBe('PARTIAL_DELIVERED');
}); });
}); });