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

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

This commit is contained in:
Jorge Penadés 2023-09-26 06:36:44 +00:00
parent 474399b383 7876561188
commit 45fbe6f174
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ticket/back/methods/ticket/setDeleted.js
View File

@ -118,7 +118,7 @@ module.exports = Self => {
// Send notification to salesPerson
const salesPersonUser = ticket.client().salesPersonUser();
if (salesPersonUser) {
if (salesPersonUser && sales.length) {
const origin = ctx.req.headers.origin;
const message = $t(`I have deleted the ticket id`, {
id: id,

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

@ -49,7 +49,7 @@ describe('ticket merge()', () => {
expect(deletedTicket.isDeleted).toEqual(true);
expect(salesTicketFuture.length).toEqual(2);
expect(chatNotificationBeforeMerge.length).toEqual(chatNotificationAfterMerge.length - 2);
expect(chatNotificationBeforeMerge.length).toEqual(chatNotificationAfterMerge.length - 1);
await tx.rollback();
} catch (e) {