+
{{ userCard.type_of_card }}
@@ -256,7 +256,7 @@
-
+
{{ userCard.name_on_card }}
@@ -271,7 +271,7 @@
-
+
{{ userCard.name_on_card }}
@@ -310,32 +310,30 @@
${{ total_amount }}
-
-
-
-
-
-
@@ -448,6 +454,7 @@ export default defineComponent({
user: {
id: 0
},
+ userCardfound: false,
deliveryStatus: [],
userCards: [],
deliveryNotesDriver: [],
@@ -461,6 +468,7 @@ export default defineComponent({
check: false,
other: false,
cash_recieved: '',
+ fill_location: 0,
check_number: 0,
delivery_status: '',
userCards: [],
@@ -509,6 +517,13 @@ export default defineComponent({
customer_home_type: 0,
customer_phone_number: '',
},
+ customerDescription: {
+ customer_id: 0,
+ account_number: '',
+ company_id: 0,
+ fill_location: 0,
+ description: '',
+ },
deliveryMoney: {
time_added: '',
total_amount_oil: '',
@@ -606,7 +621,6 @@ export default defineComponent({
this.deliveryOrder = response.data
this.getCustomer(this.deliveryOrder.customer_id)
-
if (this.deliveryOrder.payment_type === 1) {
this.getPaymentCard(this.deliveryOrder.payment_card_id);
}
@@ -667,16 +681,10 @@ export default defineComponent({
this.FinalizeOilOrderForm.check = false
this.FinalizeOilOrderForm.other = true
}
-
this.FinalizeOilOrderForm.gallons_delivered = response.data.gallons_delivered;
-
}
})
},
-
-
-
-
getPaymentCard(card_id: any) {
let path = import.meta.env.VITE_BASE_URL + "/payment/card/" + card_id;
axios({
@@ -685,7 +693,15 @@ 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;
+ }
this.FinalizeOilOrderForm.userCards = response.data.id
})
.catch(() => {
@@ -704,8 +720,6 @@ export default defineComponent({
.catch(() => {
});
},
-
-
getCustomer(user_id: any) {
let path = import.meta.env.VITE_BASE_URL + "/customer/" + user_id;
axios({
@@ -715,6 +729,7 @@ export default defineComponent({
})
.then((response: any) => {
this.customer = response.data;
+ this.getCustomerDescription(this.deliveryOrder.customer_id);
this.getPaymentCards(this.deliveryOrder.customer_id);
if (this.deliveryOrder.payment_type == 1) {
this.getPaymentCard(this.deliveryOrder.payment_card_id)
@@ -734,8 +749,25 @@ export default defineComponent({
});
});
},
-
-
+ getCustomerDescription(user_id: any) {
+ let path = import.meta.env.VITE_BASE_URL + "/customer/description/" + user_id;
+ axios({
+ method: "get",
+ url: path,
+ withCredentials: true,
+ })
+ .then((response: any) => {
+ this.customerDescription = response.data;
+ this.FinalizeOilOrderForm.fill_location =this.customerDescription.fill_location
+ })
+ .catch(() => {
+ notify({
+ title: "Error",
+ text: "Could not find customer",
+ type: "error",
+ });
+ });
+ },
getOilPricing() {
let path = import.meta.env.VITE_BASE_URL + "/info/price/oil/table";
axios({
@@ -767,9 +799,7 @@ export default defineComponent({
this.priceprime = response.data.priceprime;
this.pricesameday = response.data.pricesameday;
this.total_amount = response.data.total_amount;
-
}
-
})
.catch(() => {
notify({
@@ -779,8 +809,6 @@ export default defineComponent({
});
});
},
-
-
UpdateAuto(payload: {
gallons: string,
delivery_id: string,
@@ -811,7 +839,6 @@ export default defineComponent({
}
})
},
-
getDeliveryStatusList() {
let path = import.meta.env.VITE_BASE_URL + "/query/deliverystatus";
axios({
@@ -825,7 +852,6 @@ export default defineComponent({
.catch(() => {
});
},
-
FinalizeOrder(payload: {
cash: boolean,
card: boolean,
@@ -841,7 +867,7 @@ export default defineComponent({
prime: boolean,
same_day: boolean,
emergency: boolean,
-
+ fill_location: number,
}) {
let path = import.meta.env.VITE_BASE_URL + "/deliverydata/finalize/" + this.deliveryOrder.id;
@@ -877,11 +903,9 @@ export default defineComponent({
let auto_payload = {
gallons: this.CreateOilOrderForm.basicInfo.gallons_delivered,
delivery_id: this.deliveryOrder.id
-
}
this.UpdateAuto(auto_payload);
}
-
let payload = {
cash: this.FinalizeOilOrderForm.cash,
card: this.FinalizeOilOrderForm.card,
@@ -897,7 +921,7 @@ export default defineComponent({
prime: this.FinalizeOilOrderForm.prime,
same_day: this.FinalizeOilOrderForm.same_day,
emergency: this.FinalizeOilOrderForm.emergency,
-
+ fill_location: this.FinalizeOilOrderForm.fill_location,
};
this.FinalizeOrder(payload);
},
diff --git a/src/pages/delivery/view.vue b/src/pages/delivery/view.vue
index ad9d692..74acc0c 100755
--- a/src/pages/delivery/view.vue
+++ b/src/pages/delivery/view.vue
@@ -26,6 +26,7 @@
View Oil Order # {{ deliveryOrder.id }}
+
Customer
@@ -78,6 +79,7 @@
+
@@ -264,6 +266,11 @@
{{ deliveryOrder.dispatcher_notes }}
+
@@ -392,7 +399,29 @@ export default defineComponent({
return moment(String(value)).format('LLLL')
}
},
-
+ deleteCall(delivery_id: any) {
+ let path = import.meta.env.VITE_BASE_URL + '/delivery/delete/' + delivery_id;
+ axios({
+ method: 'delete',
+ url: path,
+ headers: authHeader(),
+ }).then((response: any) => {
+ if (response.data.ok) {
+ notify({
+ title: "Success",
+ text: "deleted oil order",
+ type: "success",
+ });
+ this.$router.push({ name: "customerProfile", params: { id: this.customer.id } });
+ } else {
+ notify({
+ title: "Failure",
+ text: "error deleting oil order",
+ type: "success",
+ });
+ }
+ })
+ },
userStatus() {
let path = import.meta.env.VITE_BASE_URL + '/auth/whoami';
axios({
diff --git a/src/pages/delivery/viewstatus/todaysdeliveries.vue b/src/pages/delivery/viewstatus/todaysdeliveries.vue
index f11d8d9..d9c595e 100755
--- a/src/pages/delivery/viewstatus/todaysdeliveries.vue
+++ b/src/pages/delivery/viewstatus/todaysdeliveries.vue
@@ -35,6 +35,7 @@
Auto |
Prime |
Same Day |
+
Emergency |
Payment |
|
@@ -74,11 +75,15 @@
No
- Yes
+ Yes
|
No
- Yes
+ Yes
+ |
+
+ No
+ Yes
|
@@ -106,9 +111,9 @@
Print
- |
diff --git a/src/pages/delivery/viewstatus/tommorrow.vue b/src/pages/delivery/viewstatus/tommorrow.vue
index 3b04b39..04d0760 100644
--- a/src/pages/delivery/viewstatus/tommorrow.vue
+++ b/src/pages/delivery/viewstatus/tommorrow.vue
@@ -91,9 +91,9 @@
Print
-
-