added print button and finalize
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
<template>
|
||||
<Header/>
|
||||
<Header />
|
||||
|
||||
<div class="flex">
|
||||
<div class="">
|
||||
<SideBar/>
|
||||
<SideBar />
|
||||
</div>
|
||||
<div class=" w-full px-10 ">
|
||||
<div class="text-sm breadcrumbs mb-10">
|
||||
@@ -21,7 +21,8 @@
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="grid grid-cols-1 rounded-md pb-5">
|
||||
<div class="grid grid-cols-1 rounded-md pb-5" v-if="total_amount">
|
||||
|
||||
<div class="text-[24px]">
|
||||
Finalize Oil Order # {{ deliveryOrder.id }}
|
||||
</div>
|
||||
@@ -75,7 +76,7 @@
|
||||
|
||||
</div>
|
||||
<div class="col-span-6 ">
|
||||
<div class="flex justify-end" v-if="deliveryOrder.id ">
|
||||
<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>
|
||||
@@ -96,12 +97,12 @@
|
||||
</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 == 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-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">
|
||||
@@ -132,22 +133,22 @@
|
||||
</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-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">
|
||||
<div v-if="deliveryOrder.prime == 1">
|
||||
Prime Required: Yes
|
||||
</div>
|
||||
<div v-if="deliveryOrder.prime==0">
|
||||
<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">
|
||||
<div v-if="deliveryOrder.same_day == 1">
|
||||
Same Day: Yes
|
||||
</div>
|
||||
<div v-if="deliveryOrder.same_day==0">
|
||||
<div v-if="deliveryOrder.same_day == 0">
|
||||
Same Day: No
|
||||
</div>
|
||||
</div>
|
||||
@@ -160,12 +161,12 @@
|
||||
</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-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="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 ">
|
||||
@@ -176,7 +177,7 @@
|
||||
{{ userCard.name_on_card }}
|
||||
</div>
|
||||
<div class="flex p-1 pl-4">
|
||||
****-****-****-{{ userCard.last_four_digits }}
|
||||
{{ userCard.card_number }}
|
||||
</div>
|
||||
<div class="flex p-1 pl-4">
|
||||
{{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
|
||||
@@ -186,18 +187,18 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-span-12" v-if="deliveryOrder.payment_type==2">
|
||||
<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">
|
||||
{{ 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 }}
|
||||
{{ userCard.card_number }}
|
||||
</div>
|
||||
<div class="flex p-1 pl-4">
|
||||
{{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
|
||||
@@ -206,68 +207,69 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-span-12 ">Total {{deliveryMoney.total_amount}}</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-span-6 mt-5">
|
||||
<div class="col-span-12 font-bold">
|
||||
Change Details
|
||||
</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 mb-5 md:mb-0 gap-10 ">
|
||||
|
||||
<label class="block text-white text-sm font-bold mb-2">Gallons Ordered</label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.gallons_delivered"
|
||||
class="input input-bordered w-full max-w-xs"
|
||||
id="title" type="text" placeholder="# gallons"/>
|
||||
|
||||
<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-12mb-5 md:mb-0 gap-10">
|
||||
<label class="block text-white text-sm font-bold cursor-pointer label">Prime</label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.prime"
|
||||
class="checkbox"
|
||||
id="prime"
|
||||
type="checkbox"/>
|
||||
<div class="col-span-12 py-3" v-if="deliveryOrder.prime == 1">
|
||||
Prime Fee: {{ pricing.price_prime }}
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12 mb-5 md:mb-0 gap-10">
|
||||
<label class="block text-white text-sm font-bold cursor-pointer label">Same Day </label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.same_day"
|
||||
class="checkbox"
|
||||
id="same_day"
|
||||
type="checkbox"/>
|
||||
<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 md:col-span-12 flex mt-5 mb-5">
|
||||
<button
|
||||
class="btn">
|
||||
Finalize Delivery
|
||||
</button>
|
||||
<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>
|
||||
</form>
|
||||
</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/>
|
||||
<Footer />
|
||||
</template>
|
||||
|
||||
|
||||
<script lang="ts">
|
||||
import {defineComponent} from 'vue'
|
||||
import { defineComponent } from 'vue'
|
||||
import axios from 'axios'
|
||||
import authHeader from '../../../services/auth.header'
|
||||
import Header from '../../../layouts/headers/headerauth.vue'
|
||||
import SideBar from '../../../layouts/sidebar/sidebar.vue'
|
||||
import Footer from '../../../layouts/footers/footer.vue'
|
||||
import useValidate from "@vuelidate/core";
|
||||
import {notify} from "@kyvg/vue3-notification"
|
||||
import { notify } from "@kyvg/vue3-notification"
|
||||
|
||||
|
||||
export default defineComponent({
|
||||
@@ -282,6 +284,7 @@ export default defineComponent({
|
||||
data() {
|
||||
return {
|
||||
v$: useValidate(),
|
||||
loaded: false,
|
||||
user: {
|
||||
id: 0
|
||||
},
|
||||
@@ -364,7 +367,19 @@ export default defineComponent({
|
||||
driver_employee_id: 0,
|
||||
driver_first_name: '',
|
||||
driver_last_name: '',
|
||||
total_price: 0,
|
||||
},
|
||||
pricing: {
|
||||
price_from_supplier: 0,
|
||||
price_for_customer: 0,
|
||||
price_for_employee: 0,
|
||||
price_same_day: 0,
|
||||
price_prime: 0,
|
||||
date: "",
|
||||
},
|
||||
priceprime: 0,
|
||||
pricesameday: 0,
|
||||
total_amount: 0
|
||||
}
|
||||
},
|
||||
|
||||
@@ -373,14 +388,16 @@ export default defineComponent({
|
||||
},
|
||||
watch: {
|
||||
$route() {
|
||||
this.sumdelivery(this.$route.params.id);
|
||||
this.getOilOrder(this.$route.params.id);
|
||||
this.getOilOrderMoney(this.$route.params.id);
|
||||
this.get_delivery_amount(this.$route.params.id);
|
||||
this.getOilPricing();
|
||||
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.sumdelivery(this.$route.params.id);
|
||||
this.getOilOrder(this.$route.params.id);
|
||||
this.getOilOrderMoney(this.$route.params.id);
|
||||
|
||||
},
|
||||
|
||||
methods: {
|
||||
@@ -392,14 +409,14 @@ export default defineComponent({
|
||||
withCredentials: true,
|
||||
headers: authHeader(),
|
||||
})
|
||||
.then((response: any) => {
|
||||
if (response.data.ok) {
|
||||
this.user = response.data.user;
|
||||
this.user.id = response.data.user_id;
|
||||
}
|
||||
})
|
||||
.then((response: any) => {
|
||||
if (response.data.ok) {
|
||||
this.user = response.data.user;
|
||||
this.user.id = response.data.user_id;
|
||||
}
|
||||
})
|
||||
},
|
||||
getOilOrder(delivery_id: any) {
|
||||
getOilOrder(delivery_id: any) {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/delivery/order/" + delivery_id;
|
||||
axios({
|
||||
method: "get",
|
||||
@@ -407,41 +424,28 @@ export default defineComponent({
|
||||
withCredentials: true,
|
||||
headers: authHeader(),
|
||||
})
|
||||
.then((response: any) => {
|
||||
if (response.data) {
|
||||
this.deliveryOrder = response.data
|
||||
this.getCustomer(this.deliveryOrder.customer_id)
|
||||
|
||||
if (this.deliveryOrder.payment_type == 1) {
|
||||
this.getPaymentCard(this.deliveryOrder.payment_card_id);
|
||||
}
|
||||
if (response.data.prime == 1) {
|
||||
this.CreateOilOrderForm.basicInfo.prime = true
|
||||
}
|
||||
if (response.data.same_day == 1) {
|
||||
this.CreateOilOrderForm.basicInfo.same_day = true
|
||||
}
|
||||
|
||||
this.CreateOilOrderForm.basicInfo.gallons_delivered = response.data.gallons_delivered;
|
||||
.then((response: any) => {
|
||||
if (response.data) {
|
||||
this.deliveryOrder = response.data
|
||||
this.getCustomer(this.deliveryOrder.customer_id)
|
||||
|
||||
if (this.deliveryOrder.payment_type == 1) {
|
||||
this.getPaymentCard(this.deliveryOrder.payment_card_id);
|
||||
}
|
||||
})
|
||||
if (response.data.prime == 1) {
|
||||
this.CreateOilOrderForm.basicInfo.prime = true
|
||||
}
|
||||
if (response.data.same_day == 1) {
|
||||
this.CreateOilOrderForm.basicInfo.same_day = true
|
||||
}
|
||||
|
||||
this.CreateOilOrderForm.basicInfo.gallons_delivered = response.data.gallons_delivered;
|
||||
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
get_delivery_amount(delivery_id: any) {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/delivery/amount/" + delivery_id;
|
||||
axios({
|
||||
method: "get",
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
headers: authHeader(),
|
||||
})
|
||||
.then((response: any) => {
|
||||
if (response.data) {
|
||||
|
||||
}
|
||||
})
|
||||
},
|
||||
getCustomer(user_id: any) {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/customer/" + user_id;
|
||||
axios({
|
||||
@@ -449,16 +453,16 @@ export default defineComponent({
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
})
|
||||
.then((response: any) => {
|
||||
this.customer = response.data;
|
||||
})
|
||||
.catch(() => {
|
||||
notify({
|
||||
title: "Error",
|
||||
text: "Could not find customer",
|
||||
type: "error",
|
||||
});
|
||||
.then((response: any) => {
|
||||
this.customer = response.data;
|
||||
})
|
||||
.catch(() => {
|
||||
notify({
|
||||
title: "Error",
|
||||
text: "Could not find customer",
|
||||
type: "error",
|
||||
});
|
||||
});
|
||||
},
|
||||
getPaymentCard(card_id: any) {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/payment/card/" + card_id;
|
||||
@@ -467,27 +471,57 @@ export default defineComponent({
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
})
|
||||
.then((response: any) => {
|
||||
this.userCard = response.data;
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
.then((response: any) => {
|
||||
this.userCard = response.data;
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
getOilOrderMoney(delivery_id: any) {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/delivery/order/money/" + delivery_id;
|
||||
getOilPricing() {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/info/price/oil/table";
|
||||
axios({
|
||||
method: "get",
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
headers: authHeader(),
|
||||
})
|
||||
.then((response: any) => {
|
||||
if (response.data) {
|
||||
this.deliveryMoney = response.data
|
||||
}
|
||||
})
|
||||
.then((response: any) => {
|
||||
this.pricing = response.data;
|
||||
|
||||
|
||||
})
|
||||
.catch(() => {
|
||||
notify({
|
||||
title: "Error",
|
||||
text: "Could not get oil pricing",
|
||||
type: "error",
|
||||
});
|
||||
});
|
||||
},
|
||||
sumdelivery(delivery_id: any) {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/delivery/total/" + delivery_id;
|
||||
axios({
|
||||
method: "get",
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
})
|
||||
.then((response: any) => {
|
||||
if (response.data.ok){
|
||||
this.priceprime = response.data.priceprime;
|
||||
this.pricesameday = response.data.pricesameday;
|
||||
this.total_amount = response.data.total_amount;
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
.catch(() => {
|
||||
notify({
|
||||
title: "Error",
|
||||
text: "Could not get oil pricing",
|
||||
type: "error",
|
||||
});
|
||||
});
|
||||
|
||||
},
|
||||
|
||||
editOilOrder(payload: {
|
||||
@@ -506,24 +540,24 @@ export default defineComponent({
|
||||
withCredentials: true,
|
||||
headers: authHeader(),
|
||||
})
|
||||
.then((response: any) => {
|
||||
if (response.data.ok) {
|
||||
notify({
|
||||
.then((response: any) => {
|
||||
if (response.data.ok) {
|
||||
notify({
|
||||
title: "Success",
|
||||
text: "Ticket is finalized",
|
||||
type: "success",
|
||||
});
|
||||
this.$router.push({name: "deliveryTicketsMissing"});
|
||||
}
|
||||
if (response.data.error) {
|
||||
notify({
|
||||
this.$router.push({ name: "deliveryTicketsMissing" });
|
||||
}
|
||||
if (response.data.error) {
|
||||
notify({
|
||||
title: "Error",
|
||||
text: "Could not finalize ticket",
|
||||
type: "error",
|
||||
});
|
||||
this.$router.push("deliveryTicketsMissing");
|
||||
}
|
||||
})
|
||||
this.$router.push("deliveryTicketsMissing");
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
onSubmit() {
|
||||
|
||||
Reference in New Issue
Block a user