diff --git a/backend/src/controllers/TicketController.ts b/backend/src/controllers/TicketController.ts index 7312492..800050c 100644 --- a/backend/src/controllers/TicketController.ts +++ b/backend/src/controllers/TicketController.ts @@ -45,6 +45,7 @@ interface TicketData { userId: number; whatsappId?: string | number msg?: string, + transfer?: boolean | undefined } @@ -226,18 +227,25 @@ export const update = async (req: Request, res: Response): Promise => let ticketData: TicketData = req.body; - const defaultWhatsapp: any = await GetDefaultWhatsApp(ticketData.userId); + console.log('ticketData: ', ticketData) + console.log('ticketData.transfer', ticketData.transfer) - const _ticket: any = await Ticket.findByPk(ticketId) + if (ticketData.transfer) { - if (defaultWhatsapp && ticketData.status != 'open') { + const defaultWhatsapp: any = await GetDefaultWhatsApp(ticketData.userId); - await CheckContactOpenTickets(_ticket.dataValues.contactId, defaultWhatsapp.dataValues.id) + const _ticket: any = await Ticket.findByPk(ticketId) + + if (defaultWhatsapp && ticketData.status != 'open') { + + await CheckContactOpenTickets(_ticket.dataValues.contactId, defaultWhatsapp.dataValues.id) + + } + + ticketData.whatsappId = defaultWhatsapp.dataValues.id } - ticketData.whatsappId = defaultWhatsapp.dataValues.id - const { ticket } = await UpdateTicketService({ ticketData, ticketId, diff --git a/frontend/src/components/TransferTicketModal/index.js b/frontend/src/components/TransferTicketModal/index.js index a96483c..73d73b1 100644 --- a/frontend/src/components/TransferTicketModal/index.js +++ b/frontend/src/components/TransferTicketModal/index.js @@ -109,6 +109,7 @@ const TransferTicketModal = ({ modalOpen, onClose, ticketid }) => { // test del PARA APARECER NA FILA DE OUTRO ATENDENTE E O MESMO CLICAR EM ACEITAR AO INVES DE ENVIAR PARA ATENDENDO data.status = 'pending' + data.transfer = true await api.put(`/tickets/${ticketid}`, data);