Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jorge Penadés 2024-07-05 09:17:07 +02:00
commit 9d1ee964c5
1 changed files with 5 additions and 5 deletions

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();