verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 66 Releases Wiki Activity

3092-module_transactions #740

Merged
joan merged 41 commits from 3092-module_transactions into dev 2021-10-18 07:42:24 +00:00
Conversation 0 Commits 41 Files Changed 114 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 270b2802c8 - Show all commits

4
modules/account/back/models/ldap-config.js
View File

@ -77,8 +77,8 @@ module.exports = Self => {
.toString('base64'); .toString('base64');
let hash = crypto.createHash('sha1'); let hash = crypto.createHash('sha1');
hash.updateAll(password); hash.update(password);
hash.updateAll(salt, 'binary'); hash.update(salt, 'binary');
let digest = hash.digest('binary'); let digest = hash.digest('binary');
let ssha = Buffer let ssha = Buffer

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

@ -148,7 +148,7 @@ module.exports = Self => {
ticketUrl: `${origin}/#!/ticket/${id}/sale`, ticketUrl: `${origin}/#!/ticket/${id}/sale`,
changes: changesMade changes: changesMade
}); });
await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message); await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
} }
if (tx) await tx.commit(); if (tx) await tx.commit();