diff --git a/src/components/Messenger.vue b/src/components/Messenger.vue
index 55870bd..ce76edc 100644
--- a/src/components/Messenger.vue
+++ b/src/components/Messenger.vue
@@ -7,9 +7,12 @@ import {fr} from 'date-fns/locale';
import {suspens, messages, moveToBottom} from "@/setup/global";
+
+import {useGlobalStore} from "@/stores/global";
import {useTicketStore} from "@/stores/ticket";
const storeTicket = useTicketStore();
+const store = useGlobalStore();
const {
currentTicket,
@@ -18,7 +21,6 @@ const {
const brokenAmount = ref(0)
const actionClaim = computed(()=> {
-
if (brokenAmount.value > 10) {
return {
label : "Demander le retour du colis au client",
@@ -51,6 +53,10 @@ onMounted(async () => {
})
const closeClaim = async ()=>{
+
+ suspens.value = true
+ await moveToBottom("body-modal-to-scroll")
+
const deliveryData = await TicketApi.validateBrokenIssue(storeTicket.currentTicket.code, storeTicket.idTicket, actionClaim.value.method)
let trackingNumber = null
@@ -63,15 +69,21 @@ const closeClaim = async ()=>{
const closeClaim = await TicketApi.closeBrokenIssue(storeTicket.currentTicket.code, storeTicket.idTicket, messages.value[0].claim.refund_mode, trackingNumber, labelUrl)
if (closeClaim.result === 'OK') {
- messages.value = await TicketApi.getMessages(storeTicket.currentTicket.code, storeTicket.idTicket)
- }
+ brokenAmount.value = 0
+ const newList = await TicketApi.getMessages(storeTicket.currentTicket.code, storeTicket.idTicket)
+ setTimeout(async function () {
+ suspens.value = false
+ messages.value = newList
+ await moveToBottom("body-modal-to-scroll")
+ }, 1000);
+
+ }
}
-
-
-
-
+const getPdfLinkConverter = (idRdv, idDoc, docFileType) =>{
+ return "/Php/ajax.php?prj="+ store.projectName+ '&do2=export_pdf&idbox=11&ID_RDV=' + idRdv + '&idbusiness='+ storeTicket.idTicket + '&id_doc='+idDoc+'&doc_type='+encodeURI(docFileType)
+}
@@ -118,12 +130,18 @@ const closeClaim = async ()=>{
{{ message.code_message }}
-
-
-
-
+
diff --git a/src/services/TicketApi.js b/src/services/TicketApi.js
index 81a07c7..977a26a 100644
--- a/src/services/TicketApi.js
+++ b/src/services/TicketApi.js
@@ -94,19 +94,30 @@ export default {
},
async closeBrokenIssue(code, id, clientChoice, trackingNumber, trackingUrl) {
- const apiUrl = '/App/api.php?prj=pharmamp&controller=TicketingController&method=closeBrokenProductIssue&code_business=' + code + '&id_business=' + id
+ const apiUrl = '/App/api.php?prj=pharmamp&controller=TicketingController&method=closeBrokenProductIssue'
if (import.meta.env.DEV) {
console.log(apiUrl)
}
- const response = await fetch(apiUrl)
+ const postData = new FormData();
+ postData.append("id_business", id);
+ postData.append("code_business", code);
+ postData.append("clientChoice", clientChoice);
+ postData.append("trackingNumber", trackingNumber);
+ postData.append("trackingUrl", trackingUrl);
+
+ const response = await fetch(apiUrl, {
+ method: 'POST',
+ body: postData
+ });
if (import.meta.env.DEV) {
console.log(response.clone().text())
}
return response.json();
+
},
async saveMessage(code, id, quill, attachedDoc, replyOption) {
const apiUrl = '/App/api.php?prj=pharmamp&controller=TicketingController&method=saveMessage'
diff --git a/src/stores/global.js b/src/stores/global.js
index ae783bc..a568073 100644
--- a/src/stores/global.js
+++ b/src/stores/global.js
@@ -4,13 +4,14 @@ import Api from "@/services/Api.js";
export const useGlobalStore = defineStore('global', {
state: () => ({
gulliver: null,
- gta: {idProject: null, projectName: null},
+ gta: {idProject: null, projectName: null, projectUrl:null},
}),
getters: {
numc: (state) => state.gulliver.numc,
url: (state) => state.gulliver.url,
idProject: (state) => state.gta.idProject,
projectName: (state) => state.gta.projectName,
+ projectUrl: (state) => state.gta.projectUrl,
},
actions: {
async registerSession() {