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

7253-devToTest_2418 #2350

Merged
alexm merged 320 commits from 7253-devToTest_2418 into test 2024-04-23 08:02:46 +00:00
Conversation 0 Commits 320 Files Changed 212 +2 -4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a44359762b - Show all commits

4
print/templates/email/backup-printer-selected/backup-printer-selected.js
View File

@ -5,10 +5,8 @@ const name = 'backup-printer-selected';
module.exports = {
name: name,
async serverPrefetch() {
const notifications1 = await this.rawSqlFromDef('previousNotificationscopy', [name]);
console.log('notifications: ', notifications1);
const notifications = await this.rawSqlFromDef('previousNotifications', [name]);
if (!notifications.length && checkDuplicates(notifications, this.labelerId, this.sectorId))
if (!notifications.length || checkDuplicates(notifications, this.labelerId, this.sectorId))
throw new Error('Previous notification sended with the same parameters');
this.sector = await this.findOneFromDef('sector', [this.sectorId]);

2
print/templates/email/backup-printer-selected/sql/previousNotifications.sql
View File

@ -1,4 +1,4 @@
SELECT nq.params
SELECT nq.params, created, status
FROM util.notificationQueue nq
JOIN util.notification n ON n.name = nq.notificationFk
WHERE n.name = ?