diff --git a/src/components/Messenger.vue b/src/components/Messenger.vue index 8a258d8..55870bd 100644 --- a/src/components/Messenger.vue +++ b/src/components/Messenger.vue @@ -45,14 +45,13 @@ onMounted(async () => { if(currentTicket.value.filter2 === 'Produit cassé / défaillant'){ brokenAmount.value = await TicketApi.getBrokenAmount(storeTicket.currentTicket.code, storeTicket.idTicket) - //brokenAmount.value = 8 } await moveToBottom("body-modal-to-scroll") }) const closeClaim = async ()=>{ - const deliveryData = await TicketApi.validateBrokenIssue(currentTicket.value.code, currentTicket.value.idTicket, actionClaim.value.method) + const deliveryData = await TicketApi.validateBrokenIssue(storeTicket.currentTicket.code, storeTicket.idTicket, actionClaim.value.method) let trackingNumber = null let labelUrl = null @@ -61,22 +60,12 @@ const closeClaim = async ()=>{ trackingNumber = deliveryData.parcel_list.filter(parcel=>parcel.delivery_slip_code === 'R1')[0].tracking_number labelUrl = deliveryData.projectHost + deliveryData.parcel_list.filter(parcel=>parcel.delivery_slip_code === 'R1')[0].parcel_label_file } - const closeClaim = await TicketApi.closeBrokenIssue(currentTicket.value.code, currentTicket.value.idTicket, messages.value[0].claim.refund_mode, trackingNumber, labelUrl) + const closeClaim = await TicketApi.closeBrokenIssue(storeTicket.currentTicket.code, storeTicket.idTicket, messages.value[0].claim.refund_mode, trackingNumber, labelUrl) - //TODO - /* - let url = '/App/api.php?prj=pharmamp&controller=TicketingController&method=closeBrokenProductIssue&id_business='+idBusiness+'&code_business='+codeBusiness+'&clientChoice='+clientChoice - - if(ticketAction === 'askParcelReturn'){ - const trackingNumber = data.parcel_list.filter(parcel=>parcel.delivery_slip_code === 'R1')[0].tracking_number - const labelUrl = data.projectHost + data.parcel_list.filter(parcel=>parcel.delivery_slip_code === 'R1')[0].parcel_label_file - - url += '&trackingNumber='+trackingNumber+'&labelUrl='+encodeURI(labelUrl) + if (closeClaim.result === 'OK') { + messages.value = await TicketApi.getMessages(storeTicket.currentTicket.code, storeTicket.idTicket) } - fetch(url).then(response => Affaire('11','0','{$this->Cbusiness->getCodeBusiness()}','{$this->Cbusiness->getIdBusiness()}','4')) - - */ } @@ -130,13 +119,12 @@ const closeClaim = async ()=>{ {{ message.code_message }}
-
-
diff --git a/src/components/TicketList.vue b/src/components/TicketList.vue index d64677f..e8a35ef 100644 --- a/src/components/TicketList.vue +++ b/src/components/TicketList.vue @@ -77,9 +77,9 @@ const grid = new Grid({ formatter: (cell) => formatDistance(new Date(cell), new Date(), {addSuffix: true, locale: fr}) }, { name: 'Derniers messages', - formatter: (cell, row) => { - return html('' + ((row.cells[4].data.txt2 !== null) ? '
' + row.cells[4].data.txt2.replaceAll("\n", "").replaceAll('"', '') : '') + '"> ' + cell + '
') - } + // formatter: (cell, row) => { + // return html('' + ((row.cells[4].data.txt2 !== null) ? '
' + row.cells[4].data.txt2.replaceAll("\n", "").replaceAll('"', '') : '') + '"> ' + cell + '
') + // } }, 'Interlocuteur', { name: 'Client', @@ -138,13 +138,13 @@ onMounted(() => { }) -watch(gridWrapper, (to, from) => { - - setTimeout(function () { - initTooltip() - }, 1000); - -}); +// watch(gridWrapper, (to, from) => { +// +// setTimeout(function () { +// initTooltip() +// }, 1000); +// +// });