diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index 79dfcef8c..05abe84c0 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -66,7 +66,6 @@ - diff --git a/modules/monitor/front/index/tickets/index.html b/modules/monitor/front/index/tickets/index.html index 539d4b3cb..bdd4e76ff 100644 --- a/modules/monitor/front/index/tickets/index.html +++ b/modules/monitor/front/index/tickets/index.html @@ -68,7 +68,9 @@ State - + + Fragile + Zone diff --git a/modules/ticket/back/methods/ticket-log/getChanges.js b/modules/ticket/back/methods/ticket-log/getChanges.js index d020a0957..7a6de49e8 100644 --- a/modules/ticket/back/methods/ticket-log/getChanges.js +++ b/modules/ticket/back/methods/ticket-log/getChanges.js @@ -30,35 +30,47 @@ module.exports = Self => { const ticketLogs = await models.TicketLog.find( { where: { - and: [ - {originFk: id}, - {action: 'update'}, - {changedModel: 'Sale'} + or: [ + { + and: [ + {originFk: id}, + {action: 'update'}, + {changedModel: 'Sale'} + ] + }, + { + and: [ + {originFk: id}, + {action: 'delete'}, + {changedModel: 'Sale'} + ] + } ] }, fields: [ 'oldInstance', 'newInstance', - 'changedModelId' + 'changedModelId', + 'changedModelValue' ], }, myOptions); const changes = []; - for (const ticketLog of ticketLogs) { - const oldQuantity = ticketLog.oldInstance.quantity; - const newQuantity = ticketLog.newInstance.quantity; + + for (const log of ticketLogs) { + const oldQuantity = log.oldInstance.quantity; + const newQuantity = log.newInstance?.quantity || 0; if (oldQuantity || newQuantity) { - const sale = await models.Sale.findById(ticketLog.changedModelId, null, myOptions); - const message = $t('Change quantity', { - concept: sale.concept, - oldQuantity: oldQuantity || 0, - newQuantity: newQuantity || 0, - }); - - changes.push(message); + const changeMessage = $t('Change quantity', { + concept: log.changedModelValue, + oldQuantity: oldQuantity || 0, + newQuantity: newQuantity || 0, + }); + changes.push(changeMessage); } - } + } + return changes.join('\n'); }; };