Merge branch 'dev' into 8613-addFkClaimDestinationFk
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Ivan Mas 2025-02-24 15:05:36 +00:00
commit 85fb754bc9
2 changed files with 2 additions and 2 deletions

View File

@ -109,7 +109,7 @@ module.exports = Self => {
); );
const newRefundTicket = await models.Ticket.create({ const newRefundTicket = await models.Ticket.create({
clientFk: claim.ticket().clientFk, clientFk: claim.ticket().clientFk,
shipped: nextShipped, shipped: nextShipped.shipped,
landed: null, landed: null,
nickname, nickname,
warehouseFk, warehouseFk,

View File

@ -19,7 +19,7 @@ describe('importToNewRefundTicket()', () => {
}); });
tx = await models.Entry.beginTransaction({}); tx = await models.Entry.beginTransaction({});
options = {transaction: tx}; options = {transaction: tx};
spyOn(models.Agency, 'getShipped').and.returnValue(Promise.resolve(expectedDate)); spyOn(models.Agency, 'getShipped').and.returnValue(Promise.resolve({shipped: expectedDate}));
}); });
afterEach(async() => { afterEach(async() => {