8622-testToMaster #1411

Merged
alexm merged 746 commits from 8622-testToMaster into master 2025-02-18 07:54:25 +00:00
2 changed files with 12 additions and 8 deletions
Showing only changes of commit 764eef13c3 - Show all commits

View File

@ -254,12 +254,13 @@ const moveTicketsAdvance = async () => {
}
continue;
}
console.log('ticket: ', ticket);
ticketsToMove.push({
originId: ticket.futureId,
destinationId: ticket.id,
originShipped: ticket.futureShipped,
destinationShipped: ticket.shipped,
workerFk: ticket.workerFk,
salesPersonFk: ticket.client.salesPersonFk,
});
}

View File

@ -244,13 +244,16 @@ const totalPriceColor = (totalWithVat) =>
isLessThan50(totalWithVat) ? 'warning' : 'transparent';
const moveTicketsFuture = async () => {
const ticketsToMove = selectedTickets.value.map((ticket) => ({
originId: ticket.id,
destinationId: ticket.futureId,
originShipped: ticket.shipped,
destinationShipped: ticket.futureShipped,
workerFk: ticket.workerFk,
}));
const ticketsToMove = selectedTickets.value.map((ticket) => {
console.log('salesPersonFk: ', ticket.client);
return {
originId: ticket.id,
destinationId: ticket.futureId,
originShipped: ticket.shipped,
destinationShipped: ticket.futureShipped,
salesPersonFk: ticket.client.salesPersonFk,
};
});
let params = { tickets: ticketsToMove };
await axios.post('Tickets/merge', params);