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

7729-devToTest_2430 #2739

Merged
alexm merged 339 commits from 7729-devToTest_2430 into test 2024-07-16 07:11:37 +00:00
Conversation 0 Commits 339 Files Changed 242 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 776fd05648 - Show all commits

10
modules/ticket/back/methods/sale/deleteSales.js
View File

@ -66,6 +66,10 @@ module.exports = Self => {
promises.push(deletedSale); promises.push(deletedSale);
} }
const deletedSales = await Promise.all(promises);
if (tx) await tx.commit();
const salesPerson = ticket.client().salesPersonUser(); const salesPerson = ticket.client().salesPersonUser();
if (salesPerson) { if (salesPerson) {
const url = await Self.app.models.Url.getUrl(); const url = await Self.app.models.Url.getUrl();
@ -75,13 +79,9 @@ module.exports = Self => {
ticketUrl: `${url}ticket/${ticketId}/sale`, ticketUrl: `${url}ticket/${ticketId}/sale`,
deletions: deletions deletions: deletions
}); });
await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions); await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message);
} }
const deletedSales = await Promise.all(promises);
if (tx) await tx.commit();
return deletedSales; return deletedSales;
} catch (e) { } catch (e) {
if (tx) await tx.rollback(); if (tx) await tx.rollback();