jonathan/gta-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Interf v2

Browse Source
This commit is contained in:
jonathan
2024-06-27 18:35:33 +02:00
parent 3d04583e4a
commit 8d7e16b495
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/components/Messenger.vue
View File

@@ -24,19 +24,22 @@ const actionClaim = computed(()=> {
if (brokenAmount.value > 10) {
return {
label : "Demander le retour du colis au client",
method : 'askParcelReturn'
method : 'askParcelReturn',
parcelType : (messages.value[0].claim.refund_mode === 'Réexpédition souhaitée') ? 'R2' : 'R1'
}
} else {
if(messages.value[0].claim.refund_mode === 'Réexpédition souhaitée'){
return {
label : "Valider la demande de réexpedition",
method : 'validateResend'
method : 'validateResend',
parcelType : null,
}
}
else{
return {
label : "Valider la demande de remboursement",
method : 'validateRefund'
method : 'validateRefund',
parcelType : null,
}
}
}
@@ -57,14 +60,14 @@ 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)
const deliveryData = await TicketApi.validateBrokenIssue(storeTicket.currentTicket.code, storeTicket.idTicket, actionClaim.value)
let trackingNumber = null
let labelUrl = null
if(actionClaim.value.method === 'askParcelReturn'){
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
trackingNumber = deliveryData.parcel_list.filter(parcel=>parcel.delivery_slip_code === actionClaim.value.parcelType)[0].tracking_number
labelUrl = deliveryData.projectHost + deliveryData.parcel_list.filter(parcel=>parcel.delivery_slip_code === actionClaim.value.parcelType)[0].parcel_label_file
}
const closeClaim = await TicketApi.closeBrokenIssue(storeTicket.currentTicket.code, storeTicket.idTicket, messages.value[0].claim.refund_mode, trackingNumber, labelUrl)
@@ -89,6 +92,10 @@ const goToOrder = computed(() => {
return "https://gta-pprod.parapharmacie-et-medicament.com/Php/ajax.php?prj="+ store.projectName+ '&do2=goto&page=ORDER&do=Affaire&idbox=11&ID_RDV=' + messages.value[0].id + '&idbusiness='+ storeTicket.idTicket
})
const goToShipment = computed(() => {
return "https://gta-pprod.parapharmacie-et-medicament.com/Php/ajax.php?prj="+ store.projectName+ '&do2=goto&page=SHIPMENT&do=Affaire&idbox=11&ID_RDV=' + messages.value[0].id + '&idbusiness='+ storeTicket.idTicket
})
</script>
<template>
@@ -99,14 +106,18 @@ const goToOrder = computed(() => {
<div class="chat">
<div class="chat-header clearfix">
<div class="row">
<div class="col-lg-6">
<div class="col-auto">
<div class="chat-about">
<span><Icon icon="mdi:email" class="text-primary"/> {{ currentTicket.email }}</span><br/>
</div>
</div>
<div class="col-lg-6" v-if="currentTicket.hasOwnProperty('id_order') && currentTicket.id_order!==''">
<a target="_blank" class="btn btn-primary" :href="goToOrder">Voir la commande</a>
<div class="col-auto" v-if="currentTicket.hasOwnProperty('id_order') && currentTicket.id_order!==''">
<a target="_blank" class="btn btn-primary" :href="goToOrder"><i class="fa-solid fa-cart-shopping"></i> Voir la commande</a>
</div>
<div class="col-auto" v-if="currentTicket.hasOwnProperty('id_order') && currentTicket.id_order!==''">
<a target="_blank" class="btn btn-primary ms-4" :href="goToShipment"><i class="fa-solid fa-truck"></i> Voir l'expédition</a>
</div>
</div>
</div>
<div class="chat-history">

5
src/services/TicketApi.js
View File

@@ -77,8 +77,9 @@ export default {
return response.json();
},
async validateBrokenIssue(code, id, method) {
const apiUrl = '/App/api.php?prj=pharmamp&controller=ProxyController&method='+method+'&code_business=' + code + '&id_business=' + id
async validateBrokenIssue(code, id, claimOption) {
const apiUrl = '/App/api.php?prj=pharmamp&controller=ProxyController&method='+claimOption.method+'&code_business=' + code + '&id_business=' + id + '&parcelType=' + claimOption.parcelType
if (import.meta.env.DEV) {
console.log(apiUrl)