Merge branch 'dev' into 8657-app-status-pdf
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
3ed1d2e163
|
@ -109,7 +109,7 @@ module.exports = Self => {
|
|||
);
|
||||
const newRefundTicket = await models.Ticket.create({
|
||||
clientFk: claim.ticket().clientFk,
|
||||
shipped: nextShipped,
|
||||
shipped: nextShipped.shipped,
|
||||
landed: null,
|
||||
nickname,
|
||||
warehouseFk,
|
||||
|
|
|
@ -19,7 +19,7 @@ describe('importToNewRefundTicket()', () => {
|
|||
});
|
||||
tx = await models.Entry.beginTransaction({});
|
||||
options = {transaction: tx};
|
||||
spyOn(models.Agency, 'getShipped').and.returnValue(Promise.resolve(expectedDate));
|
||||
spyOn(models.Agency, 'getShipped').and.returnValue(Promise.resolve({shipped: expectedDate}));
|
||||
});
|
||||
|
||||
afterEach(async() => {
|
||||
|
|
Loading…
Reference in New Issue