Major Refactor
This commit is contained in:
@@ -1,290 +1,153 @@
|
||||
<template>
|
||||
<Header />
|
||||
|
||||
<div class="flex">
|
||||
<div class="">
|
||||
<SideBar />
|
||||
</div>
|
||||
<div class=" w-full px-10">
|
||||
<!-- Main Content -->
|
||||
<div class="w-full px-4 md:px-10 py-4">
|
||||
<!-- Breadcrumbs Navigation -->
|
||||
<div class="text-sm breadcrumbs">
|
||||
<ul>
|
||||
<li>
|
||||
<router-link :to="{ name: 'home' }">
|
||||
Home
|
||||
</router-link>
|
||||
</li>
|
||||
<li><router-link :to="{ name: 'home' }">Home</router-link></li>
|
||||
<li>Edit Oil Delivery #{{ deliveryOrder.id }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="grid grid-cols-2 rounded-md p-6 ">
|
||||
<div class="col-span-1">
|
||||
<div class="text-2xl border-b border-gray-500 mb-10">
|
||||
Edit Oil Delivery
|
||||
</div>
|
||||
<div class=" rounded-md">
|
||||
<div class="flex text-2xl">
|
||||
Delivery id: {{ deliveryOrder.id }}
|
||||
</div>
|
||||
<div class="grid grid-cols-12">
|
||||
<div class="col-span-12 py-5">
|
||||
<router-link :to="{ name: 'customerProfile', params: { id: customer['id'] } }"
|
||||
class="btn btn-secondary btn-sm">
|
||||
View Profile
|
||||
</router-link>
|
||||
</div>
|
||||
<div class="col-span-6 p-5">
|
||||
<div class="grid grid-cols-12">
|
||||
<div class="col-span-12 flex">
|
||||
{{ customer.customer_first_name }}
|
||||
{{ customer.customer_last_name }}
|
||||
</div>
|
||||
<div class="col-span-12 flex">{{customer.customer_address}}</div>
|
||||
<div class="col-span-12 flex">
|
||||
<div class="pr-2">
|
||||
{{ customer.customer_town }},
|
||||
</div>
|
||||
<div class="pr-2">
|
||||
<div v-if="customer.customer_state == 0">Massachusetts</div>
|
||||
<div v-else-if="customer.customer_state == 1">Rhode Island</div>
|
||||
<div v-else-if="customer.customer_state == 2">New Hampshire</div>
|
||||
<div v-else-if="customer.customer_state == 3">Maine</div>
|
||||
<div v-else-if="customer.customer_state == 4">Vermont</div>
|
||||
<div v-else-if="customer.customer_state == 5">Maine</div>
|
||||
<div v-else-if="customer.customer_state == 6">New York</div>
|
||||
<div v-else>Unknown state</div>
|
||||
</div>
|
||||
<div class="pr-2">
|
||||
{{ customer.customer_zip }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 flex" v-if="customer.customer_apt !== 'None'">
|
||||
{{ customer.customer_apt }}
|
||||
</div>
|
||||
<div class="col-span-12 flex">
|
||||
<div v-if="customer.customer_home_type == 0">Residential</div>
|
||||
<div v-else-if="customer.customer_home_type == 1">apartment</div>
|
||||
<div v-else-if="customer.customer_home_type == 2">condo</div>
|
||||
<div v-else-if="customer.customer_home_type == 3">commercial</div>
|
||||
<div v-else-if="customer.customer_home_type == 4">business</div>
|
||||
<div v-else-if="customer.customer_home_type == 5">construction</div>
|
||||
<div v-else-if="customer.customer_home_type == 6">container</div>
|
||||
</div>
|
||||
<div class="col-span-12 flex">
|
||||
{{ customer.customer_phone_number }}
|
||||
</div>
|
||||
</div>
|
||||
<!-- TOP SECTION: Customer and Payment Info -->
|
||||
<div class="grid grid-cols-1 lg:grid-cols-2 gap-6 my-6">
|
||||
<!-- Customer Info Card -->
|
||||
<div v-if="customer.id" class="bg-neutral rounded-lg p-5">
|
||||
<div class="flex justify-between items-center mb-4">
|
||||
<div>
|
||||
<div class="text-xl font-bold">{{ customer.customer_first_name }} {{ customer.customer_last_name }}</div>
|
||||
<div class="text-sm text-gray-400">Account: {{ customer.account_number }}</div>
|
||||
</div>
|
||||
<router-link :to="{ name: 'customerProfile', params: { id: customer.id } }" class="btn btn-secondary btn-sm">
|
||||
View Profile
|
||||
</router-link>
|
||||
</div>
|
||||
<div>
|
||||
<div>{{ customer.customer_address }}</div>
|
||||
<div v-if="customer.customer_apt && customer.customer_apt !== 'None'">{{ customer.customer_apt }}</div>
|
||||
<div>{{ customer.customer_town }}, {{ stateName }} {{ customer.customer_zip }}</div>
|
||||
<div class="mt-2">{{ customer.customer_phone_number }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="grid grid-cols-1 " v-if="deliveryOrder.payment_type == 1">
|
||||
|
||||
<div class=" p-2 ">
|
||||
<div class="rounded-md border-2 bg-neutral">
|
||||
<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.card_number }}
|
||||
</div>
|
||||
<div class="flex p-1 pl-4">
|
||||
{{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
|
||||
</div>
|
||||
<div class="flex p-1 pl-4">
|
||||
{{ userCard.security_number }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class=" rounded-md mx-5 my-5">
|
||||
<div class="flex">
|
||||
Order Date:
|
||||
</div>
|
||||
<div class="mb-5">
|
||||
{{ deliveryOrder.when_ordered }}
|
||||
</div>
|
||||
|
||||
<div class="flex">
|
||||
Expected Delivery Date:
|
||||
</div>
|
||||
<div class="mb-5">
|
||||
{{ deliveryOrder.expected_delivery_date }}
|
||||
</div>
|
||||
|
||||
<div class="flex">
|
||||
Price per gallon:
|
||||
|
||||
</div>
|
||||
<div class="mb-5">
|
||||
{{ deliveryOrder.customer_price }}
|
||||
<!-- Payment Card on File Card -->
|
||||
<div v-if="deliveryOrder.payment_type === 1 && userCard.id" class="bg-neutral rounded-lg p-5">
|
||||
<h3 class="text-xl font-bold mb-4">Card on File</h3>
|
||||
<div class="space-y-1">
|
||||
<p><span class="font-semibold">Card Type:</span> {{ userCard.type_of_card }}</p>
|
||||
<p><span class="font-semibold">Card Number:</span> {{ userCard.card_number }}</p>
|
||||
<p><span class="font-semibold">Name:</span> {{ userCard.name_on_card }}</p>
|
||||
<p><span class="font-semibold">Expires:</span> {{ userCard.expiration_month }}/{{ userCard.expiration_year }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-span-1">
|
||||
|
||||
|
||||
<form class="rounded-md px-8 pb-8 mb-4 w-full" enctype="multipart/form-data" @submit.prevent="onSubmit">
|
||||
|
||||
<div class="col-span-12 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"
|
||||
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>
|
||||
<!-- BOTTOM SECTION: Edit Form -->
|
||||
<div class="bg-neutral rounded-lg p-6">
|
||||
<h2 class="text-2xl font-bold mb-4">Update Delivery Details</h2>
|
||||
<form @submit.prevent="onSubmit" class="space-y-4">
|
||||
<!-- Gallons Ordered & Fill Checkbox -->
|
||||
<div class="flex items-end gap-4">
|
||||
<div class="flex-grow">
|
||||
<label class="label"><span class="label-text font-bold">Gallons Ordered</span></label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.gallons_ordered" :disabled="CreateOilOrderForm.basicInfo.customer_asked_for_fill"
|
||||
class="input input-bordered input-sm w-full max-w-xs" type="number" placeholder="# gallons" />
|
||||
<span v-if="v$.CreateOilOrderForm.basicInfo.gallons_ordered.$error" class="text-red-500 text-xs mt-1">
|
||||
{{ v$.CreateOilOrderForm.basicInfo.gallons_ordered.$errors[0].$message }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="form-control pb-1">
|
||||
<label class="label cursor-pointer justify-start gap-4">
|
||||
<span class="label-text font-bold">Fill</span>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.customer_asked_for_fill" type="checkbox" class="checkbox checkbox-sm" />
|
||||
</label>
|
||||
</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">Fill </label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.customer_asked_for_fill" class="checkbox checkbox-xs" id="fill"
|
||||
type="checkbox" />
|
||||
<!-- Date Fields -->
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||
<div>
|
||||
<label class="label"><span class="label-text font-bold">Order Created Date</span></label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.created_delivery_date" type="date" class="input input-bordered input-sm w-full" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label"><span class="label-text font-bold">Expected Delivery Date</span></label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.expected_delivery_date" type="date" class="input input-bordered input-sm w-full" />
|
||||
<span v-if="v$.CreateOilOrderForm.basicInfo.expected_delivery_date.$error" class="text-red-500 text-xs mt-1">
|
||||
{{ v$.CreateOilOrderForm.basicInfo.expected_delivery_date.$errors[0].$message }}
|
||||
</span>
|
||||
</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">Cash</label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.cash" class="checkbox checkbox-xs" id="cash" type="checkbox" />
|
||||
</div>
|
||||
|
||||
<div v-if="userCards.length > 0">
|
||||
<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.card" class="checkbox checkbox-xs" id="Credit"
|
||||
type="checkbox" />
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="userCards.length > 0">
|
||||
<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">Check</label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.check" class="checkbox checkbox-xs" id="check"
|
||||
type="checkbox" />
|
||||
</div>
|
||||
<!-- Fees & Options -->
|
||||
<div class="p-4 border rounded-md">
|
||||
<label class="label-text font-bold">Fees & Options</label>
|
||||
<div class="flex flex-wrap gap-x-6 gap-y-2 mt-2">
|
||||
<div class="form-control"><label class="label cursor-pointer gap-2"><span class="label-text">Prime</span><input v-model="CreateOilOrderForm.basicInfo.prime" type="checkbox" class="checkbox checkbox-xs" /></label></div>
|
||||
<div class="form-control"><label class="label cursor-pointer gap-2"><span class="label-text">Emergency</span><input v-model="CreateOilOrderForm.basicInfo.emergency" type="checkbox" class="checkbox checkbox-xs" /></label></div>
|
||||
<div class="form-control"><label class="label cursor-pointer gap-2"><span class="label-text">Same Day</span><input v-model="CreateOilOrderForm.basicInfo.same_day" type="checkbox" class="checkbox checkbox-xs" /></label></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="userCards.length > 0">
|
||||
<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'] }}
|
||||
<!-- Payment Type Radio Group -->
|
||||
<div class="p-4 border rounded-md space-y-3">
|
||||
<label class="label-text font-bold">Payment Method</label>
|
||||
<div class="flex flex-wrap gap-x-6 gap-y-2">
|
||||
<div class="form-control"><label class="label cursor-pointer gap-2"><span class="label-text">Cash</span><input type="radio" v-model="CreateOilOrderForm.basicInfo.payment_type" :value="0" class="radio radio-xs" /></label></div>
|
||||
<div v-if="userCards.length > 0" class="form-control"><label class="label cursor-pointer gap-2"><span class="label-text">Card</span><input type="radio" v-model="CreateOilOrderForm.basicInfo.payment_type" :value="1" class="radio radio-xs" /></label></div>
|
||||
<div class="form-control"><label class="label cursor-pointer gap-2"><span class="label-text">Check</span><input type="radio" v-model="CreateOilOrderForm.basicInfo.payment_type" :value="3" class="radio radio-xs" /></label></div>
|
||||
<div class="form-control"><label class="label cursor-pointer gap-2"><span class="label-text">Other</span><input type="radio" v-model="CreateOilOrderForm.basicInfo.payment_type" :value="4" class="radio radio-xs" /></label></div>
|
||||
</div>
|
||||
<!-- Customer Card Selection -->
|
||||
<div v-if="userCards.length > 0 && CreateOilOrderForm.basicInfo.payment_type === 1">
|
||||
<label class="label"><span class="label-text">Select Card</span></label>
|
||||
<select v-model="CreateOilOrderForm.basicInfo.credit_card_id" class="select select-bordered select-sm w-full max-w-xs">
|
||||
<option disabled :value="0">Select a card</option>
|
||||
<option v-for="card in userCards" :key="card.id" :value="card.id">
|
||||
{{ card.type_of_card }} {{ card.card_number }}
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else>
|
||||
<div class="col-span-12 md:col-span-4 mb-5 md:mb-0 py-5">
|
||||
No Cards on File!
|
||||
<router-link :to="{ name: 'cardadd', params: { id: customer.user_id } }">
|
||||
<button class="btn btn-sm bg-blue-700 text-white">Add CreditCard</button>
|
||||
</router-link>
|
||||
|
||||
<!-- Delivery Status & Driver -->
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||
<div>
|
||||
<label class="label"><span class="label-text font-bold">Delivery Status</span></label>
|
||||
<select v-model="CreateOilOrderForm.basicInfo.delivery_status" class="select select-bordered select-sm w-full">
|
||||
<option v-for="status in deliveryStatus" :key="status.value" :value="status.value">
|
||||
{{ status.text }}
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<label class="label"><span class="label-text font-bold">Assigned Driver</span></label>
|
||||
<select v-model="CreateOilOrderForm.basicInfo.driver_employee_id" class="select select-bordered select-sm w-full">
|
||||
<option disabled :value="0">Select a driver</option>
|
||||
<option v-for="driver in truckDriversList" :key="driver.id" :value="driver.id">
|
||||
{{ driver.employee_first_name }} {{ driver.employee_last_name }}
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="flex-1 mb-4">
|
||||
<label class="block text-white text-sm font-bold mb-2">Delivery Status</label>
|
||||
<select class="select select-bordered select-sm w-full max-w-xs" aria-label="Default select example"
|
||||
id="delivery_status" v-model="CreateOilOrderForm.basicInfo.delivery_status">
|
||||
<option class="text-white" v-for="(delivery, index) in deliveryStatus" :key="index"
|
||||
:value="delivery['value']">
|
||||
{{ delivery['text'] }}
|
||||
</option>
|
||||
</select>
|
||||
<span v-if="v$.CreateOilOrderForm.basicInfo.delivery_status.$error" class="text-red-600 text-center">
|
||||
{{ v$.CreateCustomerForm.basicInfo.delivery_status.$errors[0].$message }}
|
||||
</span>
|
||||
<!-- Dispatcher Notes -->
|
||||
<div>
|
||||
<label class="label"><span class="label-text font-bold">Dispatcher Notes</span></label>
|
||||
<textarea v-model="CreateOilOrderForm.basicInfo.dispatcher_notes_taken" rows="3" class="textarea textarea-bordered w-full"></textarea>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="mb-4">
|
||||
<label class="block text-white text-sm font-bold mb-2">Delivery Created </label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.created_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" />
|
||||
|
||||
</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="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">Emergency</label>
|
||||
<input v-model="CreateOilOrderForm.basicInfo.emergency" class="checkbox checkbox-xs" id="emergency"
|
||||
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="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="flex-1 mb-4">
|
||||
<label class="block text-white text-sm font-bold mb-2">Select a Promo</label>
|
||||
<select class="select select-bordered select-sm w-full max-w-xs" aria-label="Default select example"
|
||||
id="promos" v-model="CreateOilOrderForm.basicInfo.promo_id">
|
||||
<option class="text-white" v-for="(promo, index) in promos" :key="index" :value="promo['id']">
|
||||
{{ promo['name_of_promotion'] }} {{ promo['money_off_delivery'] }}
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="mb-4">
|
||||
<label class="block text-white text-sm font-bold mb-2">Dispatcher Note on Ticket</label>
|
||||
<textarea v-model="CreateOilOrderForm.basicInfo.dispatcher_notes_taken" rows="4"
|
||||
class="textarea block p-2.5 w-full input-bordered " id="description" type="text" placeholder="Notes on ticket" />
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 md:col-span-12 flex mt-5 mb-5">
|
||||
<button class="btn btn-accent btn-sm">
|
||||
Save Changes
|
||||
</button>
|
||||
<!-- Submit Button -->
|
||||
<div class="pt-2">
|
||||
<button type="submit" class="btn btn-primary btn-sm">Save Changes</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<Footer />
|
||||
</template>
|
||||
|
||||
|
||||
<script lang="ts">
|
||||
import { defineComponent } from 'vue'
|
||||
import axios from 'axios'
|
||||
@@ -293,413 +156,176 @@ 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 { minLength, required } from "@vuelidate/validators";
|
||||
import { required, minLength } from "@vuelidate/validators";
|
||||
import { notify } from "@kyvg/vue3-notification";
|
||||
|
||||
// Interfaces to describe the shape of your data
|
||||
interface Customer { account_number: string; id: number; customer_first_name: string; customer_last_name: string; customer_address: string; customer_apt: string; customer_town: string; customer_state: number; customer_zip: string; customer_phone_number: string; }
|
||||
interface DeliveryOrder { id: string; customer_id: number; payment_type: number; payment_card_id: number; gallons_ordered: number; customer_asked_for_fill: boolean | number; delivery_status: number; driver_employee_id: number; promo_id: number; expected_delivery_date: string; when_ordered: string; prime: boolean | number; emergency: boolean | number; same_day: boolean | number; dispatcher_notes: string; }
|
||||
interface UserCard { id: number; type_of_card: string; card_number: string; name_on_card: string; expiration_month: string; expiration_year: string; last_four_digits: string; }
|
||||
|
||||
const STATE_MAP: { [key: number]: string } = { 0: 'Massachusetts', 1: 'Rhode Island', 2: 'New Hampshire', 3: 'Maine', 4: 'Vermont', 5: 'Connecticut', 6: 'New York' };
|
||||
|
||||
export default defineComponent({
|
||||
name: 'deliveryEdit',
|
||||
|
||||
components: {
|
||||
Header,
|
||||
SideBar,
|
||||
Footer,
|
||||
},
|
||||
|
||||
components: { Header, SideBar, Footer },
|
||||
data() {
|
||||
return {
|
||||
v$: useValidate(),
|
||||
user: null,
|
||||
deliveryStatus: [],
|
||||
truckDriversList: [],
|
||||
userCards: [],
|
||||
promos: [],
|
||||
|
||||
userCard: {
|
||||
date_added: '',
|
||||
user_id: '',
|
||||
card_number: '',
|
||||
last_four_digits: '',
|
||||
name_on_card: '',
|
||||
expiration_month: '',
|
||||
expiration_year: '',
|
||||
type_of_card: '',
|
||||
security_number: '',
|
||||
accepted_or_declined: '',
|
||||
main_card: '',
|
||||
},
|
||||
customer: {
|
||||
id: 0,
|
||||
user_id: 0,
|
||||
customer_first_name: '',
|
||||
customer_address: '',
|
||||
customer_last_name: '',
|
||||
customer_town: '',
|
||||
customer_state: 0,
|
||||
customer_zip: '',
|
||||
customer_apt: '',
|
||||
customer_home_type: 0,
|
||||
customer_phone_number: '',
|
||||
},
|
||||
deliveryOrder: {
|
||||
id: '',
|
||||
customer_id: 0,
|
||||
customer_name: '',
|
||||
customer_address: '',
|
||||
customer_town: '',
|
||||
customer_state: 0,
|
||||
customer_zip: '',
|
||||
gallons_ordered: 0,
|
||||
customer_asked_for_fill: 0,
|
||||
gallons_delivered: '',
|
||||
customer_filled: 0,
|
||||
delivery_status: 0,
|
||||
when_ordered: '',
|
||||
when_delivered: '',
|
||||
expected_delivery_date: '',
|
||||
created_delivery_date: '',
|
||||
automatic: 0,
|
||||
oil_id: 0,
|
||||
supplier_price: '',
|
||||
customer_price: '',
|
||||
customer_temperature: '',
|
||||
dispatcher_notes: '',
|
||||
prime: 0,
|
||||
same_day: 0,
|
||||
emergency: 0,
|
||||
payment_type: 0,
|
||||
payment_card_id: 0,
|
||||
|
||||
driver_employee_id: 0,
|
||||
driver_first_name: '',
|
||||
driver_last_name: '',
|
||||
|
||||
promo_id: 0,
|
||||
promo_money_discount: '',
|
||||
|
||||
},
|
||||
deliveryStatus: [] as any[],
|
||||
truckDriversList: [] as any[],
|
||||
userCards: [] as UserCard[],
|
||||
promos: [] as any[],
|
||||
customer: {} as Customer,
|
||||
deliveryOrder: {} as DeliveryOrder,
|
||||
userCard: {} as UserCard,
|
||||
// RESTORED: Add all form fields to the data model
|
||||
CreateOilOrderForm: {
|
||||
basicInfo: {
|
||||
gallons_ordered: '',
|
||||
customer_asked_for_fill: false,
|
||||
expected_delivery_date: '',
|
||||
created_delivery_date: '',
|
||||
dispatcher_notes_taken: '',
|
||||
expected_delivery_date: '',
|
||||
prime: false,
|
||||
same_day: false,
|
||||
emergency: false,
|
||||
delivery_status: '',
|
||||
userCards: [],
|
||||
promos: [],
|
||||
credit_card_id: 0,
|
||||
same_day: false,
|
||||
delivery_status: 0,
|
||||
driver_employee_id: 0,
|
||||
dispatcher_notes_taken: '',
|
||||
promo_id: 0,
|
||||
cash: false,
|
||||
card: false,
|
||||
other: false,
|
||||
check: false,
|
||||
driver_driver: '',
|
||||
payment_type: 0,
|
||||
credit_card_id: 0,
|
||||
},
|
||||
},
|
||||
}
|
||||
},
|
||||
|
||||
validations() {
|
||||
return {
|
||||
CreateOilOrderForm: {
|
||||
basicInfo: {
|
||||
gallons_ordered: { required, minLength: minLength(1) },
|
||||
// RESTORED: Add validation for expected date
|
||||
expected_delivery_date: { required },
|
||||
delivery_status: { required },
|
||||
},
|
||||
},
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getPromos()
|
||||
this.userStatus()
|
||||
this.getDriversList()
|
||||
},
|
||||
watch: {
|
||||
$route() {
|
||||
this.getDeliveryForm(this.$route.params.id);
|
||||
this.getDeliveryOrder(this.$route.params.id);
|
||||
|
||||
computed: {
|
||||
stateName(): string {
|
||||
if (this.customer && this.customer.customer_state !== undefined) {
|
||||
return STATE_MAP[this.customer.customer_state];
|
||||
}
|
||||
return '';
|
||||
},
|
||||
},
|
||||
|
||||
mounted() {
|
||||
this.getDeliveryForm(this.$route.params.id)
|
||||
this.getDeliveryOrder(this.$route.params.id);
|
||||
this.getDeliveryStatusList();
|
||||
this.fetchInitialData();
|
||||
},
|
||||
|
||||
methods: {
|
||||
userStatus() {
|
||||
let path = import.meta.env.VITE_BASE_URL + '/auth/whoami';
|
||||
axios({
|
||||
method: 'get',
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
headers: authHeader(),
|
||||
})
|
||||
.then((response: any) => {
|
||||
if (response.data.ok) {
|
||||
this.user = response.data.user;
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
this.user = null
|
||||
})
|
||||
fetchInitialData() {
|
||||
const deliveryId = this.$route.params.id as string;
|
||||
this.getPromos();
|
||||
this.getDriversList();
|
||||
this.getDeliveryStatusList();
|
||||
this.getDeliveryOrder(deliveryId);
|
||||
},
|
||||
getPromos() {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/promo/all";
|
||||
axios({
|
||||
method: "get",
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
})
|
||||
.then((response: any) => {
|
||||
this.promos = response.data;
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
},
|
||||
getDeliveryOrder(delivery_id: any) {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/delivery/" + delivery_id;
|
||||
axios({
|
||||
method: "get",
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
headers: authHeader(),
|
||||
})
|
||||
.then((response: any) => {
|
||||
if (response.data) {
|
||||
console.log( response.data.delivery.delivery_dispatcher_notes)
|
||||
this.CreateOilOrderForm.basicInfo.gallons_ordered = response.data.delivery.delivery_gallons_ordered;
|
||||
this.CreateOilOrderForm.basicInfo.customer_asked_for_fill = response.data.delivery.delivery_asked_for_fill;
|
||||
this.CreateOilOrderForm.basicInfo.expected_delivery_date = response.data.delivery.delivery_expected_delivery_date;
|
||||
this.CreateOilOrderForm.basicInfo.created_delivery_date = response.data.delivery.when_ordered;
|
||||
this.CreateOilOrderForm.basicInfo.dispatcher_notes_taken = response.data.delivery.dispatcher_notes_taken;
|
||||
this.CreateOilOrderForm.basicInfo.prime = response.data.delivery.delivery_prime;
|
||||
this.CreateOilOrderForm.basicInfo.emergency = response.data.delivery.delivery_emergency;
|
||||
this.CreateOilOrderForm.basicInfo.same_day = response.data.delivery.delivery_same_day;
|
||||
this.CreateOilOrderForm.basicInfo.delivery_status = response.data.delivery.delivery_status;
|
||||
|
||||
this.CreateOilOrderForm.basicInfo.driver_driver = response.data.delivery.driver_employee_id;
|
||||
if (response.data.delivery.delivery_asked_for_fill == 1) {
|
||||
this.CreateOilOrderForm.basicInfo.customer_asked_for_fill = true
|
||||
}
|
||||
if (response.data.delivery.payment_type == 1) {
|
||||
this.CreateOilOrderForm.basicInfo.userCards = response.data.delivery.payment_card_id;
|
||||
}
|
||||
if (response.data.delivery.delivery_prime == 1) {
|
||||
this.CreateOilOrderForm.basicInfo.prime = true
|
||||
}
|
||||
if (response.data.delivery.delivery_same_day == 1) {
|
||||
this.CreateOilOrderForm.basicInfo.same_day = true
|
||||
}
|
||||
if (response.data.delivery.delivery_emergency == 1) {
|
||||
this.CreateOilOrderForm.basicInfo.emergency = true
|
||||
}
|
||||
if (response.data.delivery.payment_type == 0) {
|
||||
this.CreateOilOrderForm.basicInfo.card = false
|
||||
this.CreateOilOrderForm.basicInfo.cash = true
|
||||
this.CreateOilOrderForm.basicInfo.check = false
|
||||
}
|
||||
if (response.data.delivery.payment_type == 1) {
|
||||
this.CreateOilOrderForm.basicInfo.card = true
|
||||
this.CreateOilOrderForm.basicInfo.cash = false
|
||||
this.CreateOilOrderForm.basicInfo.check = false
|
||||
}
|
||||
if (response.data.delivery.payment_type == 2) {
|
||||
this.CreateOilOrderForm.basicInfo.card = true
|
||||
this.CreateOilOrderForm.basicInfo.cash = true
|
||||
this.CreateOilOrderForm.basicInfo.check = false
|
||||
}
|
||||
if (response.data.delivery.payment_type == 3) {
|
||||
this.CreateOilOrderForm.basicInfo.card = false
|
||||
this.CreateOilOrderForm.basicInfo.cash = false
|
||||
this.CreateOilOrderForm.basicInfo.check = true
|
||||
}
|
||||
// Other
|
||||
if (response.data.delivery.payment_type == 4) {
|
||||
this.CreateOilOrderForm.basicInfo.card = false
|
||||
this.CreateOilOrderForm.basicInfo.cash = false
|
||||
this.CreateOilOrderForm.basicInfo.check = false
|
||||
this.CreateOilOrderForm.basicInfo.other = true
|
||||
}
|
||||
if (response.data.delivery.promo_id !== 0) {
|
||||
|
||||
this.CreateOilOrderForm.basicInfo.promo_id = response.data.delivery.promo_id;
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
},
|
||||
getDeliveryForm(delivery_id: any) {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/delivery/order/" + delivery_id;
|
||||
axios({
|
||||
method: "get",
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
headers: authHeader(),
|
||||
})
|
||||
getDeliveryOrder(deliveryId: string) {
|
||||
axios.get(`${import.meta.env.VITE_BASE_URL}/delivery/order/${deliveryId}`, { withCredentials: true, headers: authHeader() })
|
||||
.then((response: any) => {
|
||||
if (response.data) {
|
||||
this.deliveryOrder = response.data
|
||||
this.getCustomer(this.deliveryOrder.customer_id)
|
||||
}
|
||||
this.deliveryOrder = response.data;
|
||||
|
||||
// RESTORED: Populate all form fields from the API response
|
||||
this.CreateOilOrderForm.basicInfo = {
|
||||
gallons_ordered: String(response.data.gallons_ordered),
|
||||
customer_asked_for_fill: !!response.data.customer_asked_for_fill,
|
||||
created_delivery_date: response.data.when_ordered,
|
||||
expected_delivery_date: response.data.expected_delivery_date,
|
||||
prime: !!response.data.prime,
|
||||
emergency: !!response.data.emergency,
|
||||
same_day: !!response.data.same_day,
|
||||
delivery_status: response.data.delivery_status,
|
||||
driver_employee_id: response.data.driver_employee_id || 0,
|
||||
dispatcher_notes_taken: response.data.dispatcher_notes,
|
||||
promo_id: response.data.promo_id || 0,
|
||||
payment_type: response.data.payment_type,
|
||||
credit_card_id: response.data.payment_card_id || 0,
|
||||
};
|
||||
|
||||
this.getCustomer(response.data.customer_id);
|
||||
})
|
||||
.catch((error: any) => console.error("Error fetching delivery order:", error));
|
||||
},
|
||||
getCustomer(user_id: any) {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/customer/" + user_id;
|
||||
axios({
|
||||
method: "get",
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
})
|
||||
|
||||
getCustomer(customerId: number) {
|
||||
axios.get(`${import.meta.env.VITE_BASE_URL}/customer/${customerId}`, { withCredentials: true })
|
||||
.then((response: any) => {
|
||||
this.customer = response.data;
|
||||
this.getPaymentCards(this.deliveryOrder.customer_id);
|
||||
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)
|
||||
this.getPaymentCards(customerId);
|
||||
if (this.deliveryOrder.payment_type === 1 && this.deliveryOrder.payment_card_id) {
|
||||
this.getPaymentCard(this.deliveryOrder.payment_card_id);
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
notify({
|
||||
title: "Error",
|
||||
text: "Could not find customer",
|
||||
type: "error",
|
||||
});
|
||||
});
|
||||
.catch((error: any) => console.error("Error fetching customer:", error));
|
||||
},
|
||||
getPaymentCard(card_id: any) {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/payment/card/" + card_id;
|
||||
axios({
|
||||
method: "get",
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
})
|
||||
.then((response: any) => {
|
||||
this.userCard = response.data;
|
||||
this.CreateOilOrderForm.basicInfo.userCards = response.data.id
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
|
||||
getPaymentCards(customerId: number) {
|
||||
axios.get(`${import.meta.env.VITE_BASE_URL}/payment/cards/${customerId}`, { withCredentials: true })
|
||||
.then((response: any) => { this.userCards = response.data; })
|
||||
.catch((error: any) => console.error("Error fetching payment cards:", error));
|
||||
},
|
||||
getPaymentCards(user_id: any) {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/payment/cards/" + user_id;
|
||||
axios({
|
||||
method: "get",
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
})
|
||||
.then((response: any) => {
|
||||
this.userCards = response.data;
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
|
||||
getPaymentCard(cardId: number) {
|
||||
axios.get(`${import.meta.env.VITE_BASE_URL}/payment/card/${cardId}`, { withCredentials: true })
|
||||
.then((response: any) => { this.userCard = response.data; })
|
||||
.catch((error: any) => console.error("Error fetching specific payment card:", error));
|
||||
},
|
||||
updatestatus() {
|
||||
let path = import.meta.env.VITE_BASE_URL + '/delivery/updatestatus';
|
||||
axios({
|
||||
method: 'get',
|
||||
url: path,
|
||||
headers: authHeader(),
|
||||
}).then((response: any) => {
|
||||
if (response.data.update)
|
||||
console.log("ok")
|
||||
})
|
||||
|
||||
getPromos() {
|
||||
axios.get(`${import.meta.env.VITE_BASE_URL}/promo/all`, { withCredentials: true })
|
||||
.then((response: any) => { this.promos = response.data; });
|
||||
},
|
||||
getDriversList() {
|
||||
axios.get(`${import.meta.env.VITE_BASE_URL}/employee/drivers`, { headers: authHeader(), withCredentials: true })
|
||||
.then((response: any) => { this.truckDriversList = response.data; });
|
||||
},
|
||||
getDeliveryStatusList() {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/query/deliverystatus";
|
||||
axios({
|
||||
method: "get",
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
})
|
||||
.then((response: any) => {
|
||||
this.deliveryStatus = response.data;
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
},
|
||||
|
||||
getDriversList() {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/employee/drivers";
|
||||
axios({
|
||||
method: "get",
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
headers: authHeader(),
|
||||
})
|
||||
.then((response: any) => {
|
||||
this.truckDriversList = response.data;
|
||||
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
},
|
||||
|
||||
editOilOrder(payload: {
|
||||
gallons_ordered: string;
|
||||
customer_asked_for_fill: boolean;
|
||||
prime: boolean;
|
||||
same_day: boolean;
|
||||
emergency: boolean;
|
||||
delivery_status: string;
|
||||
expected_delivery_date: string;
|
||||
created_delivery_date: string;
|
||||
dispatcher_notes_taken: string;
|
||||
cash: boolean;
|
||||
credit: boolean;
|
||||
check: boolean;
|
||||
credit_card_id: any;
|
||||
promo_id: any;
|
||||
driver_employee_id: string,
|
||||
}) {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/delivery/edit/" + this.deliveryOrder.id;
|
||||
axios({
|
||||
method: "post",
|
||||
url: path,
|
||||
data: payload,
|
||||
withCredentials: true,
|
||||
headers: authHeader(),
|
||||
})
|
||||
.then((response: any) => {
|
||||
if (response.data.ok === true) {
|
||||
this.updatestatus()
|
||||
this.$router.push({ name: "deliveryOrder", params: { id: this.deliveryOrder.id } });
|
||||
}
|
||||
if (response.data.error) {
|
||||
this.$router.push("/");
|
||||
}
|
||||
})
|
||||
axios.get(`${import.meta.env.VITE_BASE_URL}/query/deliverystatus`, { withCredentials: true })
|
||||
.then((response: any) => { this.deliveryStatus = response.data; });
|
||||
},
|
||||
|
||||
onSubmit() {
|
||||
let payload = {
|
||||
gallons_ordered: this.CreateOilOrderForm.basicInfo.gallons_ordered,
|
||||
customer_asked_for_fill: this.CreateOilOrderForm.basicInfo.customer_asked_for_fill,
|
||||
expected_delivery_date: this.CreateOilOrderForm.basicInfo.expected_delivery_date,
|
||||
created_delivery_date: this.CreateOilOrderForm.basicInfo.created_delivery_date,
|
||||
dispatcher_notes_taken: this.CreateOilOrderForm.basicInfo.dispatcher_notes_taken,
|
||||
prime: this.CreateOilOrderForm.basicInfo.prime,
|
||||
emergency: this.CreateOilOrderForm.basicInfo.emergency,
|
||||
same_day: this.CreateOilOrderForm.basicInfo.same_day,
|
||||
delivery_status: this.CreateOilOrderForm.basicInfo.delivery_status,
|
||||
driver_employee_id: this.CreateOilOrderForm.basicInfo.driver_driver,
|
||||
cash: this.CreateOilOrderForm.basicInfo.cash,
|
||||
credit: this.CreateOilOrderForm.basicInfo.card,
|
||||
check: this.CreateOilOrderForm.basicInfo.check,
|
||||
promo_id: this.CreateOilOrderForm.basicInfo.promo_id,
|
||||
credit_card_id: this.CreateOilOrderForm.basicInfo.userCards,
|
||||
};
|
||||
|
||||
this.editOilOrder(payload);
|
||||
this.v$.$validate();
|
||||
if (this.v$.$error) {
|
||||
notify({ type: 'error', title: 'Validation Error', text: 'Please check the form fields.' });
|
||||
return;
|
||||
}
|
||||
|
||||
},
|
||||
const formInfo = this.CreateOilOrderForm.basicInfo;
|
||||
// The payload now automatically includes all the restored fields
|
||||
const payload = {
|
||||
...formInfo,
|
||||
cash: formInfo.payment_type === 0,
|
||||
credit: formInfo.payment_type === 1,
|
||||
check: formInfo.payment_type === 3,
|
||||
other: formInfo.payment_type === 4,
|
||||
credit_card_id: formInfo.payment_type === 1 ? formInfo.credit_card_id : null,
|
||||
};
|
||||
|
||||
axios.post(`${import.meta.env.VITE_BASE_URL}/delivery/edit/${this.deliveryOrder.id}`, payload, { withCredentials: true, headers: authHeader() })
|
||||
.then(() => {
|
||||
notify({ type: 'success', title: 'Success!', text: 'Delivery updated.' });
|
||||
this.$router.push({ name: 'deliveryOrder', params: { id: this.deliveryOrder.id } });
|
||||
})
|
||||
.catch((error: any) => {
|
||||
console.error("Error submitting form:", error);
|
||||
notify({ type: 'error', title: 'Update Failed', text: 'Could not save changes.' });
|
||||
});
|
||||
},
|
||||
},
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped></style>
|
||||
</script>
|
||||
Reference in New Issue
Block a user