updated
This commit is contained in:
@@ -22,17 +22,22 @@
|
||||
</div>
|
||||
|
||||
<div class="grid grid-cols-1 rounded-md pb-5" v-if="total_amount">
|
||||
|
||||
<div class="text-[24px]">
|
||||
|
||||
<div class="text-2xl border-b border-gray-500">
|
||||
Finalize Oil Order # {{ deliveryOrder.id }}
|
||||
</div>
|
||||
<div class="flex justify-end" v-if="deliveryOrder.id">
|
||||
<router-link :to="{ name: 'deliveryEdit', params: { id: deliveryOrder.id } }">
|
||||
<button class="btn btn-sm btn-accent">Edit Order</button>
|
||||
</router-link>
|
||||
</div>
|
||||
<div class="grid grid-cols-12">
|
||||
<div class="col-span-6">
|
||||
<div class="col-span-6 ">
|
||||
<div class="col-span-12 font-bold">
|
||||
Customer
|
||||
</div>
|
||||
<div class="col-span-6 bg-neutral p-5">
|
||||
<div class="grid grid-cols-12">
|
||||
<div class="col-span-12 p-5 ">
|
||||
<div class="grid grid-cols-12 mb-10">
|
||||
<div class="col-span-12 font-bold flex">
|
||||
{{ customer.customer_first_name }}
|
||||
{{ customer.customer_last_name }}
|
||||
@@ -55,7 +60,6 @@
|
||||
{{ customer.customer_zip }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 font-bold flex" v-if="customer.customer_apt !== 'None'">
|
||||
{{ customer.customer_apt }}
|
||||
</div>
|
||||
@@ -72,189 +76,276 @@
|
||||
{{ customer.customer_phone_number }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 ">
|
||||
<div class="grid grid-cols-12 ">
|
||||
<div class="col-span-12 font-bold">
|
||||
Status
|
||||
</div>
|
||||
<div class="col-span-12 text-gray-500">
|
||||
<div v-if="deliveryOrder.delivery_status == 0">waiting</div>
|
||||
<div v-else-if="deliveryOrder.delivery_status == 1">delivered</div>
|
||||
<div v-else-if="deliveryOrder.delivery_status == 2">Out for Delivery</div>
|
||||
<div v-else-if="deliveryOrder.delivery_status == 3">Cancelled</div>
|
||||
<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></div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12 font-bold mt-5">
|
||||
Scheduled date/time
|
||||
</div>
|
||||
<div class="col-span-12 text-gray-500">
|
||||
{{ deliveryOrder.expected_delivery_date }}
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 font-bold mt-5">
|
||||
When Called
|
||||
</div>
|
||||
<div class="col-span-12 text-gray-500 ">
|
||||
{{ deliveryOrder.when_ordered }}
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 font-bold mt-5">
|
||||
When Delivered
|
||||
</div>
|
||||
<div class="col-span-12 text-gray-500 " >
|
||||
{{ deliveryOrder.when_delivered }}
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 font-bold mt-5">
|
||||
Driver Name
|
||||
</div>
|
||||
<div class="col-span-12 text-gray-500">
|
||||
{{ deliveryOrder.driver_first_name }} {{ deliveryOrder.driver_last_name }}
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-span-6 ">
|
||||
<div class="flex justify-end" v-if="deliveryOrder.id">
|
||||
<router-link :to="{ name: 'deliveryEdit', params: { id: deliveryOrder.id } }">
|
||||
<button class="btn">Edit Order</button>
|
||||
</router-link>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-6">
|
||||
<div class="col-span-12 font-bold">
|
||||
Delivery Status
|
||||
</div>
|
||||
<div class="grid grid-cols-12 bg-neutral p-5">
|
||||
<div class="col-span-12 font-bold">
|
||||
Status
|
||||
</div>
|
||||
<div class="col-span-12">
|
||||
<div v-if="deliveryOrder.delivery_status == 0">waiting</div>
|
||||
<div v-else-if="deliveryOrder.delivery_status == 1">delivered</div>
|
||||
<div v-else-if="deliveryOrder.delivery_status == 2">Out for Delivery</div>
|
||||
<div v-else-if="deliveryOrder.delivery_status == 3">Cancelled</div>
|
||||
<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></div>
|
||||
</div>
|
||||
<div class="col-span-12 font-bold mt-5">
|
||||
Scheduled date/time
|
||||
</div>
|
||||
<div class="col-span-12 ">
|
||||
{{ deliveryOrder.expected_delivery_date }}
|
||||
</div>
|
||||
<div class="col-span-12 font-bold mt-5">
|
||||
When Called
|
||||
</div>
|
||||
<div class="col-span-12 ">
|
||||
{{ deliveryOrder.when_ordered }}
|
||||
</div>
|
||||
<div class="col-span-12 font-bold mt-5">
|
||||
Driver Name
|
||||
</div>
|
||||
<div class="col-span-12 ">
|
||||
{{ deliveryOrder.driver_first_name }} {{ deliveryOrder.driver_last_name }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-6 mt-5">
|
||||
<div class="col-span-12 font-bold">
|
||||
Info
|
||||
</div>
|
||||
<div class="grid grid-cols-12 bg-neutral p-5">
|
||||
<div class="col-span-12 font-bold">
|
||||
<div v-if="deliveryOrder.customer_asked_for_fill == 1">Fill</div>
|
||||
<div v-else>Gallons delivered: {{ deliveryOrder.gallons_delivered }}</div>
|
||||
</div>
|
||||
<div class="col-span-12 font-bold">
|
||||
<div v-if="deliveryOrder.prime == 1">
|
||||
Prime Required: Yes
|
||||
</div>
|
||||
<div v-if="deliveryOrder.prime == 0">
|
||||
Prime Required: No
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-span-12 font-bold">
|
||||
<div v-if="deliveryOrder.same_day == 1">
|
||||
Same Day: Yes
|
||||
</div>
|
||||
<div v-if="deliveryOrder.same_day == 0">
|
||||
Same Day: No
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-span-6 mt-5">
|
||||
<div class="col-span-12 font-bold">
|
||||
Payment
|
||||
</div>
|
||||
<div class="grid grid-cols-12 bg-neutral p-2">
|
||||
<div class="col-span-12 font-bold">
|
||||
<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>No Payment Type Added</div>
|
||||
</div>
|
||||
<div class="col-span-12" v-if="deliveryOrder.payment_type == 1">
|
||||
<div class="flex">
|
||||
<div class="basis-1/3 p-2">
|
||||
<div class="bg-neutral rounded-md border-2 ">
|
||||
<div class="flex p-2">
|
||||
{{ userCard.type_of_card }}
|
||||
<div class="grid grid-cols-12 ">
|
||||
<div class="col-span-12 py-3">
|
||||
<div v-if="deliveryOrder.prime == 1">
|
||||
<div class="col-span-12 ">
|
||||
Prime
|
||||
</div>
|
||||
<div class="flex p-1 pl-4">
|
||||
{{ userCard.name_on_card }}
|
||||
<div class="col-span-12 text-gray-500">
|
||||
Yes
|
||||
</div>
|
||||
<div class="flex p-1 pl-4">
|
||||
{{ userCard.card_number }}
|
||||
</div>
|
||||
<div v-else>
|
||||
<div class="col-span-12 ">
|
||||
Prime
|
||||
</div>
|
||||
<div class="flex p-1 pl-4">
|
||||
{{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
|
||||
<div class="col-span-12 text-gray-500">
|
||||
No
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 py-3">
|
||||
<div v-if="deliveryOrder.same_day === 1">
|
||||
<div class="col-span-12 ">
|
||||
Same Day
|
||||
</div>
|
||||
<div class="col-span-12 text-gray-500">
|
||||
Yes
|
||||
</div>
|
||||
</div>
|
||||
<div v-else>
|
||||
<div class="col-span-12 ">
|
||||
Same Day
|
||||
</div>
|
||||
<div class="col-span-12 text-gray-500">
|
||||
No
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-span-12" v-if="deliveryOrder.payment_type == 2">
|
||||
<div class="flex">
|
||||
<div class="basis-1/3 p-2">
|
||||
<div class="bg-neutral rounded-md border-2 ">
|
||||
<div class="flex p-3">
|
||||
<div class="col-span-12 mt-5">
|
||||
<div class="col-span-12 font-bold">
|
||||
Payment
|
||||
</div>
|
||||
<div class="grid grid-cols-12">
|
||||
<div class="col-span-12 text-gray-500">
|
||||
<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>No Payment Type Added</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 mt-5">
|
||||
<div class="col-span-12 font-bold">
|
||||
<div class="grid grid-cols-12 mb-5">
|
||||
|
||||
<div class="col-span-12 ">
|
||||
Price / Gallon
|
||||
</div>
|
||||
<div class="flex p-1 pl-4">
|
||||
{{ userCard.name_on_card }}
|
||||
<div class="col-span-12 text-gray-500">
|
||||
{{ deliveryOrder.customer_price }}
|
||||
</div>
|
||||
<div class="flex p-1 pl-4">
|
||||
{{ userCard.card_number }}
|
||||
|
||||
|
||||
<div class="col-span-12 " v-if="deliveryOrder.customer_asked_for_fill == 1">
|
||||
<div class="">
|
||||
Gallons Ordered:
|
||||
</div>
|
||||
<div class="col-span-12 text-gray-500">
|
||||
FILL (250)
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex p-1 pl-4">
|
||||
{{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
|
||||
|
||||
|
||||
<div class="col-span-12 py-3">
|
||||
<div class="">
|
||||
Gallons delivered:
|
||||
</div>
|
||||
<div class="col-span-12 text-gray-500">
|
||||
{{ deliveryOrder.gallons_delivered }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12 py-3">
|
||||
<div class="">
|
||||
Gallons Ordered:
|
||||
</div>
|
||||
<div class="col-span-12 text-gray-500">
|
||||
{{ deliveryOrder.gallons_ordered }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12" v-if="deliveryOrder.prime == 1">
|
||||
<div class="">
|
||||
Prime Fee:
|
||||
</div>
|
||||
<div class="col-span-12 text-gray-500">
|
||||
{{ pricing.price_prime }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12 " v-if="deliveryOrder.same_day === 1">
|
||||
<div>
|
||||
Same Day
|
||||
</div>
|
||||
<div class="col-span-12 text-gray-500">
|
||||
{{ pricing.price_same_day }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12 " v-if="deliveryOrder.payment_type == 0">
|
||||
<div class="col-span-12 ">
|
||||
cash total:
|
||||
</div>
|
||||
<div class="col-span-12 text-gray-500">
|
||||
${{ total_amount }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="col-span-12 py-5 " v-if="deliveryOrder.payment_type == 1">
|
||||
<div class="flex">
|
||||
|
||||
<div class="rounded-md border-2 bg-accent">
|
||||
<div class="flex p-2">
|
||||
{{ 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.card_number }}
|
||||
</div>
|
||||
<div class="flex p-1 pl-4">
|
||||
{{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 py-5 " v-if="deliveryOrder.payment_type == 2">
|
||||
<div class="flex ">
|
||||
|
||||
<div class=" rounded-md border-2 bg-accent ">
|
||||
|
||||
<div class="flex p-1 pl-4">
|
||||
{{ userCard.name_on_card }}
|
||||
</div>
|
||||
<div class="flex p-1 pl-4">
|
||||
{{ userCard.card_number }}
|
||||
</div>
|
||||
<div class="flex p-1 pl-4">
|
||||
{{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 font-bold py-5 text-lg text-accent" v-if="deliveryOrder.payment_type == 1">
|
||||
<div >
|
||||
Pre Charge Credit Card Total
|
||||
</div>
|
||||
<div class="col-span-12 text-green-500">
|
||||
${{ total_amount }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12 font-bold py-5 text-lg text-accent" v-if="deliveryOrder.payment_type == 2">
|
||||
<div >
|
||||
Pre Charge Credit Card Total
|
||||
</div>
|
||||
<div class="col-span-12 text-green-500">
|
||||
${{ total_amount }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<form class="rounded-md " enctype="multipart/form-data" @submit.prevent="onSubmit">
|
||||
<div class="grid grid-cols-12 p-5">
|
||||
<div class="col-span-12 md:col-span-12 flex mt-5 mb-5">
|
||||
<button class="btn btn-sm btn-accent">
|
||||
Finalize Delivery
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-span-6 mt-5">
|
||||
<div class="col-span-12 font-bold">
|
||||
<div class="grid grid-cols-12 mb-5 bg-neutral">
|
||||
<div class="col-span-12 py-3">Price / Gallon: {{ deliveryOrder.customer_price }}</div>
|
||||
<div class="col-span-12 py-3">
|
||||
<div v-if="deliveryOrder.customer_asked_for_fill == 1"> Gallons Ordered: FILL (250)</div>
|
||||
<div v-else> Gallons Ordered: {{ deliveryOrder.gallons_ordered }}</div>
|
||||
</div>
|
||||
<div class="col-span-12 py-3" v-if="deliveryOrder.prime == 1">
|
||||
Prime Fee: {{ pricing.price_prime }}
|
||||
</div>
|
||||
<div class="col-span-12 py-3" v-if="deliveryOrder.same_day == 1">
|
||||
Same Day: {{ pricing.price_same_day }}
|
||||
</div>
|
||||
<div class="col-span-12 font-bold py-5 text-lg" v-if="deliveryOrder.payment_type == 0">
|
||||
<div class="">
|
||||
CASH Total: ${{ total_amount }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-span-12 font-bold py-5 text-lg text-primary" v-if="deliveryOrder.payment_type == 1">
|
||||
<div class="">
|
||||
Pre Charge Credit Card Total: ${{ total_amount }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-span-12 font-bold py-5 text-lg text-primary" v-if="deliveryOrder.payment_type == 2">
|
||||
<div class="">
|
||||
Pre Charge Credit Card Total: ${{ total_amount }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<form class="rounded-md bg-neutral" enctype="multipart/form-data" @submit.prevent="onSubmit">
|
||||
<div class="grid grid-cols-12 p-5">
|
||||
|
||||
<div class="col-span-12 md:col-span-12 flex mt-5 mb-5">
|
||||
<button class="btn">
|
||||
Finalize Delivery
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<Footer />
|
||||
@@ -390,13 +481,14 @@ export default defineComponent({
|
||||
$route() {
|
||||
this.sumdelivery(this.$route.params.id);
|
||||
this.getOilOrder(this.$route.params.id);
|
||||
this.getOilPricing();
|
||||
|
||||
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.sumdelivery(this.$route.params.id);
|
||||
this.getOilOrder(this.$route.params.id);
|
||||
this.getOilPricing();
|
||||
|
||||
},
|
||||
|
||||
@@ -428,8 +520,11 @@ export default defineComponent({
|
||||
if (response.data) {
|
||||
this.deliveryOrder = response.data
|
||||
this.getCustomer(this.deliveryOrder.customer_id)
|
||||
|
||||
if (this.deliveryOrder.payment_type == 1) {
|
||||
|
||||
if (this.deliveryOrder.payment_type === 1 ) {
|
||||
this.getPaymentCard(this.deliveryOrder.payment_card_id);
|
||||
}
|
||||
if (this.deliveryOrder.payment_type === 2 ) {
|
||||
this.getPaymentCard(this.deliveryOrder.payment_card_id);
|
||||
}
|
||||
if (response.data.prime == 1) {
|
||||
@@ -488,7 +583,6 @@ export default defineComponent({
|
||||
.then((response: any) => {
|
||||
this.pricing = response.data;
|
||||
|
||||
|
||||
})
|
||||
.catch(() => {
|
||||
notify({
|
||||
@@ -506,10 +600,10 @@ export default defineComponent({
|
||||
withCredentials: true,
|
||||
})
|
||||
.then((response: any) => {
|
||||
if (response.data.ok){
|
||||
if (response.data.ok) {
|
||||
this.priceprime = response.data.priceprime;
|
||||
this.pricesameday = response.data.pricesameday;
|
||||
this.total_amount = response.data.total_amount;
|
||||
this.pricesameday = response.data.pricesameday;
|
||||
this.total_amount = response.data.total_amount;
|
||||
|
||||
}
|
||||
|
||||
@@ -547,7 +641,7 @@ export default defineComponent({
|
||||
text: "Ticket is finalized",
|
||||
type: "success",
|
||||
});
|
||||
this.$router.push({ name: "deliveryTicketsMissing" });
|
||||
this.$router.push({ name: "DeliveryHome" });
|
||||
}
|
||||
if (response.data.error) {
|
||||
notify({
|
||||
@@ -555,7 +649,7 @@ export default defineComponent({
|
||||
text: "Could not finalize ticket",
|
||||
type: "error",
|
||||
});
|
||||
this.$router.push("deliveryTicketsMissing");
|
||||
this.$router.push("DeliveryHome");
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user