Updated looks
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<Header/>
|
||||
<Header />
|
||||
<div class="flex">
|
||||
<div class="">
|
||||
<SideBar/>
|
||||
<SideBar />
|
||||
</div>
|
||||
<div class=" w-full px-10">
|
||||
<div class="text-sm breadcrumbs">
|
||||
@@ -19,10 +19,14 @@
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="grid grid-cols-12">
|
||||
<div class="col-span-6 bg-neutral p-5">
|
||||
|
||||
<div class="col-span-6 p-5">
|
||||
|
||||
<div class="grid grid-cols-12">
|
||||
<div class="col-span-12 font-bold flex pb-5 text-lg">{{customer.account_number}}</div>
|
||||
<div class="col-span-12 font-bold flex pb-5 text-lg">{{ customer.account_number }}</div>
|
||||
<div class="col-span-12 font-bold flex">
|
||||
{{ customer.customer_first_name }}
|
||||
{{ customer.customer_last_name }}
|
||||
@@ -61,132 +65,165 @@
|
||||
<div class="col-span-12 font-bold flex">
|
||||
{{ customer.customer_phone_number }}
|
||||
</div>
|
||||
|
||||
|
||||
<table class="table col-span-12">
|
||||
<!-- head -->
|
||||
<thead>
|
||||
<tr>
|
||||
<th>id</th>
|
||||
<th>Date</th>
|
||||
|
||||
|
||||
<th>Gallons</th>
|
||||
|
||||
<th>Status</th>
|
||||
<th>Prime</th>
|
||||
<th>Same Day</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<!-- row 1 -->
|
||||
<tr v-for="oil in deliveries" :key="oil['id']">
|
||||
<td>{{ oil['id'] }}</td>
|
||||
<td>{{ oil['expected_delivery_date'] }}</td>
|
||||
<td>
|
||||
<div v-if="oil['customer_asked_for_fill'] == 1">Fill</div>
|
||||
<div v-else> {{ oil['gallons_ordered'] }}</div>
|
||||
</td>
|
||||
<td>
|
||||
<div v-if="oil['delivery_status'] == 0">Waiting</div>
|
||||
<div v-else-if="oil['delivery_status'] == 1">delivered</div>
|
||||
<div v-else-if="oil['delivery_status'] == 2">Out for Delivery</div>
|
||||
<div v-else-if="oil['delivery_status'] == 3">Cancelled</div>
|
||||
<div v-else-if="oil['delivery_status'] == 4">Partial Delivery</div>
|
||||
<div v-else-if="oil['delivery_status'] == 5">Issue</div>
|
||||
<div v-else-if="oil['delivery_status'] == 10">Finalized</div>
|
||||
<div v-else></div>
|
||||
</td>
|
||||
<td>
|
||||
<div v-if="oil['prime'] == 0">No</div>
|
||||
<div v-else>Yes</div>
|
||||
</td>
|
||||
<td>
|
||||
<div v-if="oil['same_day'] == 0">No</div>
|
||||
<div v-else>Yes</div>
|
||||
</td>
|
||||
<td class="flex gap-5">
|
||||
<router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
|
||||
<button class="btn btn-sm btn-accent">Edit</button>
|
||||
</router-link>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid grid-cols-1 rounded-md p-6 ">
|
||||
<div class="text-[24px]">Create Oil Delivery
|
||||
</div>
|
||||
<form class="rounded-md px-8 pt-6 pb-8 mb-4 w-full" enctype="multipart/form-data" @submit.prevent="onSubmit">
|
||||
|
||||
<div class="col-span-12 md:col-span-4 mb-5 md:mb-0 gap-10">
|
||||
<label class="block text-white text-sm font-bold cursor-pointer label">Fill </label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.customer_asked_for_fill"
|
||||
class="checkbox"
|
||||
id="fill"
|
||||
type="checkbox"/>
|
||||
</div>
|
||||
|
||||
<div class="mb-4">
|
||||
<label class="block text-white text-sm font-bold mb-2">Gallons Ordered</label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.gallons_ordered"
|
||||
:disabled="CreateOilOrderForm.basicInfo.customer_asked_for_fill == true"
|
||||
class="input input-bordered w-full max-w-xs"
|
||||
id="title" type="text" placeholder="# gallons"/>
|
||||
<span v-if="v$.CreateOilOrderForm.basicInfo.gallons_ordered.$error" class="text-red-600 text-center">
|
||||
{{ v$.CreateOilOrderForm.basicInfo.gallons_ordered.$errors[0].$message }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="col-span-6 rounded-md p-6 ">
|
||||
<div class="grid grid-cols-12">
|
||||
<div class="col-span-12 text-[24px]">
|
||||
Create Oil Delivery
|
||||
</div>
|
||||
<form class="col-span-12 rounded-md px-8 pt-6 pb-8 mb-4 w-full" enctype="multipart/form-data"
|
||||
@submit.prevent="onSubmit">
|
||||
|
||||
<div class="mb-4">
|
||||
<label class="block text-white text-sm font-bold mb-2">Expected </label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.expected_delivery_date"
|
||||
class="input input-bordered w-full max-w-xs"
|
||||
id="title" type="date"
|
||||
min="2023-01-01" max="2030-01-01"/>
|
||||
<span v-if="v$.CreateOilOrderForm.basicInfo.expected_delivery_date.$error"
|
||||
<div class="col-span-12 md:col-span-4 mb-5 md:mb-0 gap-10">
|
||||
<label class="block text-white text-sm font-bold cursor-pointer label">Fill </label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.customer_asked_for_fill" class="checkbox checkbox-xs" id="fill"
|
||||
type="checkbox" />
|
||||
</div>
|
||||
|
||||
<div class="mb-4">
|
||||
<label class="block text-white text-sm font-bold mb-2">Gallons Ordered</label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.gallons_ordered"
|
||||
:disabled="CreateOilOrderForm.basicInfo.customer_asked_for_fill == true"
|
||||
class="input input-bordered input-sm w-full max-w-xs" id="title" type="text"
|
||||
placeholder="# gallons" />
|
||||
<span v-if="v$.CreateOilOrderForm.basicInfo.gallons_ordered.$error" class="text-red-600 text-center">
|
||||
{{ v$.CreateOilOrderForm.basicInfo.gallons_ordered.$errors[0].$message }}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div class="mb-4">
|
||||
<label class="block text-white text-sm font-bold mb-2">Expected </label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.expected_delivery_date"
|
||||
class="input input-bordered input-sm w-full max-w-xs" id="title" type="date" min="2023-01-01"
|
||||
max="2030-01-01" />
|
||||
<span v-if="v$.CreateOilOrderForm.basicInfo.expected_delivery_date.$error"
|
||||
class="text-red-600 text-center">
|
||||
{{ v$.CreateOilOrderForm.basicInfo.expected_delivery_date.$errors[0].$message }}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div class="mb-4">
|
||||
<label class="form-control">
|
||||
<div class="label">
|
||||
<span class="label-text">Delivery notes</span>
|
||||
</span>
|
||||
</div>
|
||||
<textarea class="textarea textarea-bordered h-24"
|
||||
placeholder="Describe any thing given from the customer .."
|
||||
v-model="CreateOilOrderForm.basicInfo.dispatcher_notes_taken"></textarea>
|
||||
</label>
|
||||
|
||||
<div class="mb-4">
|
||||
<label class="form-control">
|
||||
<div class="label">
|
||||
<span class="label-text">Delivery notes</span>
|
||||
</div>
|
||||
<textarea class="textarea textarea-bordered h-24"
|
||||
placeholder="Describe any thing given from the customer .."
|
||||
v-model="CreateOilOrderForm.basicInfo.dispatcher_notes_taken"></textarea>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 md:col-span-4 mb-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 checkbox-xs" id="prime" type="checkbox" />
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 md:col-span-4 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 checkbox-xs" id="same_day" type="checkbox" />
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 md:col-span-4 mb-5 md:mb-0 gap-10">
|
||||
<label class="block text-white text-sm font-bold cursor-pointer label">Cash</label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.cash" class="checkbox checkbox-xs" id="cash" type="checkbox" />
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 md:col-span-4 mb-5 md:mb-0 gap-10">
|
||||
<label class="block text-white text-sm font-bold cursor-pointer label">Credit </label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.credit" class="checkbox checkbox-xs" id="Credit" type="checkbox" />
|
||||
</div>
|
||||
|
||||
<div class="flex-1 mb-4">
|
||||
<label class="block text-white text-sm font-bold mb-2">Customer Cards Payment</label>
|
||||
<select class="select select-bordered select-sm w-full max-w-xs" aria-label="Default select example"
|
||||
id="userCards" v-model="CreateOilOrderForm.basicInfo.userCards">
|
||||
<option class="text-white" v-for="(card, index) in userCards" :key="index" :value="card['id']">
|
||||
{{ card['type_of_card'] }} {{ card['card_number'] }}
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="flex-1 mb-4">
|
||||
<label class="block text-white text-sm font-bold mb-2">Delivery Driver </label>
|
||||
<select class="select select-bordered select-sm w-full max-w-xs" aria-label="Default select example"
|
||||
id="customer_state" v-model="CreateOilOrderForm.basicInfo.driver_driver">
|
||||
<option class="text-white" v-for="(driver, index) in truckDriversList" :key="index"
|
||||
:value="driver['id']">
|
||||
{{ driver['employee_first_name'] }} {{ driver['employee_last_name'] }}
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12 md:col-span-12 flex mt-5 mb-5">
|
||||
<button class="btn btn-sm btn-accent">
|
||||
Create Oil Order
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12 md:col-span-4 mb-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>
|
||||
|
||||
|
||||
<div class="col-span-12 md:col-span-4 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>
|
||||
|
||||
<div class="bg-neutral">
|
||||
|
||||
<div class="col-span-12 md:col-span-4 mb-5 md:mb-0 gap-10">
|
||||
<label class="block text-white text-sm font-bold cursor-pointer label">Cash</label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.cash"
|
||||
class="checkbox"
|
||||
id="cash"
|
||||
type="checkbox"/>
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 md:col-span-4 mb-5 md:mb-0 gap-10">
|
||||
<label class="block text-white text-sm font-bold cursor-pointer label">Credit </label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.credit"
|
||||
class="checkbox"
|
||||
id="Credit"
|
||||
type="checkbox"/>
|
||||
</div>
|
||||
|
||||
<div class="flex-1 mb-4">
|
||||
<label class="block text-white text-sm font-bold mb-2">Customer Cards Payment</label>
|
||||
<select
|
||||
class="select select-bordered w-full max-w-xs"
|
||||
aria-label="Default select example" id="userCards"
|
||||
v-model="CreateOilOrderForm.basicInfo.userCards">
|
||||
<option class="text-white" v-for="(card, index) in userCards"
|
||||
:key="index"
|
||||
:value="card['id']">
|
||||
{{ card['type_of_card'] }} {{ card['card_number'] }}
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="flex-1 mb-4">
|
||||
<label class="block text-white text-sm font-bold mb-2">Delivery Driver </label>
|
||||
<select class="select select-bordered w-full max-w-xs" aria-label="Default select example" id="customer_state"
|
||||
v-model="CreateOilOrderForm.basicInfo.driver_driver">
|
||||
<option class="text-white" v-for="(driver, index) in truckDriversList" :key="index" :value="driver['id']">
|
||||
{{ driver['employee_first_name'] }} {{ driver['employee_last_name'] }}
|
||||
</option>
|
||||
</select>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12 md:col-span-12 flex mt-5 mb-5">
|
||||
<button
|
||||
class="btn">
|
||||
Create Oil Order
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<Footer/>
|
||||
<Footer />
|
||||
</template>
|
||||
|
||||
|
||||
@@ -231,47 +268,50 @@ export default defineComponent({
|
||||
driver_driver: '',
|
||||
},
|
||||
},
|
||||
customer: {
|
||||
id: 0,
|
||||
customer_last_name: '',
|
||||
customer_first_name: '',
|
||||
customer_town: '',
|
||||
customer_state: 0,
|
||||
customer_zip: '',
|
||||
customer_first_call: '',
|
||||
customer_email: '',
|
||||
customer_automatic: '',
|
||||
customer_phone_number: '',
|
||||
customer_home_type: 0,
|
||||
customer_apt: '',
|
||||
customer_address: '',
|
||||
account_number: '',
|
||||
},
|
||||
deliveries: [],
|
||||
customer: {
|
||||
id: 0,
|
||||
customer_last_name: '',
|
||||
customer_first_name: '',
|
||||
customer_town: '',
|
||||
customer_state: 0,
|
||||
customer_zip: '',
|
||||
customer_first_call: '',
|
||||
customer_email: '',
|
||||
customer_automatic: '',
|
||||
customer_phone_number: '',
|
||||
customer_home_type: 0,
|
||||
customer_apt: '',
|
||||
customer_address: '',
|
||||
account_number: '',
|
||||
},
|
||||
}
|
||||
},
|
||||
validations() {
|
||||
return {
|
||||
CreateOilOrderForm: {
|
||||
basicInfo: {
|
||||
gallons_ordered: {required, minLength: minLength(1)},
|
||||
expected_delivery_date: {required},
|
||||
gallons_ordered: { required, minLength: minLength(1) },
|
||||
expected_delivery_date: { required },
|
||||
},
|
||||
},
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.userStatus()
|
||||
this.getDriversList()
|
||||
this.getDriversList()
|
||||
},
|
||||
watch: {
|
||||
$route() {
|
||||
this.getCustomer(this.$route.params.id);
|
||||
this.getPaymentCards(this.$route.params.id);
|
||||
this.getCustomerDelivery(this.$route.params.id)
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.getCustomer(this.$route.params.id)
|
||||
this.getPaymentCards(this.$route.params.id);
|
||||
this.getPaymentCards(this.$route.params.id);
|
||||
this.getCustomerDelivery(this.$route.params.id)
|
||||
},
|
||||
methods: {
|
||||
userStatus() {
|
||||
@@ -282,14 +322,14 @@ export default defineComponent({
|
||||
withCredentials: true,
|
||||
headers: authHeader(),
|
||||
})
|
||||
.then((response: any) => {
|
||||
if (response.data.ok) {
|
||||
this.user = response.data.user;
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
this.user = null
|
||||
})
|
||||
.then((response: any) => {
|
||||
if (response.data.ok) {
|
||||
this.user = response.data.user;
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
this.user = null
|
||||
})
|
||||
},
|
||||
|
||||
getCustomer(user_id: any) {
|
||||
@@ -299,17 +339,28 @@ export default defineComponent({
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
})
|
||||
.then((response: any) => {
|
||||
this.customer = response.data;
|
||||
.then((response: any) => {
|
||||
this.customer = response.data;
|
||||
|
||||
})
|
||||
.catch(() => {
|
||||
notify({
|
||||
title: "Error",
|
||||
text: "Could not find customer",
|
||||
type: "error",
|
||||
});
|
||||
})
|
||||
.catch(() => {
|
||||
notify({
|
||||
title: "Error",
|
||||
text: "Could not find customer",
|
||||
type: "error",
|
||||
});
|
||||
});
|
||||
},
|
||||
getCustomerDelivery(userid: any) {
|
||||
console.log("here")
|
||||
let path = import.meta.env.VITE_BASE_URL + '/delivery/customer/' + userid + '/1';
|
||||
axios({
|
||||
method: 'get',
|
||||
url: path,
|
||||
headers: authHeader(),
|
||||
}).then((response: any) => {
|
||||
this.deliveries = response.data
|
||||
})
|
||||
},
|
||||
|
||||
getPaymentCards(user_id: any) {
|
||||
@@ -319,26 +370,26 @@ export default defineComponent({
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
})
|
||||
.then((response: any) => {
|
||||
this.userCards = response.data;
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
.then((response: any) => {
|
||||
this.userCards = response.data;
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
getDriversList() {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/employee/drivers";
|
||||
axios({
|
||||
method: "get",
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
headers: authHeader(),
|
||||
headers: authHeader(),
|
||||
})
|
||||
.then((response: any) => {
|
||||
this.truckDriversList = response.data;
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
.then((response: any) => {
|
||||
this.truckDriversList = response.data;
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
},
|
||||
CreateOilOrder(payload: {
|
||||
gallons_ordered: string;
|
||||
@@ -361,14 +412,14 @@ export default defineComponent({
|
||||
withCredentials: true,
|
||||
headers: authHeader(),
|
||||
})
|
||||
.then((response: any) => {
|
||||
if (response.data.ok) {
|
||||
this.$router.push({name: "payOil", params: {id: response.data.delivery_id}});
|
||||
}
|
||||
if (response.data.error) {
|
||||
this.$router.push("/");
|
||||
}
|
||||
})
|
||||
.then((response: any) => {
|
||||
if (response.data.ok) {
|
||||
this.$router.push({ name: "payOil", params: { id: response.data.delivery_id } });
|
||||
}
|
||||
if (response.data.error) {
|
||||
this.$router.push("/");
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
onSubmit() {
|
||||
@@ -384,12 +435,12 @@ export default defineComponent({
|
||||
credit_card_id: this.CreateOilOrderForm.basicInfo.userCards,
|
||||
driver_employee_id: this.CreateOilOrderForm.basicInfo.driver_driver,
|
||||
};
|
||||
if (this.CreateOilOrderForm.basicInfo.driver_driver == ''){
|
||||
notify({
|
||||
title: "Error",
|
||||
text: "Did not add a driver",
|
||||
type: "error",
|
||||
});
|
||||
if (this.CreateOilOrderForm.basicInfo.driver_driver == '') {
|
||||
notify({
|
||||
title: "Error",
|
||||
text: "Did not add a driver",
|
||||
type: "error",
|
||||
});
|
||||
}
|
||||
this.CreateOilOrder(payload);
|
||||
},
|
||||
@@ -398,6 +449,4 @@ export default defineComponent({
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
<style scoped></style>
|
||||
Reference in New Issue
Block a user