Eamco/eamco_office_frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added checks and updated ticket

Browse Source
This commit is contained in:
Edwin Eames
2024-09-26 20:00:44 -04:00
parent c7907bed8d
commit 54fa47268d
12 changed files with 520 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/pages/delivery/view.vue
View File

@@ -105,6 +105,7 @@
<div v-else-if="deliveryOrder.delivery_status == 4">Partial Delivery</div>
<div v-else-if="deliveryOrder.delivery_status == 5">misdelivery</div>
<div v-else-if="deliveryOrder.delivery_status == 6">unknown</div>
<div v-else-if="deliveryOrder.delivery_status == 10">Finalized</div>
<div v-else></div>
</div>
@@ -124,6 +125,13 @@
{{ format_date(deliveryOrder.when_ordered) }}
</div>
<div class="col-span-12 font-bold">
When Delivered
</div>
<div class="col-span-12 mb-5 text-sm text-gray-500">
{{ format_date(deliveryOrder.when_delivered) }}
</div>
<div class="col-span-12 font-bold ">
Driver:
@@ -156,10 +164,12 @@
<div v-if="deliveryOrder.payment_type == 0">Cash</div>
<div v-else-if="deliveryOrder.payment_type == 1">Credit Card</div>
<div v-else-if="deliveryOrder.payment_type == 2">Credit Card & cash</div>
<div v-else-if="deliveryOrder.payment_type == 3">Check</div>
<div v-else-if="deliveryOrder.payment_type == 4">Check</div>
<div v-else>No Payment Type Added</div>
</div>
<div class="col-span-12" v-if="deliveryOrder.payment_type == 1">
<div class="flex">
<div class="flex" v-if="userCardfound">
<div class="basis-1/3 p-2">
<div class="rounded-md border-2 bg-accent">
<div class="flex p-3">
@@ -180,7 +190,7 @@
</div>
<div class="col-span-12" v-if="deliveryOrder.payment_type == 2">
<div class="flex">
<div class="flex" v-if="userCardfound">
<div class="basis-1/3 p-2">
<div class="bg-accent rounded-md border-2 ">
<div class="flex p-3">
@@ -199,6 +209,26 @@
</div>
</div>
</div>
<div class="col-span-12" v-if="deliveryOrder.payment_type == 3">
<div class="flex" v-if="userCardfound">
<div class="basis-1/3 p-2">{{ userCard }}
<div class="bg-accent rounded-md border-2 ">
<div class="flex p-3">
{{ userCard.type_of_card }}
</div>
<div class="flex p-1 pl-4">
{{ userCard.name_on_card }}
</div>
<div class="flex p-1 pl-4">
****-****-****-{{ userCard.last_four_digits }}
</div>
<div class="flex p-1 pl-4">
{{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@@ -271,7 +301,7 @@ export default defineComponent({
},
deliveryNotesDriver: [],
userCardfound: false,
userCard: {
date_added: '',
user_id: '',
@@ -397,6 +427,9 @@ export default defineComponent({
});
},
getPaymentCard(card_id: any) {
if (card_id){
let path = import.meta.env.VITE_BASE_URL + "/payment/card/" + card_id;
axios({
method: "get",
@@ -404,10 +437,24 @@ export default defineComponent({
withCredentials: true,
})
.then((response: any) => {
this.userCard = response.data;
if (response.data.userCard.card_number === ''){
this.userCard === null;
this.userCardfound = false;
}
else{
this.userCard = response.data;
this.userCardfound = true;
}
})
.catch(() => {
});
}
else{
this.userCardfound = false;
}
},
getOilOrder(delivery_id: any) {
@@ -428,6 +475,9 @@ export default defineComponent({
if (this.deliveryOrder.payment_type == 2) {
this.getPaymentCard(this.deliveryOrder.payment_card_id);
}
if (this.deliveryOrder.payment_type == 3) {
this.getPaymentCard(this.deliveryOrder.payment_card_id);
}
}
})
},