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

Merge pull request 'fix: refs #7356 ticket weekly filter' (!2939) from 7356-FixTicketWeekly into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #2939
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
This commit is contained in:
Jon Elias 2024-09-25 05:27:17 +00:00
parent 171033f870 fe178ea396
commit 6d4614d56f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ticket/back/methods/ticket-weekly/filter.js
View File

@ -67,7 +67,7 @@ module.exports = Self => {
FROM ticketWeekly tw FROM ticketWeekly tw
JOIN ticket t ON t.id = tw.ticketFk JOIN ticket t ON t.id = tw.ticketFk
JOIN client c ON c.id = t.clientFk JOIN client c ON c.id = t.clientFk
JOIN account.user u ON u.id = c.salesPersonFk LEFT JOIN account.user u ON u.id = c.salesPersonFk
JOIN warehouse wh ON wh.id = t.warehouseFk JOIN warehouse wh ON wh.id = t.warehouseFk
LEFT JOIN agencyMode am ON am.id = tw.agencyModeFk` LEFT JOIN agencyMode am ON am.id = tw.agencyModeFk`
); );

6
modules/ticket/back/methods/ticket/filter.js
View File

@ -76,7 +76,8 @@ module.exports = Self => {
{ {
arg: 'myTeam', arg: 'myTeam',
type: 'boolean', type: 'boolean',
description: `Whether to show only tickets for the current logged user team (For now it shows only the current user tickets)` description: `Whether to show only tickets for the current logged user team
(For now it shows only the current user tickets)`
}, },
{ {
arg: 'problems', arg: 'problems',
@ -258,7 +259,8 @@ module.exports = Self => {
MINUTE(z.hour) zoneMinute, MINUTE(z.hour) zoneMinute,
z.name zoneName, z.name zoneName,
z.id zoneFk, z.id zoneFk,
CAST(z.hour AS CHAR) hour CAST(z.hour AS CHAR) hour,
a.nickname addressNickname
FROM ticket t FROM ticket t
LEFT JOIN invoiceOut io ON t.refFk = io.ref LEFT JOIN invoiceOut io ON t.refFk = io.ref
LEFT JOIN zone z ON z.id = t.zoneFk LEFT JOIN zone z ON z.id = t.zoneFk