Updated looks

.env

@@ -1,3 +1,6 @@
 VITE_BASE_URL="http://localhost:4056"
 VITE_PAY_URL="http://localhost:4052"
-VITE_AUTO_URL="http://localhost:4053"
+VITE_AUTO_URL="http://localhost:8002"
+VITE_MONEY_URL="http://localhost:8001"
+VITE_PRINT_URL="http://localhost:8000"
+VITE_COMPANY_ID = 1

.gitignore

@@ -22,3 +22,5 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+.env
+.gitignore

package.json

@@ -14,12 +14,18 @@
     "@vuelidate/validators": "^2.0.4",
     "@vueuse/core": "^10.7.0",
     "axios": "^1.6.2",
+    "html2canvas": "^1.4.1",
+    "html2canvas-pro": "^1.4.3",
+    "html2pdf.js": "^0.10.1",
+    "jspdf": "^2.5.1",
+    "jspdf-html2canvas": "^1.5.2",
     "moment": "^2.30.1",
     "pinia": "^2.1.7",
     "v-pagination-3": "^0.1.7",
     "vue": "^3.3.11",
     "vue-debounce": "^5.0.0",
     "vue-router": "^4.2.5",
+    "vue3-html2pdf": "^1.1.2",
     "vuelidate": "^0.7.7"
   },
   "devDependencies": {
@@ -27,6 +33,7 @@
     "autoprefixer": "^10.4.16",
     "daisyui": "^4.4.19",
     "postcss": "^8.4.32",
+    "sass": "^1.72.0",
     "tailwindcss": "^3.3.6",
     "typescript": "^5.2.2",
     "vite": "^5.0.8",

src/layouts/headers/headerauth.vue

@@ -1,23 +1,23 @@
 <template>
 
-  <div class="navbar bg-primary">
+  <div class="navbar bg-primary border-b border-bottom-500 border-gray-500">
     <div class="basis-1/4 md:basis-1/4">
       <router-link :to="{ name: 'home' }">
-        Auburn Oil
+      <div class="text-3xl"> {{ company.company_name }}</div> 
       </router-link>
     </div>
     <div class="basis-1/4 md:basis-1/2 justify-center text-center">
-      <input type="text" placeholder="Search " class="input input-bordered w-24 md:w-auto grow" v-model="searchTerm"/>
+      <input type="text" placeholder="Search " class="input input-bordered w-24 md:w-auto grow" v-model="searchTerm" />
     </div>
 
     <div class="basis-1/2 md:basis-1/4 justify-end gap-5">
       <router-link :to="{ name: 'customerCreate' }">
-        <button class="btn btn-accent">Create Customer</button>
+        <button class="btn btn-accent btn-sm">Create Customer</button>
       </router-link>
 
       <div v-if="employee.id">
         <router-link :to="{ name: 'employeeProfile', params: { id: employee.id } }">
-          <button class="btn btn-accent">{{ user.user_name }}</button>
+          <div class="">{{ user.user_name }}</div>
         </router-link>
       </div>
     </div>
@@ -26,15 +26,15 @@
   </div>
   <div class="grid grid-cols-12 ">
     <div class="grow col-start-4 col-span-6 ">
-      <SearchResults v-if="customers.length" :customers="customers"/>
+      <SearchResults v-if="customers.length" :customers="customers" />
     </div>
   </div>
 </template>
 
 
 <script lang="ts">
-import {debounce} from "vue-debounce";
+import { debounce } from "vue-debounce";
-import {defineComponent} from "vue";
+import { defineComponent } from "vue";
 import axios from "axios";
 import authHeader from "../../services/auth.header";
 import SearchResults from "./SearchResults.vue";
@@ -56,12 +56,14 @@ export default defineComponent({
         user_name: '',
       },
       company: {
-        company_dba_name: '',
+        creation_date: "",
-        company_llc_name: '',
+        account_prefix: "",
-        company_town: '',
+        company_name: "",
-        company_stat: 0,
+        company_address: "",
-        company_zip: '0',
+        company_town: "",
-
+        company_zip: "",
+        company_state: "",
+        company_phone_number: "",
       },
       employee: {
         id: '',
@@ -86,12 +88,16 @@ export default defineComponent({
     };
   },
   watch: {
-    searchTerm(this:any) {
+    searchTerm(this: any) {
       this.performSearch();
     },
   },
+  mounted() {
+    this.getCompany();
+
+  },
   methods: {
-    performSearch: debounce(async function (this:any) {
+    performSearch: debounce(async function (this: any) {
       if (this.searchTerm === "") {
         this.customers = [];
         return;
@@ -158,20 +164,20 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data.ok) {
+          if (response.data.ok) {
-              this.user = response.data.user;
+            this.user = response.data.user;
-              this.employeeStatus()
+            this.employeeStatus()
-              this.loaded = true;
-            } else {
-              localStorage.removeItem('user');
-              this.$router.push('/login');
-            }
-          })
-          .catch(() => {
             this.loaded = true;
+          } else {
+            localStorage.removeItem('user');
             this.$router.push('/login');
-          });
+          }
+        })
+        .catch(() => {
+          this.loaded = true;
+          this.$router.push('/login');
+        });
     },
     employeeStatus() {
       let path = import.meta.env.VITE_BASE_URL + '/employee/userid/' + this.user.user_id;
@@ -182,14 +188,16 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            this.employee = response.data;
+          this.employee = response.data;
-            this.loaded = true;
+          this.loaded = true;
 
-          })
+        })
     },
     getCompany() {
-      let path = import.meta.env.VITE_BASE_URL + '/admin/company/' + import.meta.env.COMPANY_ID;
+
+      let path = import.meta.env.VITE_BASE_URL + '/admin/company/' + import.meta.env.VITE_COMPANY_ID;
+
 
       axios({
         method: "get",
@@ -197,16 +205,14 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            this.company = response.data;
+          this.company = response.data;
-          
+   
 
-          })
+        })
     },
   },
 });
 </script>
 
-<style scoped>
+<style scoped></style>
-
-</style>

src/layouts/headers/headernoauth.vue

@@ -1,6 +1,6 @@
 <template>
 
-  <div class="navbar bg-base-100">
+  <div class="navbar bg-primary border-b border-bottom-500 border-gray-500">
     <div class="basis-1/4 md:basis-1/4">
       <router-link :to="{ name: 'home' }">
         Auburn Oil

src/layouts/sidebar/sidebar.vue

@@ -1,25 +1,25 @@
 <template>
 
-  <div class="drawer sm:drawer-open">
+  <div class="drawer sm:drawer-open bg-primary">
-    <input id="my-drawer-2" type="checkbox" class="drawer-toggle"/>
+    <input id="my-drawer-2" type="checkbox" class="drawer-toggle" />
     <div class="drawer-content flex flex-col items-center justify-center ">
     </div>
 
     <div class="drawer-side">
       <label for="my-drawer-2" aria-label="close sidebar" class="drawer-overlay"></label>
 
-      <ul class="menu p-4 w-80 min-h-full bg-base-100 text-base-content">
+      <ul class="menu p-4 w-80 min-h-full  text-base-content  bg-base-100  ">
 
         <!-- Sidebar content here -->
         <li>
-        <router-link :to="{ name: 'home' }">
+          <router-link :to="{ name: 'home' }">
-          <div class=" hover:underline py-1 px-5 font-bold">Home</div>
+            <div class=" hover:underline py-1 px-5 font-bold">Home</div>
-        </router-link>
+          </router-link>
-         </li>
+        </li>
 
-        <div class="font-bold text-lg text-gray-500 pt-5">Customer</div>
+        <div class="font-bold text-lg text-gray-500 pt-5 ">Customer</div>
-        
+
-        <li>
+        <li class="text-white">
           <router-link :to="{ name: 'customer' }">
             <div class=" hover:underline py-1">All Customers</div>
           </router-link>
@@ -28,7 +28,7 @@
           </router-link>
         </li>
         <div class="font-bold text-lg text-gray-500 pt-5">Delivery</div>
-        <li>
+        <li class="text-white">
           <router-link :to="{ name: 'delivery' }">
             <div class=" hover:underline py-1">Home</div>
           </router-link>
@@ -41,7 +41,7 @@
           <router-link :to="{ name: 'deliveryWaiting' }">
             <div class=" hover:underline py-1">Waiting Deliverys</div>
           </router-link>
-          <router-link :to="{ name: 'deliveryDelivered'}">
+          <router-link :to="{ name: 'deliveryDelivered' }">
             <div class=" hover:underline py-1">Delivered Payment </div>
           </router-link>
           <router-link :to="{ name: 'deliveryIssue' }">
@@ -52,37 +52,32 @@
           </router-link>
         </li>
         <div class="font-bold text-lg text-gray-500 pt-5">Automatics</div>
-        <li>
+        <li class="text-white">
           <router-link :to="{ name: 'auto' }">
             <div class=" hover:underline py-1">Automatics</div>
           </router-link>
         </li>
         <div class="font-bold text-lg text-gray-500 pt-5">Employees</div>
-        <li>
+        <li class="text-white">
           <router-link :to="{ name: 'employee' }">
             <div class=" hover:underline py-1">Employees</div>
           </router-link>
         </li>
-
         <div class="font-bold text-lg text-gray-500 pt-5">Admin</div>
-        <li>
+        <li class="text-white">
           <router-link :to="{ name: 'oilprice' }">
             <div class=" hover:underline py-1">Oil Pricing</div>
           </router-link>
         </li>
-      
       </ul>
-
-
     </div>
   </div>
-
 </template>
 
 
 <script lang="ts">
 
-import {defineComponent} from "vue";
+import { defineComponent } from "vue";
 
 export default defineComponent({
   name: "SideBar",
@@ -96,6 +91,4 @@ export default defineComponent({
 });
 </script>
 
-<style scoped>
+<style scoped></style>
-
-</style>

src/pages/Index.vue

@@ -20,15 +20,15 @@
 
       <div class="grid grid-cols-12 gap-5 ">
         <div class="col-span-12 bg-secondary  ">
-          <div class="grid grid-cols-12 p-5">
+          <div class="grid grid-cols-12 p-5 bg-neutral m-5">
             <div class="col-span-12 font-bold text-xl">Todays stats</div>
             <div class="col-span-6 py-2"> Total Deliveries: {{ delivery_count }}</div>
             <div class="col-span-6 py-2"> Completed: {{ delivery_count_delivered }} / {{ delivery_count }}</div>
           </div>
         </div>
 
-        <div class="col-span-6 bg-neutral">
+        <div class="col-span-6 bg-secondary">
-          <div class="grid grid-cols-12 p-5 bg-secondary">
+          <div class="grid grid-cols-12 p-5 bg-neutral m-5">
             <div class="col-span-12 font-bold text-xl">Todays Oil Price</div>
             <div class="col-span-12 py-2"> Price / Gallon: {{ today_oil_price }}</div>
             <div class="col-span-12 py-2"> Same Day: ${{ price_same_day }}</div>
@@ -36,8 +36,8 @@
             <div class="col-span-12 py-2"> Price / Employee: ${{ price_for_employee }}</div>
           </div>
         </div>
-        <div class="col-span-6 bg-neutral">
+        <div class="col-span-6 bg-secondary">
-          <div class="grid grid-cols-12 p-5 bg-secondary">
+          <div class="grid grid-cols-12 p-5 bg-neutral m-5">
             <div class="col-span-12 font-bold text-xl">Quick Tips</div>
             <div class="col-span-12 py-2"> search: @ = last name search</div>
             <div class="col-span-12 py-2"> search: ! = address</div>

src/pages/automatic/home.vue

@@ -5,7 +5,7 @@
         <SideBar/>
       </div>
       <div class=" w-full px-10 ">
-        <div class="text-sm breadcrumbs">
+        <div class="text-sm breadcrumbs mb-10">
           <ul>
             <li>
               <router-link :to="{ name: 'home' }">
@@ -19,12 +19,10 @@
             </li>
           </ul>
         </div>
-        <div class="flex justify-end">
+        <div class="flex start text-2xl">Automatics </div>
 
-        </div>
+        <div class="overflow-x-auto bg-neutral">
-
+        
-        <div class="overflow-x-auto">
-          <div class="flex start">Automatics </div>
           <table class="table">
             <!-- head -->
             <thead>
@@ -69,7 +67,7 @@
               </td>
               <td class="flex gap-5">
                 <router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
-                  <button class="btn btn-accent">Edit</button>
+                  <button class="btn btn-accent btn-sm">Edit</button>
                 </router-link>
               </td>
             </tr>

src/pages/card/addcard.vue

@@ -1,49 +1,47 @@
 <template>
-    <Header/>
+  <Header />
-      <div class="flex">
+  <div class="flex">
-        <div class="">
+    <div class="">
-          <SideBar/>
+      <SideBar />
-        </div>
+    </div>
-        <div class=" w-full px-10">
+    <div class=" w-full px-10">
-          <div class="text-sm breadcrumbs">
+      <div class="text-sm breadcrumbs">
-            <ul>
+        <ul>
-                <li>
+          <li>
-                  <router-link :to="{ name: 'home' }">
+            <router-link :to="{ name: 'home' }">
-                    Home
+              Home
-                  </router-link>
+            </router-link>
-                </li>
+          </li>
-                <li>
+          <li>
-                  <router-link :to="{ name: 'customer' }">
+            <router-link :to="{ name: 'customer' }">
-                    Customers
+              Customers
-                  </router-link>
+            </router-link>
-                </li>
+          </li>
-            </ul>
+        </ul>
-          </div>
+      </div>
-  
+
-  
+
-          <div class="grid grid-cols-1 rounded-md p-6 ">
+      <div class="grid grid-cols-1 rounded-md p-6 ">
-            <div class="text-[24px]">
+
-              Add Credit Card for {{ customer.customer_last_name }}
+
-            </div>
+        <div class="grid grid-cols-12">
-            <form class="rounded-md px-8 pt-6 pb-8 mb-4 w-full" 
+          <div class="col-span-12 text-center mb-10 text-2xl">Add a Credit Card</div>
-                  enctype="multipart/form-data"
+
-                  @submit.prevent="onSubmit">
+          <div class="col-span-6">
-  
+            <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">Main Card</label>
-                <input v-model="CreateCardForm.basicInfo.main_card"
+                <input v-model="CreateCardForm.basicInfo.main_card" class="checkbox" id="fill" type="checkbox" />
-                       class="checkbox"
-                       id="fill"
-                       type="checkbox"/>
               </div>
-  
+
               <div class="mb-4">
                 <label class="block text-white text-sm font-bold mb-2">Name on Card</label>
                 <input v-model="CreateCardForm.basicInfo.card_name"
-                       class="input input-bordered w-full max-w-xs"
+                  class="input input-bordered input-sm w-full max-w-xs" id="title" type="text"
-                       id="title" type="text" placeholder="Name on Card"/>
+                  placeholder="Name on Card" />
-                <span v-if="v$.CreateCardForm.basicInfo.card_name.$error"
+                <span v-if="v$.CreateCardForm.basicInfo.card_name.$error" class="text-red-600 text-center">
-                       class="text-red-600 text-center">
                   {{ v$.CreateCardForm.basicInfo.card_name.$errors[0].$message }}
                 </span>
               </div>
@@ -51,259 +49,307 @@
               <div class="mb-4">
                 <label class="block text-white text-sm font-bold mb-2">Card Number</label>
                 <input v-model="CreateCardForm.basicInfo.card_number"
-                       class="input input-bordered w-full max-w-xs"
+                  class="input input-bordered input-sm w-full max-w-xs" id="title" type="text"
-                       id="title" type="text" placeholder="Card Number"/>
+                  placeholder="Card Number" />
-                <span v-if="v$.CreateCardForm.basicInfo.card_number.$error"
+                <span v-if="v$.CreateCardForm.basicInfo.card_number.$error" class="text-red-600 text-center">
-                       class="text-red-600 text-center">
                   {{ v$.CreateCardForm.basicInfo.card_number.$errors[0].$message }}
                 </span>
               </div>
 
               <div class="mb-4">
                 <label class="block text-white text-sm font-bold mb-2">Expiration Month</label>
-                <select 
+                <select v-model="CreateCardForm.basicInfo.expiration_month"
-                      v-model="CreateCardForm.basicInfo.expiration_month"
+                  class="input input-bordered input-sm w-full max-w-xs" id="Month">
-                      class="input input-bordered w-full max-w-xs"
+                  <option>01</option>
-                      id="Month" 
+                  <option>02</option>
-                       >
+                  <option>03</option>
-                      <option>01</option>
+                  <option>04</option>
-                      <option>02</option>
+                  <option>05</option>
-                      <option>03</option>
+                  <option>06</option>
-                      <option>04</option>
+                  <option>07</option>
-                      <option>05</option>
+                  <option>08</option>
-                      <option>06</option>
+                  <option>09</option>
-                      <option>07</option>
+                  <option>10</option>
-                      <option>08</option>
+                  <option>11</option>
-                      <option>09</option>
+                  <option>12</option>
-                      <option>10</option>
+                </select>
-                      <option>11</option>
-                      <option>12</option>
-                  </select>
               </div>
 
               <div class="mb-4">
                 <label class="block text-white text-sm font-bold mb-2">Expiration Year</label>
-                <select 
+                <select v-model="CreateCardForm.basicInfo.expiration_year"
-                      v-model="CreateCardForm.basicInfo.expiration_year"
+                  class="input input-bordered input-sm w-full max-w-xs" id="Month">
-                      class="input input-bordered w-full max-w-xs"
+                  <option>2024</option>
-                      id="Month" 
+                  <option>2025</option>
-                       >
+                  <option>2026</option>
-                      <option>2024</option>
+                  <option>2027</option>
-                      <option>2025</option>
+                  <option>2028</option>
-                      <option>2026</option>
+                  <option>2029</option>
-                      <option>2027</option>
+                  <option>2030</option>
-                      <option>2028</option>
-                      <option>2029</option>
-                      <option>2030</option>
                 </select>
 
-                <span v-if="v$.CreateCardForm.basicInfo.expiration_year.$error"
+                <span v-if="v$.CreateCardForm.basicInfo.expiration_year.$error" class="text-red-600 text-center">
-                      class="text-red-600 text-center">
                   {{ v$.CreateCardForm.basicInfo.expiration_year.$errors[0].$message }}
                 </span>
               </div>
 
               <div class="mb-4">
                 <label class="block text-white text-sm font-bold mb-2">Type of Card</label>
-                <select 
+                <select v-model="CreateCardForm.basicInfo.type_of_card"
-                      v-model="CreateCardForm.basicInfo.type_of_card"
+                  class="input input-bordered input-sm w-full max-w-xs" id="Month">
-                      class="input input-bordered w-full max-w-xs"
+                  <option>Visa</option>
-                      id="Month" 
+                  <option>MasterCard</option>
-                       >
+                  <option>Discover</option>
-                      <option>Visa</option>
+                  <option>American Express</option>
-                      <option>MasterCard</option>
+                </select>
-                      <option>Discover</option>
-                      <option>American Express</option>
-                  </select>
 
-                <span v-if="v$.CreateCardForm.basicInfo.type_of_card.$error"
+                <span v-if="v$.CreateCardForm.basicInfo.type_of_card.$error" class="text-red-600 text-center">
-                      class="text-red-600 text-center">
                   {{ v$.CreateCardForm.basicInfo.type_of_card.$errors[0].$message }}
                 </span>
               </div>
-  
+
               <div class="mb-4">
                 <label class="block text-white text-sm font-bold mb-2">Security Number</label>
                 <input v-model="CreateCardForm.basicInfo.security_number"
-                       class="input input-bordered w-full max-w-xs"
+                  class="input input-bordered input-sm w-full max-w-xs" id="title" type="text"
-                       id="title" type="text" placeholder="Back of card"/>
+                  placeholder="Back of card" />
-                <span v-if="v$.CreateCardForm.basicInfo.security_number.$error"
+                <span v-if="v$.CreateCardForm.basicInfo.security_number.$error" class="text-red-600 text-center">
-                       class="text-red-600 text-center">
                   {{ v$.CreateCardForm.basicInfo.security_number.$errors[0].$message }}
                 </span>
               </div>
 
-  
               <div class="col-span-12 md:col-span-12 flex mt-5 mb-5">
-                <button
+                <button class="btn btn-sm btn-accent">
-                    class="btn">
                   Save Credit Card
                 </button>
               </div>
             </form>
           </div>
+
+
+          <div class="col-span-6">
+            <div class="col-span-12 font-bold flex pb-5 ">{{ customer.account_number }}</div>
+            <div class="col-span-12 font-bold flex">
+              {{ customer.customer_first_name }}
+              {{ customer.customer_last_name }}
+            </div>
+            <div class="col-span-12 font-bold flex">
+
+              {{ customer.customer_address }}
+              <div v-if="customer.customer_apt != 'None'">
+                {{ customer.customer_apt }}
+              </div>
+
+            </div>
+            <div class="col-span-12 font-bold 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 font-bold flex" v-if="customer.customer_apt !== 'None'">
+              {{ customer.customer_apt }}
+            </div>
+            <div class="col-span-12 font-bold 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 font-bold flex">
+              {{ customer.customer_phone_number }}
+            </div>
+          </div>
+
+
+
+
+
+
+
+
         </div>
       </div>
-  
+    </div>
-    <Footer/>
+  </div>
-  </template>
-  
-  
-  <script lang="ts">
-  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 {minLength, required} from "@vuelidate/validators";
-  
-  export default defineComponent({
-    name: 'AddCardCreate',
-  
-    components: {
-      Header,
-      SideBar,
-      Footer,
-    },
-  
-    data() {
-      return {
-        v$: useValidate(),
-        user: null,
 
-        customer: {
+
+  <Footer />
+</template>
+
+
+<script lang="ts">
+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 { minLength, required } from "@vuelidate/validators";
+
+export default defineComponent({
+  name: 'AddCardCreate',
+
+  components: {
+    Header,
+    SideBar,
+    Footer,
+  },
+
+  data() {
+    return {
+      v$: useValidate(),
+      user: null,
+      customer: {
         id: 0,
+        user_id: 0,
         customer_first_name: '',
         customer_last_name: '',
         customer_town: '',
+        customer_address: '',
         customer_state: 0,
         customer_zip: '',
         customer_apt: '',
         customer_home_type: 0,
         customer_phone_number: '',
+        account_number: '',
       },
-        CreateCardForm: {
+      CreateCardForm: {
-          basicInfo: {
+        basicInfo: {
-            card_name: '',
+          card_name: '',
-            expiration_month: '',
+          expiration_month: '',
-            expiration_year: '',
+          expiration_year: '',
-            type_of_card: '',
+          type_of_card: '',
-            security_number: '',
+          security_number: '',
-            card_number:'',
+          card_number: '',
-            main_card: false,
+          main_card: false,
-          },
         },
-      }
+      },
+    }
+  },
+
+  validations() {
+    return {
+      CreateCardForm: {
+        basicInfo: {
+          card_name: { required, minLength: minLength(1) },
+          expiration_month: { required, minLength: minLength(1) },
+          expiration_year: { required, minLength: minLength(1) },
+          security_number: { required, minLength: minLength(1) },
+          type_of_card: { required, minLength: minLength(1) },
+          card_number: { required, minLength: minLength(1) },
+        },
+      },
+    };
+  },
+  created() {
+    this.userStatus()
+  },
+  watch: {
+    $route() {
+      this.getCustomer(this.$route.params.id);
+    },
+  },
+  mounted() {
+    this.getCustomer(this.$route.params.id)
+  },
+  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
+        })
+    },
+    getCustomer(user_id: any) {
+      let path = import.meta.env.VITE_BASE_URL + "/customer/" + user_id;
+      axios({
+        method: "get",
+        url: path,
+        withCredentials: true,
+      })
+        .then((response: any) => {
+          this.customer = response.data;
+        })
+        .catch(() => {
+          notify({
+            title: "Error",
+            text: "Could not find customer",
+            type: "error",
+          });
+        });
     },
 
-    validations() {
+    CreateCard(payload: {
-      return {
+      card_name: string;
-        CreateCardForm: {
+      expiration_month: string;
-          basicInfo: {
+      expiration_year: string;
-            card_name: {required, minLength: minLength(1)},
+      type_of_card: string;
-            expiration_month: {required, minLength: minLength(1)},
+      security_number: string;
-            expiration_year: {required, minLength: minLength(1)},
+      card_number: string;
-            security_number: {required, minLength: minLength(1)},
+      main_card: boolean;
-            type_of_card: {required, minLength: minLength(1)},
+    }) {
-            card_number: {required, minLength: minLength(1)},
+      let path = import.meta.env.VITE_BASE_URL + "/payment/card/create/" + this.customer.id;
-          },
+      axios({
-        },
+        method: "post",
+        url: path,
+        data: payload,
+        withCredentials: true,
+        headers: authHeader(),
+      })
+        .then((response: any) => {
+          if (response.data.ok) {
+            this.$router.push({ name: "customerProfile", params: { id: this.customer.id } });
+          }
+          if (response.data.error) {
+            this.$router.push("/");
+          }
+        })
+    },
+    onSubmit() {
+      let payload = {
+        card_name: this.CreateCardForm.basicInfo.card_name,
+        card_number: this.CreateCardForm.basicInfo.card_number,
+        expiration_month: this.CreateCardForm.basicInfo.expiration_month,
+        expiration_year: this.CreateCardForm.basicInfo.expiration_year,
+        type_of_card: this.CreateCardForm.basicInfo.type_of_card,
+        security_number: this.CreateCardForm.basicInfo.security_number,
+        main_card: this.CreateCardForm.basicInfo.main_card,
       };
+      this.CreateCard(payload);
     },
-    created() {
+  },
-      this.userStatus()
+})
-    },
+</script>
-    watch: {
-      $route() {
-        this.getCustomer(this.$route.params.id);
-      },
-    },
-    mounted() {
-      this.getCustomer(this.$route.params.id)
-    },
-    methods: {
 
-      userStatus() {
+<style scoped></style>
-        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
-            })
-      },
-      getCustomer(user_id: any) {
-        let path = import.meta.env.VITE_BASE_URL + "/customer/" + user_id;
-        axios({
-          method: "get",
-          url: path,
-          withCredentials: true,
-        })
-            .then((response: any) => {
-              this.customer = response.data;
-            })
-            .catch(() => {
-              notify({
-                title: "Error",
-                text: "Could not find customer",
-                type: "error",
-              });
-            });
-      },
-  
-      CreateCard(payload: {
-        card_name: string;
-        expiration_month: string;
-        expiration_year: string;
-        type_of_card: string;
-        security_number: string;
-        card_number: string;
-        main_card: boolean;
-      }) {
-        let path = import.meta.env.VITE_BASE_URL + "/payment/card/create/" + this.customer.id;
-        axios({
-          method: "post",
-          url: path,
-          data: payload,
-          withCredentials: true,
-          headers: authHeader(),
-        })
-            .then((response: any) => {
-              if (response.data.ok) {
-                this.$router.push({name: "customerProfile", params: { id: this.customer.id }});
-              }
-              if (response.data.error) {
-                this.$router.push("/");
-              }
-            })
-      },
-      onSubmit() {
-        let payload = {
-            card_name: this.CreateCardForm.basicInfo.card_name,
-            card_number: this.CreateCardForm.basicInfo.card_number,
-            expiration_month: this.CreateCardForm.basicInfo.expiration_month,
-            expiration_year: this.CreateCardForm.basicInfo.expiration_year,
-            type_of_card: this.CreateCardForm.basicInfo.type_of_card,
-            security_number: this.CreateCardForm.basicInfo.security_number,
-            main_card: this.CreateCardForm.basicInfo.main_card,
-        };
-        this.CreateCard(payload);
-      },
-    },
-  })
-  </script>
-  
-  <style scoped>
-  
-  </style>

src/pages/card/editcard.vue

@@ -36,7 +36,7 @@
               <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">Main Card</label>
                 <input v-model="CreateCardForm.basicInfo.main_card"
-                       class="checkbox"
+                       class="checkbox checkbox-xs"
                        id="fill"
                        type="checkbox"/>
               </div>

src/pages/customer/create.vue

@@ -1,9 +1,9 @@
 <template>
-  <Header/>
+  <Header />
-  <div  v-if="user">
+  <div v-if="user">
     <div class="flex">
       <div class="">
-        <SideBar/>
+        <SideBar />
       </div>
       <div class="w-full px-10">
         <div class="text-sm breadcrumbs">
@@ -20,126 +20,115 @@
             </li>
           </ul>
         </div>
-        <div class="grid grid-cols-1 rounded-md p-6 ">
+        <div class="grid grid-cols-12 rounded-md p-6 ">
-          <div class="text-[24px]">Create a customer</div>
+          <div class="col-span-12 text-[24px] ">Create a customer</div>
-          <form class="rounded-md px-8 pt-6 pb-8 mb-4 w-full" enctype="multipart/form-data" @submit.prevent="onSubmit">
+          <form class="col-span-12 rounded-md px-8 pt-6 pb-8 mb-4 w-full" enctype="multipart/form-data"
-            <div class="text-[18px] mt-5 mb-5">General Info</div>
+            @submit.prevent="onSubmit">
-                        <div class="mb-4">
+            <div class="grid grid-cols-12">
-              <label class="block text-white text-sm font-bold mb-2"> First Name</label>
+              <div class="col-span-12 text-[18px] mt-5 mb-5">General Info</div>
-              <input v-model="CreateCustomerForm.basicInfo.customer_first_name"
+              <div class="col-span-6 mb-4">
-                     class="input input-bordered w-full max-w-xs"
+                <label class="block text-white text-sm font-bold mb-2"> First Name</label>
-                     id="title" type="text" placeholder="First Name"/>
+                <input v-model="CreateCustomerForm.basicInfo.customer_first_name"
-              <span v-if="v$.CreateCustomerForm.basicInfo.customer_first_name.$error" class="text-red-600 text-center">
+                  class="input input-bordered input-sm w-full max-w-xs" id="title" type="text"
-              {{ v$.CreateCustomerForm.basicInfo.customer_first_name.$errors[0].$message }}
+                  placeholder="First Name" />
-            </span>
+                <span v-if="v$.CreateCustomerForm.basicInfo.customer_first_name.$error"
-            </div>
+                  class="text-red-600 text-center">
-            <div class="mb-4">
+                  {{ v$.CreateCustomerForm.basicInfo.customer_first_name.$errors[0].$message }}
-              <label class="block text-white text-sm font-bold mb-2"> Last Name</label>
+                </span>
-              <input v-model="CreateCustomerForm.basicInfo.customer_last_name"
+              </div>
-                     class="input input-bordered w-full max-w-xs"
+              <div class="col-span-6 mb-4">
-                     id="title" type="text" placeholder="Last Name"/>
+                <label class="block text-white text-sm font-bold mb-2"> Last Name</label>
-              <span v-if="v$.CreateCustomerForm.basicInfo.customer_last_name.$error" class="text-red-600 text-center">
+                <input v-model="CreateCustomerForm.basicInfo.customer_last_name"
-              {{ v$.CreateCustomerForm.basicInfo.customer_last_name.$errors[0].$message }}
+                  class="input input-bordered input-sm w-full max-w-xs" id="title" type="text"
-            </span>
+                  placeholder="Last Name" />
-            </div>
+                <span v-if="v$.CreateCustomerForm.basicInfo.customer_last_name.$error" class="text-red-600 text-center">
-
+                  {{ v$.CreateCustomerForm.basicInfo.customer_last_name.$errors[0].$message }}
-            <div class="flex gap-5">
+                </span>
-              <div class="flex-1 mb-4">
+              </div>
-                <label class="block text-white text-sm font-bold mb-2">Customer Type</label>
+              <div class="col-span-12  gap-5">
-                <select
+                <div class="flex-1 mb-4">
-                    class="select select-bordered w-full max-w-xs"
+                  <label class="block text-white text-sm font-bold mb-2">Customer Type</label>
-                    aria-label="Default select example" id="customer_type"
+                  <select class="select select-bordered select-sm w-full max-w-xs" aria-label="Default select example"
-                    v-model="CreateCustomerForm.basicInfo.customer_home_type">
+                    id="customer_type" v-model="CreateCustomerForm.basicInfo.customer_home_type">
-                  <option class="text-white" v-for="(customer, index) in custList"
+                    <option class="text-white" v-for="(customer, index) in custList" :key="index"
-                          :key="index"
+                      :value="customer['value']">
-                          :value="customer['value']">
+                      {{ customer['text'] }}
-                    {{ customer['text'] }}
+                    </option>
-                  </option>
+                  </select>
-                </select>
+                </div>
               </div>
             </div>
+
+
             <div class="text-[18px] mt-5 mb-5">Customer Address</div>
             <div class="col-span-12 md:col-span-4 mb-5 md:mb-5">
               <label class="block text-white text-sm font-bold mb-2">Phone Number</label>
               <input v-model="CreateCustomerForm.basicInfo.customer_phone_number"
-                     class="input input-bordered w-full max-w-xs"
+                class="input input-bordered input-sm w-full max-w-xs" id="phone number" type="tel"
-                     id="phone number" type="tel" placeholder="Phone Number" @input="acceptNumber()"  />
+                placeholder="Phone Number" @input="acceptNumber()" />
               <span v-if="v$.CreateCustomerForm.basicInfo.customer_phone_number.$error"
-                    class="text-red-600 text-center">
+                class="text-red-600 text-center">
-                    {{ v$.CreateCustomerForm.basicInfo.customer_phone_number.$errors[0].$message }}
+                {{ v$.CreateCustomerForm.basicInfo.customer_phone_number.$errors[0].$message }}
-            </span>
+              </span>
             </div>
             <div class="col-span-12 mb-5 md:mb-5">
               <label class="block text-white text-sm font-bold mb-2">Street Address</label>
               <input v-model="CreateCustomerForm.basicInfo.customer_address"
-                     class="input input-bordered w-full max-w-xs"
+                class="input input-bordered input-sm w-full max-w-xs" id="address" type="text" placeholder="Address" />
-                     id="address" type="text" placeholder="Address"/>
+              <span v-if="v$.CreateCustomerForm.basicInfo.customer_address.$error" class="text-red-600 text-center">
-              <span v-if="v$.CreateCustomerForm.basicInfo.customer_address.$error"
+                {{ v$.CreateCustomerForm.basicInfo.customer_address.$errors[0].$message }}
-                    class="text-red-600 text-center">
+              </span>
-                   {{ v$.CreateCustomerForm.basicInfo.customer_address.$errors[0].$message }}
-            </span>
             </div>
             <div class="col-span-12 mb-5 md:mb-5">
               <input v-model="CreateCustomerForm.basicInfo.customer_apt"
-                     class="input input-bordered w-full max-w-xs"
+                class="input input-bordered input-sm w-full max-w-xs" id="apt" type="text"
-                     id="apt" type="text" placeholder="Apt, suite, unit, building, floor, etc"/>
+                placeholder="Apt, suite, unit, building, floor, etc" />
             </div>
             <div class="col-span-12 md:col-span-4 mb-20 md:mb-5 ">
               <label class="block text-white text-sm font-bold mb-2">Town</label>
               <input v-model="CreateCustomerForm.basicInfo.customer_town"
-                     class="input input-bordered w-full max-w-xs"
+                class="input input-bordered input-sm w-full max-w-xs" id="town" type="text" placeholder="Town" />
-                     id="town" type="text" placeholder="Town"/>
               <span v-if="v$.CreateCustomerForm.basicInfo.customer_town.$error" class="text-red-600 text-center">
-                    {{ v$.CreateCustomerForm.basicInfo.customer_town.$errors[0].$message }}
+                {{ v$.CreateCustomerForm.basicInfo.customer_town.$errors[0].$message }}
-            </span>
+              </span>
             </div>
-
             <div class="flex-1 mb-4">
               <label class="block text-white text-sm font-bold mb-2">State</label>
-              <select
+              <select class="select select-bordered select-sm w-full max-w-xs" aria-label="Default select example"
-                  class="select select-bordered w-full max-w-xs"
+                id="customer_state" v-model="CreateCustomerForm.basicInfo.customer_state">
-                  aria-label="Default select example" id="customer_state"
+                <option class="text-white" v-for="(state, index) in stateList" :key="index" :value="state['value']">
-                  v-model="CreateCustomerForm.basicInfo.customer_state">
-                <option class="text-white" v-for="(state, index) in stateList"
-                        :key="index"
-                        :value="state['value']">
                   {{ state['text'] }}
                 </option>
               </select>
               <span v-if="v$.CreateCustomerForm.basicInfo.customer_state.$error" class="text-red-600 text-center">
-                    {{ v$.CreateCustomerForm.basicInfo.customer_state.$errors[0].$message }}
+                {{ v$.CreateCustomerForm.basicInfo.customer_state.$errors[0].$message }}
-                </span>
+              </span>
             </div>
             <div class="col-span-12 md:col-span-4 mb-5 md:mb-5">
               <label class="block text-white text-sm font-bold mb-2">Zip Code</label>
               <input v-model="CreateCustomerForm.basicInfo.customer_zip"
-                     class="input input-bordered w-full max-w-xs"
+                class="input input-bordered input-sm w-full max-w-xs" id="zip" type="text" placeholder="Zip" />
-                     id="zip" type="text" placeholder="Zip"/>
               <span v-if="v$.CreateCustomerForm.basicInfo.customer_zip.$error" class="text-red-600 text-center">
-                     {{ v$.CreateCustomerForm.basicInfo.customer_zip.$errors[0].$message }}
+                {{ v$.CreateCustomerForm.basicInfo.customer_zip.$errors[0].$message }}
-            </span>
+              </span>
             </div>
 
-                <div class="col-span-12 md:col-span-4 mb-5 md:mb-0">
+            <div class="col-span-12 md:col-span-4 mb-5 md:mb-0">
               <label class="block text-white text-sm font-bold mb-2">Email</label>
               <input v-model="CreateCustomerForm.basicInfo.customer_email"
-                     class="input input-bordered w-full max-w-xs"
+                class="input input-bordered input-sm w-full max-w-xs" id="email" type="text" placeholder="Email" />
-                     id="email" type="text" placeholder="Email"/>
               <span v-if="v$.CreateCustomerForm.basicInfo.customer_email.$error" class="text-red-600 text-center">
-                     {{ v$.CreateCustomerForm.basicInfo.customer_email.$errors[0].$message }}
+                {{ v$.CreateCustomerForm.basicInfo.customer_email.$errors[0].$message }}
-            </span>
+              </span>
             </div>
 
             <div class="col-span-12 md:col-span-4 mb-5 md:mb-0">
               <label class="block text-white text-sm font-bold mb-2">Automatic</label>
-              <input v-model="CreateCustomerForm.basicInfo.customer_automatic"
+              <input v-model="CreateCustomerForm.basicInfo.customer_automatic" class="checkbox checkbox-xs" id="automatic"
-                     class="checkbox"
+                type="checkbox" />
-                     id="automatic"
-                     type="checkbox"/>
             </div>
             <div class="col-span-12 md:col-span-12 flex mt-5 mb-5">
-              <button
+              <button class="btn btn-accent">
-                  class="btn">
                 Create Customer
               </button>
             </div>
@@ -148,18 +137,18 @@
       </div>
     </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 {email, minLength, required} from "@vuelidate/validators";
+import { email, minLength, required } from "@vuelidate/validators";
 
 export default defineComponent({
   name: 'CustomerCreate',
@@ -199,15 +188,15 @@ export default defineComponent({
     return {
       CreateCustomerForm: {
         basicInfo: {
-          customer_last_name: {required, minLength: minLength(1)},
+          customer_last_name: { required, minLength: minLength(1) },
-          customer_first_name: {required, minLength: minLength(1)},
+          customer_first_name: { required, minLength: minLength(1) },
-          customer_town: {required, minLength: minLength(1)},
+          customer_town: { required, minLength: minLength(1) },
-          customer_home_type: {required},
+          customer_home_type: { required },
-          customer_zip: {required, minLength: minLength(5)},
+          customer_zip: { required, minLength: minLength(5) },
-          customer_email: {email, required},
+          customer_email: { email, required },
-          customer_phone_number: {required},
+          customer_phone_number: { required },
-          customer_state: {required},
+          customer_state: { required },
-          customer_address: {required},
+          customer_address: { required },
         },
       },
     };
@@ -220,14 +209,14 @@ export default defineComponent({
     this.getStatesList();
   },
   methods: {
-     acceptNumber() {
+    acceptNumber() {
-        let x = this.CreateCustomerForm.basicInfo.customer_phone_number.replace(/\D/g, '').match(/(\d{0,3})(\d{0,3})(\d{0,4})/);
+      let x = this.CreateCustomerForm.basicInfo.customer_phone_number.replace(/\D/g, '').match(/(\d{0,3})(\d{0,3})(\d{0,4})/);
-        if (x){
+      if (x) {
-          this.CreateCustomerForm.basicInfo.customer_phone_number = !x[2] ? x[1] : '(' + x[1] + ') ' + x[2] + (x[3] ? '-' + x[3] : '');
+        this.CreateCustomerForm.basicInfo.customer_phone_number = !x[2] ? x[1] : '(' + x[1] + ') ' + x[2] + (x[3] ? '-' + x[3] : '');
-        }
+      }
-        else {
+      else {
-          this.CreateCustomerForm.basicInfo.customer_phone_number = ''
+        this.CreateCustomerForm.basicInfo.customer_phone_number = ''
-        }
+      }
     },
     userStatus() {
       let path = import.meta.env.VITE_BASE_URL + '/auth/whoami';
@@ -237,14 +226,14 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data.ok) {
+          if (response.data.ok) {
-              this.user = response.data.user;
+            this.user = response.data.user;
-            }
+          }
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-            this.user = null
+          this.user = null
-          })
+        })
     },
     CreateCustomer(payload: {
       customer_last_name: string;
@@ -267,15 +256,15 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data.ok) {
+          if (response.data.ok) {
-              this.new_user_id = response.data.user.user_id
+            this.new_user_id = response.data.user.user_id
-              this.$router.push({ name: 'customerProfile', params: { id: this.new_user_id  } });
+            this.$router.push({ name: 'customerProfile', params: { id: this.new_user_id } });
-            }
+          }
-            if (response.data.error) {
+          if (response.data.error) {
-              this.$router.push("/");
+            this.$router.push("/");
-            }
+          }
-          })
+        })
     },
     onSubmit() {
       let payload = {
@@ -300,11 +289,11 @@ export default defineComponent({
         url: path,
         withCredentials: true,
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            this.custList = response.data;
+          this.custList = response.data;
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-          });
+        });
     },
     getStatesList() {
       let path = import.meta.env.VITE_BASE_URL + "/query/states";
@@ -313,16 +302,14 @@ export default defineComponent({
         url: path,
         withCredentials: true,
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            this.stateList = response.data;
+          this.stateList = response.data;
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-          });
+        });
     },
   },
 })
 </script>
 
-<style scoped>
+<style scoped></style>
-
-</style>

src/pages/customer/edit.vue

@@ -1,9 +1,9 @@
 <template>
-  <Header/>
+  <Header />
   <div v-if="user">
     <div class="flex">
       <div class="">
-        <SideBar/>
+        <SideBar />
       </div>
       <div class="w-full px-10">
         <div class="text-sm breadcrumbs">
@@ -21,122 +21,121 @@
           </ul>
         </div>
 
-        <div class="grid grid-cols-1 rounded-md p-6 ">
+        <div class="grid grid-cols-12 rounded-md p-6 ">
-          <div class="text-[24px]">Edit customer: {{ customer.account_number }}</div>
+          <div class="col-span-12 text-2xl">Edit customer: {{ customer.account_number }}</div>
-          <form class="rounded-md px-8 pt-6 pb-8 mb-4 w-full" enctype="multipart/form-data" @submit.prevent="onSubmit">
+          <form class="col-span-12 rounded-md px-8 pt-6 pb-8 mb-4 " enctype="multipart/form-data"
+            @submit.prevent="onSubmit">
             <div class="text-[18px] mt-5 mb-5">General Info</div>
-            <div class="mb-4">
+            <div class="grid grid-cols-12">
-              <label class="block text-white text-sm font-bold mb-2"> First Name</label>
+              <div class="col-span-12 mb-4">
-              <input v-model="CreateCustomerForm.basicInfo.customer_first_name"
+                <label class="block text-white text-sm font-bold mb-2"> First Name</label>
-                     class="input input-bordered w-full max-w-xs"
+                <input v-model="CreateCustomerForm.basicInfo.customer_first_name"
-                     id="title" type="text" placeholder="First Name"/>
+                  class="input input-bordered input-sm w-full max-w-xs" id="title" type="text"
-              <span v-if="v$.CreateCustomerForm.basicInfo.customer_first_name.$error" class="text-red-600 text-center">
+                  placeholder="First Name" />
-              {{ v$.CreateCustomerForm.basicInfo.customer_first_name.$errors[0].$message }}
+                <span v-if="v$.CreateCustomerForm.basicInfo.customer_first_name.$error"
-            </span>
+                  class="text-red-600 text-center">
-            </div>
+                  {{ v$.CreateCustomerForm.basicInfo.customer_first_name.$errors[0].$message }}
-            <div class="mb-4">
+                </span>
-              <label class="block text-white text-sm font-bold mb-2"> Last Name</label>
-              <input v-model="CreateCustomerForm.basicInfo.customer_last_name"
-                     class="input input-bordered w-full max-w-xs"
-                     id="title" type="text" placeholder="Last Name"/>
-              <span v-if="v$.CreateCustomerForm.basicInfo.customer_last_name.$error" class="text-red-600 text-center">
-              {{ v$.CreateCustomerForm.basicInfo.customer_last_name.$errors[0].$message }}
-            </span>
-            </div>
-
-            <div class="flex gap-5">
-              <div class="flex-1 mb-4">
-                <label class="block text-white text-sm font-bold mb-2">Customer Type</label>
-                <select
-                    class="select select-bordered w-full max-w-xs"
-                    aria-label="Default select example" id="customer_type"
-                    v-model="CreateCustomerForm.basicInfo.customer_home_type">
-                  <option class="text-white" v-for="(customer, index) in custList"
-                          :key="index"
-                          :value="customer['value']">
-                    {{ customer['text'] }}
-                  </option>
-                </select>
               </div>
+              <div class="col-span-12 mb-4">
+                <label class="block text-white text-sm font-bold mb-2"> Last Name</label>
+                <input v-model="CreateCustomerForm.basicInfo.customer_last_name"
+                  class="input input-bordered input-sm w-full max-w-xs" id="title" type="text"
+                  placeholder="Last Name" />
+                <span v-if="v$.CreateCustomerForm.basicInfo.customer_last_name.$error" class="text-red-600 text-center">
+                  {{ v$.CreateCustomerForm.basicInfo.customer_last_name.$errors[0].$message }}
+                </span>
+              </div>
+
+              <div class="col-span-12 flex gap-5">
+                <div class="flex-1 mb-4">
+                  <label class="block text-white text-sm font-bold mb-2">Customer Type</label>
+                  <select class="select select-bordered select-sm w-full max-w-xs" aria-label="Default select example"
+                    id="customer_type" v-model="CreateCustomerForm.basicInfo.customer_home_type">
+                    <option class="text-white" v-for="(customer, index) in custList" :key="index"
+                      :value="customer['value']">
+                      {{ customer['text'] }}
+                    </option>
+                  </select>
+                </div>
+              </div>
+
             </div>
             <div class="text-[18px] mt-5 mb-5">Customer Address</div>
             <div class="col-span-12 md:col-span-4 mb-5 md:mb-5">
               <label class="block text-white text-sm font-bold mb-2">Phone Number</label>
               <input v-model="CreateCustomerForm.basicInfo.customer_phone_number"
-                     class="input input-bordered w-full max-w-xs"
+                class="input input-bordered input-sm w-full max-w-xs" id="phone number" type="text"
-                     id="phone number" type="text" placeholder="Phone Number" @input="acceptNumber()"/>
+                placeholder="Phone Number" @input="acceptNumber()" />
               <span v-if="v$.CreateCustomerForm.basicInfo.customer_phone_number.$error"
-                    class="text-red-600 text-center">
+                class="text-red-600 text-center">
-                    {{ v$.CreateCustomerForm.basicInfo.customer_phone_number.$errors[0].$message }}
+                {{ v$.CreateCustomerForm.basicInfo.customer_phone_number.$errors[0].$message }}
-            </span>
+              </span>
             </div>
-            <div class="col-span-12 mb-5 md:mb-5">
+            <div class="grid grid-cols-12">
-              <label class="block text-white text-sm font-bold mb-2">Street Address</label>
+
-              <input v-model="CreateCustomerForm.basicInfo.customer_address"
+              <div class="col-span-12 mb-5 ">
-                     class="input input-bordered w-full max-w-xs"
+                <label class="block text-white text-sm font-bold mb-2">Street Address</label>
-                     id="address" type="text" placeholder="Address"/>
+                <input v-model="CreateCustomerForm.basicInfo.customer_address"
-              <span v-if="v$.CreateCustomerForm.basicInfo.customer_address.$error"
+                  class="input input-bordered input-sm w-full max-w-xs" id="address" type="text"
-                    class="text-red-600 text-center">
+                  placeholder="Address" />
-                   {{ v$.CreateCustomerForm.basicInfo.customer_address.$errors[0].$message }}
+                <span v-if="v$.CreateCustomerForm.basicInfo.customer_address.$error" class="text-red-600 text-center">
-            </span>
+                  {{ v$.CreateCustomerForm.basicInfo.customer_address.$errors[0].$message }}
-            </div>
+                </span>
-            <div class="col-span-12 mb-5 md:mb-5">
+              </div>
-              <input v-model="CreateCustomerForm.basicInfo.customer_apt"
+              <div class="col-span-12 mb-5 ">
-                     class="input input-bordered w-full max-w-xs"
+                <label class="block text-white text-sm font-bold mb-2">Apt</label>
-                     id="apt" type="text" placeholder="Apt, suite, unit, building, floor, etc"/>
+                <input v-model="CreateCustomerForm.basicInfo.customer_apt"
-            </div>
+                  class="input input-bordered input-sm w-full max-w-xs" id="apt" type="text"
-            <div class="col-span-12 md:col-span-4 mb-20 md:mb-5 ">
+                  placeholder="Apt, suite, unit, building, floor, etc" />
-              <label class="block text-white text-sm font-bold mb-2">Town</label>
+              </div>
-              <input v-model="CreateCustomerForm.basicInfo.customer_town"
+
-                     class="input input-bordered w-full max-w-xs"
+              <div class="col-span-12 ">
-                     id="town" type="text" placeholder="town"/>
+                <label class="block text-white text-sm font-bold mb-2">Town</label>
-              <span v-if="v$.CreateCustomerForm.basicInfo.customer_town.$error" class="text-red-600 text-center">
+                <input v-model="CreateCustomerForm.basicInfo.customer_town"
-                    {{ v$.CreateCustomerForm.basicInfo.customer_town.$errors[0].$message }}
+                  class="input input-bordered input-sm w-full max-w-xs" id="town" type="text" placeholder="town" />
-            </span>
+                <span v-if="v$.CreateCustomerForm.basicInfo.customer_town.$error" class="text-red-600 text-center">
+                  {{ v$.CreateCustomerForm.basicInfo.customer_town.$errors[0].$message }}
+                </span>
+              </div>
+
+              <div class="col-span-12 flex-1 mb-4 ">
+                <label class="block text-white text-sm font-bold mb-2">State</label>
+                <select class="select select-bordered select-sm w-full max-w-xs" aria-label="Default select example"
+                  id="customer_state" v-model="CreateCustomerForm.basicInfo.customer_state">
+                  <option class="text-white" v-for="(state, index) in stateList" :key="index" :value="state['value']">
+                    {{ state['text'] }}
+                  </option>
+                </select>
+                <span v-if="v$.CreateCustomerForm.basicInfo.customer_state.$error" class="text-red-600 text-center">
+                  {{ v$.CreateCustomerForm.basicInfo.customer_state.$errors[0].$message }}
+                </span>
+              </div>
+              <div class="col-span-2 mb-5 md:mb-5">
+                <label class="block text-white text-sm font-bold mb-2">Zip Code</label>
+                <input v-model="CreateCustomerForm.basicInfo.customer_zip"
+                  class="input input-bordered input-sm w-full max-w-xs" id="zip" type="text" placeholder="Zip" />
+                <span v-if="v$.CreateCustomerForm.basicInfo.customer_zip.$error" class="text-red-600 text-center">
+                  {{ v$.CreateCustomerForm.basicInfo.customer_zip.$errors[0].$message }}
+                </span>
+              </div>
             </div>
 
-            <div class="flex-1 mb-4">
+
-              <label class="block text-white text-sm font-bold mb-2">State</label>
-              <select
-                  class="select select-bordered w-full max-w-xs"
-                  aria-label="Default select example" id="customer_state"
-                  v-model="CreateCustomerForm.basicInfo.customer_state">
-                <option class="text-white" v-for="(state, index) in stateList"
-                        :key="index"
-                        :value="state['value']">
-                  {{ state['text'] }}
-                </option>
-              </select>
-              <span v-if="v$.CreateCustomerForm.basicInfo.customer_state.$error" class="text-red-600 text-center">
-                    {{ v$.CreateCustomerForm.basicInfo.customer_state.$errors[0].$message }}
-                </span>
-            </div>
-            <div class="col-span-12 md:col-span-4 mb-5 md:mb-5">
-              <label class="block text-white text-sm font-bold mb-2">Zip Code</label>
-              <input v-model="CreateCustomerForm.basicInfo.customer_zip"
-                     class="input input-bordered w-full max-w-xs"
-                     id="zip" type="text" placeholder="Zip"/>
-              <span v-if="v$.CreateCustomerForm.basicInfo.customer_zip.$error" class="text-red-600 text-center">
-                     {{ v$.CreateCustomerForm.basicInfo.customer_zip.$errors[0].$message }}
-            </span>
-            </div>
 
             <div class="col-span-12 md:col-span-4 mb-5 md:mb-0">
               <label class="block text-white text-sm font-bold mb-2">Email</label>
               <input v-model="CreateCustomerForm.basicInfo.customer_email"
-                     class="input input-bordered w-full max-w-xs"
+                class="input input-bordered input-sm w-full max-w-xs" id="email" type="text" placeholder="Email" />
-                     id="email" type="text" placeholder="Email"/>
               <span v-if="v$.CreateCustomerForm.basicInfo.customer_email.$error" class="text-red-600 text-center">
-                     {{ v$.CreateCustomerForm.basicInfo.customer_email.$errors[0].$message }}
+                {{ v$.CreateCustomerForm.basicInfo.customer_email.$errors[0].$message }}
-            </span>
+              </span>
             </div>
 
             <div class="col-span-12 md:col-span-4 mb-5 md:mb-0">
               <label class="block text-white text-sm font-bold mb-2">Automatic</label>
-              <input v-model="CreateCustomerForm.basicInfo.customer_automatic"
+              <input v-model="CreateCustomerForm.basicInfo.customer_automatic" class="checkbox checkbox-xs" id="automatic"
-                     class="checkbox"
+                type="checkbox" />
-                     id="automatic"
-                     type="checkbox"/>
             </div>
             <div class="col-span-12 md:col-span-12 flex mt-5 mb-5">
               <button class="btn">
@@ -148,18 +147,18 @@
       </div>
     </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 {email, minLength, required} from "@vuelidate/validators";
+import { email, minLength, required } from "@vuelidate/validators";
 
 export default defineComponent({
   name: 'CustomerEdit',
@@ -211,15 +210,15 @@ export default defineComponent({
     return {
       CreateCustomerForm: {
         basicInfo: {
-          customer_last_name: {required, minLength: minLength(1)},
+          customer_last_name: { required, minLength: minLength(1) },
-          customer_first_name: {required, minLength: minLength(1)},
+          customer_first_name: { required, minLength: minLength(1) },
-          customer_town: {required, minLength: minLength(1)},
+          customer_town: { required, minLength: minLength(1) },
-          customer_home_type: {required},
+          customer_home_type: { required },
-          customer_zip: {required, minLength: minLength(5)},
+          customer_zip: { required, minLength: minLength(5) },
-          customer_email: {email, required},
+          customer_email: { email, required },
-          customer_phone_number: {required},
+          customer_phone_number: { required },
-          customer_state: {required},
+          customer_state: { required },
-          customer_address: {required},
+          customer_address: { required },
         },
       },
     };
@@ -250,14 +249,14 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data.ok) {
+          if (response.data.ok) {
-              this.user = response.data.user;
+            this.user = response.data.user;
-            }
+          }
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-            this.user = null
+          this.user = null
-          })
+        })
     },
 
     // gets the item from parameter router
@@ -269,22 +268,22 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data) {
+          if (response.data) {
-              this.customer = response.data;
+            this.customer = response.data;
-              this.CreateCustomerForm.basicInfo.customer_last_name = response.data.customer_last_name;
+            this.CreateCustomerForm.basicInfo.customer_last_name = response.data.customer_last_name;
-              this.CreateCustomerForm.basicInfo.customer_first_name = response.data.customer_first_name;
+            this.CreateCustomerForm.basicInfo.customer_first_name = response.data.customer_first_name;
-              this.CreateCustomerForm.basicInfo.customer_town = response.data.customer_town;
+            this.CreateCustomerForm.basicInfo.customer_town = response.data.customer_town;
-              this.CreateCustomerForm.basicInfo.customer_state = response.data.customer_state;
+            this.CreateCustomerForm.basicInfo.customer_state = response.data.customer_state;
-              this.CreateCustomerForm.basicInfo.customer_zip = response.data.customer_zip;
+            this.CreateCustomerForm.basicInfo.customer_zip = response.data.customer_zip;
-              this.CreateCustomerForm.basicInfo.customer_automatic = response.data.customer_automatic;
+            this.CreateCustomerForm.basicInfo.customer_automatic = response.data.customer_automatic;
-              this.CreateCustomerForm.basicInfo.customer_phone_number = response.data.customer_phone_number;
+            this.CreateCustomerForm.basicInfo.customer_phone_number = response.data.customer_phone_number;
-              this.CreateCustomerForm.basicInfo.customer_home_type = response.data.customer_home_type;
+            this.CreateCustomerForm.basicInfo.customer_home_type = response.data.customer_home_type;
-              this.CreateCustomerForm.basicInfo.customer_apt = response.data.customer_apt;
+            this.CreateCustomerForm.basicInfo.customer_apt = response.data.customer_apt;
-              this.CreateCustomerForm.basicInfo.customer_email = response.data.customer_email;
+            this.CreateCustomerForm.basicInfo.customer_email = response.data.customer_email;
-              this.CreateCustomerForm.basicInfo.customer_address = response.data.customer_address;
+            this.CreateCustomerForm.basicInfo.customer_address = response.data.customer_address;
-            }
+          }
-          })
+        })
     },
     editItem(payload: {
       customer_last_name: string;
@@ -306,16 +305,16 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data.ok) {
+          if (response.data.ok) {
-              this.$router.push({name: "customerProfile", params: {id: this.customer.id}});
+            this.$router.push({ name: "customerProfile", params: { id: this.customer.id } });
-            }
+          }
-            ;
+          ;
-            if (response.data.error) {
+          if (response.data.error) {
-              this.$router.push("/");
+            this.$router.push("/");
-            }
+          }
-            ;
+          ;
-          })
+        })
     },
     onSubmit() {
       let payload = {
@@ -339,11 +338,11 @@ export default defineComponent({
         url: path,
         withCredentials: true,
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            this.custList = response.data;
+          this.custList = response.data;
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-          });
+        });
     },
     getStatesList() {
       let path = import.meta.env.VITE_BASE_URL + "/query/states";
@@ -352,18 +351,16 @@ export default defineComponent({
         url: path,
         withCredentials: true,
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            this.stateList = response.data;
+          this.stateList = response.data;
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-          });
+        });
     },
   },
 })
 </script>
 
-<style scoped>
+<style scoped></style>
-
-</style>
 <script setup lang="ts">
 </script>

src/pages/customer/home.vue

@@ -23,7 +23,7 @@
 
       </div>
 
-      <div class="overflow-x-auto">
+      <div class="overflow-x-auto bg-neutral font-bold">
         <table class="table">
           <!-- head -->
           <thead>
@@ -54,19 +54,18 @@
 
               <td class="flex gap-5">
                 <router-link :to="{ name: 'deliveryCreate', params: { id: person['id'] } }"
-                  class="cursor-pointer underline hover:text-blue-300">
+                  class="btn btn-accent btn-sm">
                   Oil
                 </router-link>
 
-                <router-link :to="{ name: 'customerEdit', params: { id: person['id'] } }"
+                <router-link :to="{ name: 'customerEdit', params: { id: person['id'] } }" class="btn btn-accent btn-sm">
-                  class="cursor-pointer underline hover:text-blue-300">
                   Edit
                 </router-link>
                 <router-link :to="{ name: 'customerProfile', params: { id: person['id'] } }"
-                  class="cursor-pointer underline hover:text-blue-300">
+                  class="  btn btn-accent btn-sm">
                   View
                 </router-link>
-                <a @click.prevent="deleteCustomer(person['id'])" class="cursor-pointer underline hover:text-blue-300">
+                <a @click.prevent="deleteCustomer(person['id'])" class="btn btn-error btn-sm">
                   Delete
                 </a>
               </td>

src/pages/customer/profile/home.vue

@@ -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">
@@ -22,27 +22,24 @@
         <div class="w-full mt-10" v-if="customer !== null">
 
           <div class="grid grid-cols-12 gap-5">
-            <div class="col-span-4 bg-neutral p-5 ">
+            <div class="col-span-4 p-5 ">
-              <img src="../../../assets/images/user_placeholder.png"
+              <img src="../../../assets/images/user_placeholder.png" alt="Drone Image" width="200" height="250" />
-                   alt="Drone Image"
-                   width="200"
-                   height="250"/>
             </div>
-            <div class="col-span-8 bg-neutral p-5">
+            <div class="col-span-8  p-5">
               <div class="grid grid-cols-12">
                 <div class="col-span-12 font-bold flex justify-evenly pb-5">
-                  <div class="btn">
+
-                    <router-link :to="{ name: 'deliveryCreate', params: { id: customer.id } }"
+                  <router-link :to="{ name: 'deliveryCreate', params: { id: customer.id } }"
-                                 class="cursor-pointer underline hover:text-blue-300">
+                    class="btn-sm btn btn-accent">
-                      Create Delivery
+                    Create Delivery
-                    </router-link>
+                  </router-link>
-                  </div>
+
-               
+
-                  <div class="btn">
+                  <router-link :to="{ name: 'customerEdit', params: { id: customer.id } }"
-                    <router-link :to="{ name: 'customerEdit', params: { id: customer.id } }" class="">
+                    class="btn-sm btn btn-accent">
-                      Edit Customer
+                    Edit Customer
-                    </router-link>
+                  </router-link>
-                  </div>
+
                 </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">
@@ -95,7 +92,7 @@
               </div>
             </div>
 
-            <div class="col-span-12 bg-neutral p-5">
+            <div class="col-span-12  p-5">
               <div class="grid grid-cols-12">
                 <div class="col-span-12 font-bold flex text-2xl">
                   Stats
@@ -114,7 +111,7 @@
                 </div>
               </div>
             </div>
-            <div class="col-span-12 bg-neutral p-5">
+            <div class="col-span-12  p-5">
               <div class="grid grid-cols-12">
                 <div class="col-span-6 font-bold flex text-2xl">
                   Credit Cards
@@ -122,7 +119,7 @@
                 <div class="col-span-6 font-bold flex ">
 
                   <router-link :to="{ name: 'cardadd', params: { id: customer.user_id } }">
-                    <button class="btn">Add Credit Card</button>
+                    <button class="btn btn-sm btn-accent">Add Credit Card</button>
                   </router-link>
                 </div>
                 <div class="col-span-12 font-bold flex">
@@ -152,19 +149,17 @@
                         </div>
                         <div class="flex justify-between">
 
-                          <a @click.prevent="editCard(card.id)" 
+                          <a @click.prevent="editCard(card.id)" class="cursor-pointer underline hover:text-blue-300">
-                          class="cursor-pointer underline hover:text-blue-300">
+                            Edit Card
-                          Edit Card
+                          </a>
-                        </a>
+                          <a @click.prevent="removeCard(card.id)" class="cursor-pointer underline hover:text-blue-300">
-                          <a @click.prevent="removeCard(card.id)"
+                            RemoveCard
-                           class="cursor-pointer underline hover:text-blue-300">
-                           RemoveCard
                           </a>
                         </div>
                       </div>
                     </div>
                     <div v-else class="basis-1/3 p-2">
-                      <div class="bg-neutral rounded-md border-2 ">
+                      <div class="rounded-md border-2 ">
                         <div class="flex p-3">
                           {{ card.type_of_card }}
                         </div>
@@ -178,9 +173,11 @@
                           {{ card.expiration_month }}/ {{ card.expiration_year }}
                         </div>
                         <div class="flex justify-between">
-                          <a @click.prevent="editCard(card.id)" class="cursor-pointer underline hover:text-blue-300">Edit
+                          <a @click.prevent="editCard(card.id)"
+                            class="cursor-pointer underline hover:text-blue-300">Edit
                             Card</a>
-                          <a @click.prevent="removeCard(card.id)" class="cursor-pointer underline hover:text-blue-300">Remove
+                          <a @click.prevent="removeCard(card.id)"
+                            class="cursor-pointer underline hover:text-blue-300">Remove
                             Card</a>
                         </div>
                       </div>
@@ -190,7 +187,7 @@
               </div>
             </div>
 
-            <div class="col-span-12 bg-neutral p-5">
+            <div class="col-span-12 p-5">
               <div class="grid grid-cols-12">
                 <div class="col-span-6 font-bold flex text-2xl">
                   Financial
@@ -198,93 +195,92 @@
               </div>
             </div>
 
-            <div class="col-span-12 bg-neutral p-5">
+            <div class="col-span-12  p-5">
               <div class="grid grid-cols-12">
                 <div class="col-span-12 font-bold flex text-2xl">Orders</div>
               </div>
-              <div class="grid grid-cols-12 ">
+              <div class="grid grid-cols-12 bg-neutral">
-                <div role="tablist" class="tabs tabs-bordered">
+
-                  <input type="radio" name="my_tabs_1" role="tab" class="tab" aria-label="Deliveries" checked/>
+                <table class="table col-span-12">
-                  <div role="tabpanel" class="tab-content pt-10">
+                  <!-- head -->
-                    <table class="table">
+                  <thead>
-                      <!-- head -->
+                    <tr>
-                      <thead>
+                      <th>id</th>
-                      <tr>
+                      <th>Status</th>
-                        <th>id</th>
+                      <th>Town</th>
-                        <th>Status</th>
+                      <th>Name</th>
-                        <th>Town</th>
+                      <th>Address</th>
-                        <th>Name</th>
+                      <th>Gallons</th>
-                        <th>Address</th>
+                      <th>Date</th>
-                        <th>Gallons</th>
+                      <th>Automatic</th>
-                        <th>Date</th>
+                      <th>Prime</th>
-                        <th>Automatic</th>
+                      <th>Same Day</th>
-                        <th>Prime</th>
+                    </tr>
-                        <th>Same Day</th>
+                  </thead>
-                      </tr>
+                  <tbody>
-                      </thead>
+                    <!-- row 1 -->
-                      <tbody>
+                    <tr v-for="oil in deliveries" :key="oil['id']">
-                      <!-- row 1 -->
+                      <td>{{ oil['id'] }}</td>
-                      <tr v-for="oil in deliveries" :key="oil['id']">
+                      <td>
-                        <td>{{ oil['id'] }}</td>
+                        <div v-if="oil['delivery_status'] == 0">Waiting</div>
-                        <td>
+                        <div v-else-if="oil['delivery_status'] == 1">delivered</div>
-                          <div v-if="oil['delivery_status'] == 0">Waiting</div>
+                        <div v-else-if="oil['delivery_status'] == 2">Out for Delivery</div>
-                          <div v-else-if="oil['delivery_status'] == 1">delivered</div>
+                        <div v-else-if="oil['delivery_status'] == 3">Cancelled</div>
-                          <div v-else-if="oil['delivery_status'] == 2">Out for Delivery</div>
+                        <div v-else-if="oil['delivery_status'] == 4">Partial Delivery</div>
-                          <div v-else-if="oil['delivery_status'] == 3">Cancelled</div>
+                        <div v-else-if="oil['delivery_status'] == 5">Issue</div>
-                          <div v-else-if="oil['delivery_status'] == 4">Partial Delivery</div>
+                        <div v-else-if="oil['delivery_status'] == 10">Finalized</div>
-                          <div v-else-if="oil['delivery_status'] == 5">Issue</div>
+                        <div v-else></div>
-                           <div v-else-if="oil['delivery_status'] == 10">Finalized</div>
+                      </td>
-                          <div v-else></div>
+                      <td>{{ oil['customer_town'] }}</td>
-                        </td>
+                      <td>{{ oil['customer_name'] }}</td>
-                        <td>{{ oil['customer_town'] }}</td>
+                      <td>{{ oil['customer_address'] }}</td>
-                        <td>{{ oil['customer_name'] }}</td>
+                      <td>
-                        <td>{{ oil['customer_address'] }}</td>
+                        <div v-if="oil['customer_asked_for_fill'] == 1">Fill</div>
-                        <td>
+                        <div v-else> {{ oil['gallons_ordered'] }}</div>
-                          <div v-if="oil['customer_asked_for_fill'] == 1">Fill</div>
+                      </td>
-                          <div v-else> {{ oil['gallons_ordered'] }}</div>
+                      <td>{{ oil['expected_delivery_date'] }}</td>
-                        </td>
+                      <td>
-                        <td>{{ oil['expected_delivery_date'] }}</td>
+                        <div v-if="oil['automatic'] == 0">No</div>
-                        <td>
+                        <div v-else>Yes</div>
-                          <div v-if="oil['automatic'] == 0">No</div>
+                      </td>
-                          <div v-else>Yes</div>
+                      <td>
-                        </td>
+                        <div v-if="oil['prime'] == 0">No</div>
-                        <td>
+                        <div v-else>Yes</div>
-                          <div v-if="oil['prime'] == 0">No</div>
+                      </td>
-                          <div v-else>Yes</div>
+                      <td>
-                        </td>
+                        <div v-if="oil['same_day'] == 0">No</div>
-                        <td>
+                        <div v-else>Yes</div>
-                          <div v-if="oil['same_day'] == 0">No</div>
+                      </td>
-                          <div v-else>Yes</div>
+                      <td class="flex gap-5">
-                        </td>
+                        <router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
-                        <td class="flex gap-5">
+                          <button class="btn btn-sm btn-accent">Edit</button>
-                          <router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
+                        </router-link>
-                            <button class="btn">Edit</button>
+                      </td>
-                          </router-link>
+                    </tr>
-                        </td>
+                  </tbody>
-                      </tr>
+                </table>
-                      </tbody>
+
-                    </table>
+                
-                  </div>
-                </div>
               </div>
             </div>
+
           </div>
         </div>
       </div>
     </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 PaginationComp from "../../../components/pagination.vue";
-import {notify} from "@kyvg/vue3-notification";
+import { notify } from "@kyvg/vue3-notification";
 
 export default defineComponent({
   name: 'CustomerProfile',
@@ -367,14 +363,14 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data.ok) {
+          if (response.data.ok) {
-              this.user = response.data.user;
+            this.user = response.data.user;
-            }
+          }
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-            this.user = null
+          this.user = null
-          })
+        })
     },
 
     getCustomer(userid: any) {
@@ -425,7 +421,7 @@ export default defineComponent({
     },
 
     editCard(card_id: any) {
-      this.$router.push({name: "cardedit", params: {id: card_id}});
+      this.$router.push({ name: "cardedit", params: { id: card_id } });
     },
 
     removeCard(card_id: any) {

src/pages/delivery/create.vue

@@ -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">
+        <div class="col-span-6 rounded-md p-6 ">
-            <label class="block text-white text-sm font-bold mb-2">Gallons Ordered</label>
+          <div class="grid grid-cols-12">
-            <input v-model="CreateOilOrderForm.basicInfo.gallons_ordered"
+            <div class="col-span-12 text-[24px]">
-                   :disabled="CreateOilOrderForm.basicInfo.customer_asked_for_fill == true"
+              Create Oil Delivery
-                   class="input input-bordered w-full max-w-xs"
+            </div>
-                   id="title" type="text" placeholder="# gallons"/>
+            <form class="col-span-12 rounded-md px-8 pt-6 pb-8 mb-4 w-full" enctype="multipart/form-data"
-            <span v-if="v$.CreateOilOrderForm.basicInfo.gallons_ordered.$error" class="text-red-600 text-center">
+              @submit.prevent="onSubmit">
-              {{ v$.CreateOilOrderForm.basicInfo.gallons_ordered.$errors[0].$message }}
-            </span>
-          </div>
 
-          <div class="mb-4">
+              <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 mb-2">Expected </label>
+                <label class="block text-white text-sm font-bold cursor-pointer label">Fill </label>
-            <input v-model="CreateOilOrderForm.basicInfo.expected_delivery_date"
+                <input v-model="CreateOilOrderForm.basicInfo.customer_asked_for_fill" class="checkbox checkbox-xs" id="fill"
-                   class="input input-bordered w-full max-w-xs"
+                  type="checkbox" />
-                   id="title" type="date"
+              </div>
-                   min="2023-01-01" max="2030-01-01"/>
+
-            <span v-if="v$.CreateOilOrderForm.basicInfo.expected_delivery_date.$error"
+              <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>
+                </span>
-          </div>
-
-          <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 .."
+              <div class="mb-4">
-                        v-model="CreateOilOrderForm.basicInfo.dispatcher_notes_taken"></textarea>
+                <label class="form-control">
-            </label>
+                  <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: {
+      deliveries: [],
-          id: 0,
+      customer: {
-          customer_last_name: '',
+        id: 0,
-          customer_first_name: '',
+        customer_last_name: '',
-          customer_town: '',
+        customer_first_name: '',
-          customer_state: 0,
+        customer_town: '',
-          customer_zip: '',
+        customer_state: 0,
-          customer_first_call: '',
+        customer_zip: '',
-          customer_email: '',
+        customer_first_call: '',
-          customer_automatic: '',
+        customer_email: '',
-          customer_phone_number: '',
+        customer_automatic: '',
-          customer_home_type: 0,
+        customer_phone_number: '',
-          customer_apt: '',
+        customer_home_type: 0,
-          customer_address: '',
+        customer_apt: '',
-          account_number: '',
+        customer_address: '',
-        },
+        account_number: '',
+      },
     }
   },
   validations() {
     return {
       CreateOilOrderForm: {
         basicInfo: {
-          gallons_ordered: {required, minLength: minLength(1)},
+          gallons_ordered: { required, minLength: minLength(1) },
-          expected_delivery_date: {required},
+          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) => {
+        .then((response: any) => {
-            if (response.data.ok) {
+          if (response.data.ok) {
-              this.user = response.data.user;
+            this.user = response.data.user;
-            }
+          }
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-            this.user = null
+          this.user = null
-          })
+        })
     },
 
     getCustomer(user_id: any) {
@@ -299,17 +339,28 @@ export default defineComponent({
         url: path,
         withCredentials: true,
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            this.customer = response.data;
+          this.customer = response.data;
 
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-            notify({
+          notify({
-              title: "Error",
+            title: "Error",
-              text: "Could not find customer",
+            text: "Could not find customer",
-              type: "error",
+            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) => {
+        .then((response: any) => {
-            this.userCards = response.data;
+          this.userCards = response.data;
-          })
+        })
-          .catch(() => {
+        .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) => {
+        .then((response: any) => {
-            this.truckDriversList = response.data;
+          this.truckDriversList = response.data;
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-          });
+        });
     },
     CreateOilOrder(payload: {
       gallons_ordered: string;
@@ -361,14 +412,14 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data.ok) {
+          if (response.data.ok) {
-              this.$router.push({name: "payOil", params: {id: response.data.delivery_id}});
+            this.$router.push({ name: "payOil", params: { id: response.data.delivery_id } });
-            }
+          }
-            if (response.data.error) {
+          if (response.data.error) {
-              this.$router.push("/");
+            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 == ''){
+      if (this.CreateOilOrderForm.basicInfo.driver_driver == '') {
-            notify({
+        notify({
-              title: "Error",
+          title: "Error",
-              text: "Did not add a driver",
+          text: "Did not add a driver",
-              type: "error",
+          type: "error",
-            });
+        });
       }
       this.CreateOilOrder(payload);
     },
@@ -398,6 +449,4 @@ export default defineComponent({
 })
 </script>
 
-<style scoped>
+<style scoped></style>
-
-</style>

src/pages/delivery/edit.vue

@@ -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">
@@ -18,63 +18,64 @@
 
 
       <div class="grid grid-cols-1 rounded-md p-6 ">
-        <div class="text-[24px]">
+        <div class="text-2xl border-b border-gray-500 mb-10">
           Edit Oil Delivery
         </div>
-        <div class="bg-neutral rounded-md mx-5 my-5">
+        <div class=" rounded-md">
-          <div class="flex">
+          <div class="flex text-2xl">
             Delivery id: {{ deliveryOrder.id }}
-            <div class="grid grid-cols-12">
+          </div>
-              <div class="col-span-6 bg-neutral p-5">
+          <div class="grid grid-cols-12">
-                <div class="grid grid-cols-12">
+            <div class="col-span-6  p-5">
-                  <div class="col-span-12 font-bold flex">
+              <div class="grid grid-cols-12">
-                    {{ customer.customer_first_name }}
+                <div class="col-span-12 flex">
-                    {{ customer.customer_last_name }}
+                  {{ customer.customer_first_name }}
+                  {{ customer.customer_last_name }}
+                </div>
+                <div class="col-span-12 flex">
+                  <div class="pr-2">
+                    {{ customer.customer_town }},
                   </div>
-                  <div class="col-span-12 font-bold flex">
+                  <div class="pr-2">
-                    <div class="pr-2">
+                    <div v-if="customer.customer_state == 0">Massachusetts</div>
-                      {{ customer.customer_town }},
+                    <div v-else-if="customer.customer_state == 1">Rhode Island</div>
-                    </div>
+                    <div v-else-if="customer.customer_state == 2">New Hampshire</div>
-                    <div class="pr-2">
+                    <div v-else-if="customer.customer_state == 3">Maine</div>
-                      <div v-if="customer.customer_state == 0">Massachusetts</div>
+                    <div v-else-if="customer.customer_state == 4">Vermont</div>
-                      <div v-else-if="customer.customer_state == 1">Rhode Island</div>
+                    <div v-else-if="customer.customer_state == 5">Maine</div>
-                      <div v-else-if="customer.customer_state == 2">New Hampshire</div>
+                    <div v-else-if="customer.customer_state == 6">New York</div>
-                      <div v-else-if="customer.customer_state == 3">Maine</div>
+                    <div v-else>Unknown state</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="pr-2">
+                    {{ customer.customer_zip }}
+                  </div>
+                </div>
 
-                  <div class="col-span-12 font-bold flex" v-if="customer.customer_apt !== 'None'">
+                <div class="col-span-12  flex" v-if="customer.customer_apt !== 'None'">
-                    {{ customer.customer_apt }}
+                  {{ customer.customer_apt }}
-                  </div>
+                </div>
-                  <div class="col-span-12 font-bold flex">
+                <div class="col-span-12  flex">
-                    <div v-if="customer.customer_home_type == 0">Residential</div>
+                  <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 == 1">apartment</div>
-                    <div v-else-if="customer.customer_home_type == 2">condo</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 == 3">commercial</div>
-                    <div v-else-if="customer.customer_home_type == 4">business</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 == 5">construction</div>
-                    <div v-else-if="customer.customer_home_type == 6">container</div>
+                  <div v-else-if="customer.customer_home_type == 6">container</div>
-                  </div>
+                </div>
-                  <div class="col-span-12 font-bold flex">
+                <div class="col-span-12  flex">
-                    {{ customer.customer_phone_number }}
+                  {{ customer.customer_phone_number }}
-                  </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
 
-        <div class="grid grid-cols-1" v-if="deliveryOrder.payment_type==1">
+
+        <div class="grid grid-cols-1" 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="rounded-md border-2 ">
                 <div class="flex p-3">
                   {{ userCard.type_of_card }}
                 </div>
@@ -93,149 +94,115 @@
         </div>
 
 
-        <div class="bg-neutral rounded-md mx-5 my-5">
+        <div class=" rounded-md mx-5 my-5">
           <div class="flex">
-            Order Date: {{ deliveryOrder.when_ordered }}
+            Order Date:
           </div>
-          <div class="flex">
+          <div class="mb-5">
-            Expected Delivery Date: {{ deliveryOrder.expected_delivery_date }}
+            {{ deliveryOrder.when_ordered }}
           </div>
+
           <div class="flex">
-            Price per gallon: {{ deliveryOrder.customer_price }}
+            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 }}
           </div>
         </div>
-        <div class="bg-neutral rounded-md mx-5 my-5">
+     
-          <div class="flex">
 
+        <form class="rounded-md px-8 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">Cash</label>
+            <input v-model="CreateOilOrderForm.basicInfo.cash" class="checkbox checkbox-xs" id="cash" type="checkbox" />
           </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">Credit </label>
-        <form class="rounded-md px-8 pt-6 pb-8 mb-4 w-full" enctype="multipart/form-data" @submit.prevent="onSubmit">
+            <input v-model="CreateOilOrderForm.basicInfo.card" class="checkbox checkbox-xs" id="Credit"
-
+              type="checkbox" />
-            <div class="bg-neutral">
+          </div>
-
+          <div class="flex-1 mb-4">
-            <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 mb-2">Customer Cards Payment</label>
-              <label class="block text-white text-sm font-bold cursor-pointer label">Cash</label>
+            <select class="select select-bordered select-sm w-full max-w-xs" aria-label="Default select example"
-              <input v-model="CreateOilOrderForm.basicInfo.cash"
+              id="userCards" v-model="CreateOilOrderForm.basicInfo.userCards">
-                     class="checkbox"
+              <option class="text-white" v-for="(card, index) in userCards" :key="index" :value="card['id']">
-                     id="cash"
+                {{ card['type_of_card'] }} {{ card['card_number'] }}
-                     type="checkbox"/>
+              </option>
-            </div>
+            </select>
-
-            <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"
-                     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 Status</label>
-            <select
+            <select class="select select-bordered select-sm w-full max-w-xs" aria-label="Default select example"
-                class="select select-bordered w-full max-w-xs"
+              id="delivery_status" v-model="CreateOilOrderForm.basicInfo.delivery_status">
-                aria-label="Default select example" id="delivery_status"
+              <option class="text-white" v-for="(delivery, index) in deliveryStatus" :key="index"
-                v-model="CreateOilOrderForm.basicInfo.delivery_status">
+                :value="delivery['value']">
-              <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 }}
+              {{ v$.CreateCustomerForm.basicInfo.delivery_status.$errors[0].$message }}
-                </span>
+            </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">Fill </label>
-            <input v-model="CreateOilOrderForm.basicInfo.customer_asked_for_fill"
+            <input v-model="CreateOilOrderForm.basicInfo.customer_asked_for_fill" class="checkbox checkbox-xs" id="fill"
-                   class="checkbox"
+              type="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 "
+              :disabled="CreateOilOrderForm.basicInfo.customer_asked_for_fill"
-                   class="input input-bordered w-full max-w-xs"
+              class="input input-bordered input-sm w-full max-w-xs" id="title" type="text" placeholder="# gallons" />
-                   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 w-full max-w-xs"
+              class="input input-bordered input-sm w-full max-w-xs" id="title" type="date" min="2023-01-01"
-                   id="title" type="date"
+              max="2030-01-01" />
-                   min="2023-01-01" max="2030-01-01"/>
+            <span v-if="v$.CreateOilOrderForm.basicInfo.expected_delivery_date.$error" class="text-red-600 text-center">
-            <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="block text-white text-sm font-bold cursor-pointer label">Delivery Notes</label>
-
             <textarea class="textarea textarea-bordered h-24 w-full"
-                      placeholder="Describe any thing given from the customer .."
+              placeholder="Describe any thing given from the customer .."
-                      v-model="CreateOilOrderForm.basicInfo.dispatcher_notes_taken"></textarea>
+              v-model="CreateOilOrderForm.basicInfo.dispatcher_notes_taken"></textarea>
-
           </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"
+            <input v-model="CreateOilOrderForm.basicInfo.prime" class="checkbox checkbox-xs" id="prime"
-                   class="checkbox"
+              type="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"
+            <input v-model="CreateOilOrderForm.basicInfo.same_day" class="checkbox checkbox-xs" id="same_day"
-                   class="checkbox"
+              type="checkbox" />
-                   id="same_day"
-                   type="checkbox"/>
           </div>
 
-            <div class="flex-1 mb-4">
+          <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"
+            <select class="select select-bordered select-sm w-full max-w-xs" aria-label="Default select example"
-              v-model="CreateOilOrderForm.basicInfo.driver_driver">
+              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'] }}
+                {{ 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
+            <button class="btn btn-accent btn-sm">
-                class="btn">
               Edit Oil Delivery
             </button>
           </div>
@@ -243,20 +210,20 @@
       </div>
     </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 {minLength, required} from "@vuelidate/validators";
+import { minLength, required } from "@vuelidate/validators";
-import {notify} from "@kyvg/vue3-notification";
+import { notify } from "@kyvg/vue3-notification";
 
 export default defineComponent({
   name: 'deliveryEdit',
@@ -351,9 +318,9 @@ export default defineComponent({
     return {
       CreateOilOrderForm: {
         basicInfo: {
-          gallons_ordered: {required, minLength: minLength(1)},
+          gallons_ordered: { required, minLength: minLength(1) },
-          expected_delivery_date: {required},
+          expected_delivery_date: { required },
-          delivery_status: {required},
+          delivery_status: { required },
         },
       },
     };
@@ -382,14 +349,14 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data.ok) {
+          if (response.data.ok) {
-              this.user = response.data.user;
+            this.user = response.data.user;
-            }
+          }
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-            this.user = null
+          this.user = null
-          })
+        })
     },
 
     getDeliveryOrder(delivery_id: any) {
@@ -400,42 +367,42 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data) {
+          if (response.data) {
-              this.CreateOilOrderForm.basicInfo.gallons_ordered = response.data.delivery.delivery_gallons_ordered;
+            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.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.expected_delivery_date = response.data.delivery.delivery_expected_delivery_date;
-              this.CreateOilOrderForm.basicInfo.dispatcher_notes_taken = response.data.delivery.delivery_dispatcher_notes;
+            this.CreateOilOrderForm.basicInfo.dispatcher_notes_taken = response.data.delivery.delivery_dispatcher_notes;
-              this.CreateOilOrderForm.basicInfo.prime = response.data.delivery.delivery_prime;
+            this.CreateOilOrderForm.basicInfo.prime = response.data.delivery.delivery_prime;
-              this.CreateOilOrderForm.basicInfo.same_day = response.data.delivery.delivery_same_day;
+            this.CreateOilOrderForm.basicInfo.same_day = response.data.delivery.delivery_same_day;
-              this.CreateOilOrderForm.basicInfo.delivery_status = response.data.delivery.delivery_status;
+            this.CreateOilOrderForm.basicInfo.delivery_status = response.data.delivery.delivery_status;
 
-              this.CreateOilOrderForm.basicInfo.driver_driver = response.data.delivery.driver_employee_id;
+            this.CreateOilOrderForm.basicInfo.driver_driver = response.data.delivery.driver_employee_id;
 
-              if (response.data.delivery.payment_type == 1) {
+            if (response.data.delivery.payment_type == 1) {
-                this.CreateOilOrderForm.basicInfo.userCards = response.data.delivery.payment_card_id;
+              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.payment_type == 0) {
-                this.CreateOilOrderForm.basicInfo.card = false
-                this.CreateOilOrderForm.basicInfo.cash = true
-              }
-              if (response.data.delivery.payment_type == 1) {
-                this.CreateOilOrderForm.basicInfo.card = true
-                this.CreateOilOrderForm.basicInfo.cash = false
-              }
-              if (response.data.delivery.payment_type == 2) {
-                this.CreateOilOrderForm.basicInfo.card = true
-                this.CreateOilOrderForm.basicInfo.cash = true
-              }
             }
-          })
+            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.payment_type == 0) {
+              this.CreateOilOrderForm.basicInfo.card = false
+              this.CreateOilOrderForm.basicInfo.cash = true
+            }
+            if (response.data.delivery.payment_type == 1) {
+              this.CreateOilOrderForm.basicInfo.card = true
+              this.CreateOilOrderForm.basicInfo.cash = false
+            }
+            if (response.data.delivery.payment_type == 2) {
+              this.CreateOilOrderForm.basicInfo.card = true
+              this.CreateOilOrderForm.basicInfo.cash = true
+            }
+          }
+        })
     },
     getDeliveryForm(delivery_id: any) {
       let path = import.meta.env.VITE_BASE_URL + "/delivery/order/" + delivery_id;
@@ -445,12 +412,12 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data) {
+          if (response.data) {
-              this.deliveryOrder = response.data
+            this.deliveryOrder = response.data
-              this.getCustomer(this.deliveryOrder.customer_id)
+            this.getCustomer(this.deliveryOrder.customer_id)
-            }
+          }
-          })
+        })
     },
     getCustomer(user_id: any) {
       let path = import.meta.env.VITE_BASE_URL + "/customer/" + user_id;
@@ -459,23 +426,23 @@ export default defineComponent({
         url: path,
         withCredentials: true,
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            this.customer = response.data;
+          this.customer = response.data;
-            this.getPaymentCards(this.deliveryOrder.customer_id);
+          this.getPaymentCards(this.deliveryOrder.customer_id);
-            if (this.deliveryOrder.payment_type == 1 ) {
+          if (this.deliveryOrder.payment_type == 1) {
-              this.getPaymentCard(this.deliveryOrder.payment_card_id)
+            this.getPaymentCard(this.deliveryOrder.payment_card_id)
-            }
+          }
-             if (this.deliveryOrder.payment_type == 2 ) {
+          if (this.deliveryOrder.payment_type == 2) {
-              this.getPaymentCard(this.deliveryOrder.payment_card_id)
+            this.getPaymentCard(this.deliveryOrder.payment_card_id)
-            }
+          }
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-            notify({
+          notify({
-              title: "Error",
+            title: "Error",
-              text: "Could not find customer",
+            text: "Could not find customer",
-              type: "error",
+            type: "error",
-            });
           });
+        });
     },
     getPaymentCard(card_id: any) {
       let path = import.meta.env.VITE_BASE_URL + "/payment/card/" + card_id;
@@ -484,25 +451,25 @@ export default defineComponent({
         url: path,
         withCredentials: true,
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            this.userCard = response.data;
+          this.userCard = response.data;
-            this.CreateOilOrderForm.basicInfo.userCards = response.data.id
+          this.CreateOilOrderForm.basicInfo.userCards = response.data.id
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-          });
+        });
     },
     getPaymentCards(user_id: any) {
-      let path = import.meta.env.VITE_BASE_URL + "/payment/cards/"+ user_id;
+      let path = import.meta.env.VITE_BASE_URL + "/payment/cards/" + user_id;
       axios({
         method: "get",
         url: path,
         withCredentials: true,
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            this.userCards = response.data;
+          this.userCards = response.data;
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-          });
+        });
     },
     editOilOrder(payload: {
       gallons_ordered: string;
@@ -525,29 +492,15 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data.ok) {
+          if (response.data.ok) {
-              this.$router.push({name: "delivery"});
+            this.$router.push({ name: "delivery" });
-            }
+          }
-            if (response.data.error) {
+          if (response.data.error) {
-              this.$router.push("/");
+            this.$router.push("/");
-            }
+          }
-          })
+        })
     },
-    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(() => {
-          });
-    },
-
 
     onSubmit() {
       let payload = {
@@ -566,6 +519,19 @@ export default defineComponent({
       this.editOilOrder(payload);
     },
 
+    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";
@@ -573,20 +539,18 @@ export default defineComponent({
         method: "get",
         url: path,
         withCredentials: true,
-         headers: authHeader(),
+        headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            this.truckDriversList = response.data;
+          this.truckDriversList = response.data;
 
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-          });
+        });
     },
 
   },
 })
 </script>
 
-<style scoped>
+<style scoped></style>
-
-</style>

src/pages/delivery/home.vue

@@ -1,11 +1,11 @@
 <template>
-  <Header/>
+  <Header />
   <div class="flex">
     <div class="">
-      <SideBar/>
+      <SideBar />
     </div>
-    <div class=" w-full px-10 ">
+    <div class=" w-full px-10  ">
-      <div class="text-sm breadcrumbs">
+      <div class="text-sm breadcrumbs mb-10">
         <ul>
           <li>
             <router-link :to="{ name: 'home' }">
@@ -15,100 +15,108 @@
 
         </ul>
       </div>
-      <div class="flex justify-end">
 
+      <div class="flex text-2xl mb-5">
+        Delivery Home
       </div>
 
-      <div class="overflow-x-auto">
+      <div class="grid grid-cols-12 gap-5 ">
-        <div class="flex start ">Oil Deliveries</div>
+        <div class="col-span-12 bg-secondary  ">
-        <table class="table">
+          <div class="grid grid-cols-12 p-5 bg-neutral m-5">
-          <!-- head -->
+            <div class="col-span-12 font-bold text-xl">Todays stats</div>
-          <thead>
+            <div class="col-span-6 py-2"> Total Deliveries: {{ delivery_count }}</div>
-          <tr>
+            <div class="col-span-6 py-2"> Completed: {{ delivery_count_delivered }} / {{ delivery_count }}</div>
-            <th>Ticket id</th>
+          </div>
-            <th>Name</th>
+        </div>
-            <th>Status</th>
-            <th>Town</th>
-            <th>Address</th>
-            <th>Gallons</th>
-            <th>Date</th>
-            <th>Automatic</th>
-            <th>Prime</th>
-            <th>Same Day</th>
-          </tr>
-          </thead>
-          <tbody>
-          <!-- row 1 -->
-          <tr v-for="oil in deliveries" :key="oil['id']">    <router-link :to="{ name: 'customerProfile', params: { id: oil['customer_id'] } }">
-            
-            <td>{{ oil['id'] }}</td>
-            <td>{{ oil['customer_name'] }} </td>
-              </router-link>
-            <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>{{ oil['customer_town'] }}</td>
+        <div class="col-span-12 flex start pb-10 text-2xl">All Deliveries Not Finished</div>
-            <td>{{ oil['customer_address'] }}</td>
-            <td>
-              <div v-if="oil['customer_asked_for_fill'] == 1">Fill</div>
-              <div v-else> {{ oil['gallons_ordered'] }}</div>
-            </td>
-            <td>{{ oil['expected_delivery_date'] }}</td>
-            <td>
-              <div v-if="oil['automatic'] == 0">No</div>
-              <div v-else>Yes</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: 'deliveryOrder', params: { id: oil['id'] } }">
+        <div class="col-span-12 overflow-x-auto bg-neutral">
-                <button class="btn btn-primary">View</button>
+
-              </router-link>
+          <table class="table">
-              <router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
+            <!-- head -->
-                <button class="btn btn-primary">Edit</button>
+            <thead>
-              </router-link>
+              <tr>
-              <button @click.prevent="deleteCall(oil['id'])" class="btn btn-primary">Delete</button>
+                <th>ID</th>
-            </td>
+                <th>Name</th>
-          </tr>
+                <th>Status</th>
-          </tbody>
+                <th>Town</th>
-        </table>
+                <th>Address</th>
-      </div>
+                <th>Gallons</th>
-      <div class="flex justify-center" v-if="recordsLength > 9">
+                <th>Date</th>
-        <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="perPage"
+                <th>Automatic</th>
-                    :options="options">
+                <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>
+                <router-link :to="{ name: 'customerProfile', params: { id: oil['customer_id'] } }">
+                  <td>{{ oil['customer_name'] }} </td>
+                </router-link>
+                <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>{{ oil['customer_town'] }}</td>
+                <td>{{ oil['customer_address'] }}</td>
+                <td>
+                  <div v-if="oil['customer_asked_for_fill'] == 1">Fill</div>
+                  <div v-else> {{ oil['gallons_ordered'] }}</div>
+                </td>
+                <td>{{ oil['expected_delivery_date'] }}</td>
+                <td>
+                  <div v-if="oil['automatic'] == 0">No</div>
+                  <div v-else>Yes</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: 'finalizeTicket', params: { id: oil['id'] } }">
+                    <button class="btn btn-accent btn-sm">Finalize</button>
+                  </router-link>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          <div class="flex justify-center" v-if="recordsLength > 1">
+        <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="perPage" :options="options">
         </pagination>
         <div class="flex justify-center mb-10"> {{ recordsLength }} items Found</div>
       </div>
+        </div>
+      </div>
     </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 PaginationComp from '../../components/pagination.vue'
 import SideBar from '../../layouts/sidebar/sidebar.vue'
 import Footer from '../../layouts/footers/footer.vue'
-import {notify} from "@kyvg/vue3-notification";
+import { notify } from "@kyvg/vue3-notification";
 
 export default defineComponent({
   name: 'deliveryHome',
@@ -121,6 +129,8 @@ export default defineComponent({
 
   data() {
     return {
+      delivery_count: 0,
+      delivery_count_delivered: 0,
       token: null,
       user: null,
       deliveries: [],
@@ -140,6 +150,8 @@ export default defineComponent({
   },
   mounted() {
     this.getPage(this.page)
+    this.today_delivery_count()
+    this.today_delivery_delivered()
   },
   methods: {
     getPage: function (page: any) {
@@ -155,14 +167,14 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data.ok) {
+          if (response.data.ok) {
-              this.user = response.data.user;
+            this.user = response.data.user;
-            }
+          }
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-            this.user = null
+          this.user = null
-          })
+        })
     },
     get_oil_orders(page: any) {
       let path = import.meta.env.VITE_BASE_URL + '/delivery/all/' + page;
@@ -172,8 +184,11 @@ export default defineComponent({
         headers: authHeader(),
       }).then((response: any) => {
         this.deliveries = response.data
+        
       })
     },
+
+
     deleteCall(delivery_id: any) {
       let path = import.meta.env.VITE_BASE_URL + '/delivery/delete/' + delivery_id;
       axios({
@@ -197,10 +212,32 @@ export default defineComponent({
         }
       })
     },
+    today_delivery_count() {
+      let path = import.meta.env.VITE_BASE_URL + '/stats/delivery/count/today'
+      axios({
+        method: "get",
+        url: path,
+        withCredentials: true,
+        headers: authHeader(),
+      })
+        .then((response: any) => {
+          this.delivery_count = response.data.data;
+        })
+    },
+    today_delivery_delivered() {
+      let path = import.meta.env.VITE_BASE_URL + '/stats/delivery/count/delivered/today'
+      axios({
+        method: "get",
+        url: path,
+        withCredentials: true,
+        headers: authHeader(),
+      })
+        .then((response: any) => {
+          this.delivery_count_delivered = response.data.data;
+        })
+    },
   },
 })
 </script>
 
-<style scoped>
+<style scoped></style>
-
-</style>

src/pages/delivery/view.vue

@@ -1,12 +1,12 @@
 <template>
-  <Header/>
+  <Header />
 
   <div class="flex">
     <div class="">
-      <SideBar/>
+      <SideBar />
     </div>
     <div class=" w-full px-10">
-      <div class="text-sm breadcrumbs">
+      <div class="text-sm breadcrumbs mb-10">
         <ul>
           <li>
             <router-link :to="{ name: 'home' }">
@@ -22,7 +22,7 @@
       </div>
 
       <div class="grid grid-cols-1 rounded-md  pb-5">
-        <div class="text-[24px]">
+        <div class="text-2xl  border-b-2 border-gray-500 mb-10">
           View Oil Order # {{ deliveryOrder.id }}
         </div>
         <div class="grid grid-cols-12">
@@ -30,16 +30,16 @@
             <div class="col-span-12 font-bold">
               Customer
             </div>
-            <div class="col-span-6 bg-neutral p-5">
+            <div class="col-span-6 p-5 text-gray-500 text-sm">
               <div class="grid grid-cols-12">
-                <div class="col-span-12 font-bold flex mb-10 ">
+                <div class="col-span-12  flex  ">
-                {{ customer.account_number }}
+                  {{ customer.account_number }}
                 </div>
-                <div class="col-span-12 font-bold flex">
+                <div class="col-span-12  flex">
                   {{ customer.customer_first_name }}
                   {{ customer.customer_last_name }}
                 </div>
-                <div class="col-span-12 font-bold flex">
+                <div class="col-span-12 flex ">
                   <div class="pr-2">
                     {{ customer.customer_town }},
                   </div>
@@ -58,10 +58,10 @@
                   </div>
                 </div>
 
-                <div class="col-span-12 font-bold flex" v-if="customer.customer_apt !== 'None'">
+                <div class="col-span-12 flex" v-if="customer.customer_apt !== 'None'">
                   {{ customer.customer_apt }}
                 </div>
-                <div class="col-span-12 font-bold flex">
+                <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>
@@ -70,7 +70,7 @@
                   <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 font-bold flex">
+                <div class="col-span-12 flex">
                   {{ customer.customer_phone_number }}
                 </div>
               </div>
@@ -78,9 +78,9 @@
 
           </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 btn-accent">Edit Order</button>
+                <button class="btn btn-accent btn-sm">Edit Order</button>
               </router-link>
             </div>
           </div>
@@ -93,66 +93,72 @@
         <div class="col-span-12 font-bold">
           Delivery Status
         </div>
-        <div class="grid grid-cols-12 bg-neutral p-5">
+        <div class="grid grid-cols-12 p-5">
           <div class="col-span-12 font-bold">
             Status
           </div>
-          <div class="col-span-12">
+          <div class="col-span-12 text-sm mb-5 text-gray-500">
-            <div v-if="deliveryOrder.delivery_status  == 0">waiting</div>
+            <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 == 3">Cancelled</div>
-            <div v-else-if="deliveryOrder.delivery_status  == 4">Partial Delivery</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 == 5">misdelivery</div>
-                  <div v-else-if="deliveryOrder.delivery_status  == 6">unknown</div>
+            <div v-else-if="deliveryOrder.delivery_status == 6">unknown</div>
             <div v-else></div>
           </div>
-          <div class="col-span-12 font-bold mt-10">
+
+
+          <div class="col-span-12 font-bold ">
             Scheduled date/time
           </div>
-          <div class="col-span-12 ">
+          <div class="col-span-12 mb-5 text-sm text-gray-500">
             {{ deliveryOrder.expected_delivery_date }}
           </div>
-          <div class="col-span-12 font-bold mt-10">
+
+
+          <div class="col-span-12 font-bold">
             When Called
           </div>
-          <div class="col-span-12 ">
+          <div class="col-span-12 mb-5 text-sm text-gray-500">
             {{ format_date(deliveryOrder.when_ordered) }}
           </div>
-          <div class="col-span-12 font-bold mt-10">
+
-            <!-- Driver Name -->
+
+          <div class="col-span-12 font-bold ">
+            Driver:
           </div>
-          <div class="col-span-12 ">
+          <div class="col-span-12 text-gray-500">
             {{ deliveryOrder.driver_first_name }} {{ deliveryOrder.driver_last_name }}
           </div>
         </div>
       </div>
 
 
-      <div class="col-span-6 mt-5">
+      <div class="col-span-6">
         <div class="col-span-12 font-bold">
           Amount
         </div>
-        <div class="grid grid-cols-12 bg-neutral   p-5">
+        <div class="grid grid-cols-12 p-5">
-          <div class="col-span-12 font-bold">
+          <div class="col-span-12 text-sm text-gray-500">
-            <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>{{ deliveryOrder.gallons_ordered }}</div>
+            <div v-else>{{ deliveryOrder.gallons_ordered }} gallons</div>
           </div>
         </div>
       </div>
 
-      <div class="col-span-6 mt-5">
+      <div class="col-span-6 ">
         <div class="col-span-12 font-bold">
           Payment
         </div>
-        <div class="grid grid-cols-12 bg-neutral   p-5">
+        <div class="grid grid-cols-12 p-5">
-          <div class="col-span-12 font-bold">
+          <div class="col-span-12 text-sm">
-            <div v-if="deliveryOrder.payment_type==0">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 == 1">Credit Card</div>
-            <div v-else-if="deliveryOrder.payment_type==2">Credit Card & cash</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 ">
@@ -173,7 +179,7 @@
             </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 ">
@@ -200,20 +206,20 @@
         <div class="col-span-12 font-bold">
           Info
         </div>
-        <div class="grid grid-cols-12 bg-neutral   p-5">
+        <div class="grid grid-cols-12 p-5">
-          <div class="col-span-12 font-bold">
+          <div class="col-span-12 text-gray-500">
-            <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 class="col-span-12 text-gray-500">
-            <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>
@@ -223,11 +229,9 @@
         <div class="col-span-12 font-bold">
           Notes
         </div>
-        <div class="grid grid-cols-12 bg-neutral   p-5">
+        <div class="grid grid-cols-12 p-5">
-          <div class="col-span-12 font-bold">
+          <div class="col-span-12 text-gray-500">
-            <div v-if="deliveryOrder.dispatcher_notes!='None'">
+            {{ deliveryOrder.dispatcher_notes }}
-              {{ deliveryOrder.dispatcher_notes }}
-            </div>
           </div>
         </div>
       </div>
@@ -235,19 +239,19 @@
 
     </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"
 import moment from 'moment';
 
 export default defineComponent({
@@ -353,11 +357,11 @@ export default defineComponent({
   },
 
   methods: {
-    format_date(value: string){
+    format_date(value: string) {
-         if (value) {
+      if (value) {
-           return moment(String(value)).format('LLLL')
+        return moment(String(value)).format('LLLL')
-          }
+      }
-      },
+    },
 
     userStatus() {
       let path = import.meta.env.VITE_BASE_URL + '/auth/whoami';
@@ -367,12 +371,12 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data.ok) {
+          if (response.data.ok) {
-              this.user = response.data.user;
+            this.user = response.data.user;
-              this.user.id = response.data.user_id;
+            this.user.id = response.data.user_id;
-            }
+          }
-          })
+        })
     },
     getCustomer(user_id: any) {
       let path = import.meta.env.VITE_BASE_URL + "/customer/" + user_id;
@@ -381,16 +385,16 @@ export default defineComponent({
         url: path,
         withCredentials: true,
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            this.customer = response.data;
+          this.customer = response.data;
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-            notify({
+          notify({
-              title: "Error",
+            title: "Error",
-              text: "Could not find customer",
+            text: "Could not find customer",
-              type: "error",
+            type: "error",
-            });
           });
+        });
     },
     getPaymentCard(card_id: any) {
 
@@ -400,11 +404,11 @@ export default defineComponent({
         url: path,
         withCredentials: true,
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            this.userCard = response.data;
+          this.userCard = response.data;
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-          });
+        });
     },
 
     getOilOrder(delivery_id: any) {
@@ -415,15 +419,15 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data) {
+          if (response.data) {
-              this.deliveryOrder = response.data
+            this.deliveryOrder = response.data
-              this.getCustomer(this.deliveryOrder.customer_id)
+            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);
+              this.getPaymentCard(this.deliveryOrder.payment_card_id);
-              }
             }
-          })
+          }
+        })
     },
     getOilOrderMoney(delivery_id: any) {
       let path = import.meta.env.VITE_BASE_URL + "/delivery/order/money/" + delivery_id;
@@ -433,11 +437,11 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data) {
+          if (response.data) {
-              this.deliveryMoney = response.data
+            this.deliveryMoney = response.data
-            }
+          }
-          })
+        })
     },
   },
 })

src/pages/delivery/viewstatus/cancelled.vue

@@ -15,13 +15,11 @@
         </ul>
       </div>
 
-      <div class="flex start pb-10">Cancelled Deliveries </div>
+      <div class="flex start pb-10 text-2xl">Cancelled Deliveries </div>
-      <div class="flex justify-start pb-5">
+  
-      
-      </div>
 
-      <div class="overflow-x-auto">
+      <div class="overflow-x-auto bg-neutral">
-        <div class="flex start"> </div>
+     
         <table class="table">
           <!-- head -->
           <thead>

src/pages/delivery/viewstatus/delivered.vue

@@ -15,12 +15,10 @@
         </ul>
       </div>
 
-      <div class="flex start pb-10">Delivered Deliveries </div>
+      <div class="flex start pb-10 text-2xl">Delivered Deliveries </div>
-      <div class="flex justify-start pb-5">
-      
-      </div>
 
-      <div class="overflow-x-auto">
+
+      <div class="overflow-x-auto bg-neutral">
    
         <table class="table">
           <!-- head -->

src/pages/delivery/viewstatus/finalized.vue

@@ -15,12 +15,10 @@
         </ul>
       </div>
 
-      <div class="flex start pb-10">Finalized Delivery </div>
+      <div class="flex start pb-10 text-2xl">Finalized Delivery </div>
-      <div class="flex justify-start pb-5">
- 
-      </div>
 
-      <div class="overflow-x-auto">
+
+      <div class="overflow-x-auto bg-neutral">
           
           <table class="table">
             <!-- head -->

src/pages/delivery/viewstatus/issue.vue

@@ -15,13 +15,10 @@
         </ul>
       </div>
 
-      <div class="flex start pb-10">Issue with Delivery </div>
+      <div class="flex start pb-10 text-2xl">Issue with Delivery </div>
-      <div class="flex justify-start pb-5">
-     
-      </div>
 
-      <div class="overflow-x-auto">
+
-   
+      <div class="overflow-x-auto bg-neutral">
         <table class="table">
           <!-- head -->
           <thead>
@@ -81,7 +78,7 @@
                 <button class="btn btn-accent">View</button>
               </router-link>
               <router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
-                <button class="btn btn-accent btn-accent">Edit</button>
+                <button class="btn btn-accent ">Edit</button>
               </router-link>
               <button @click.prevent="deleteCall(oil['id'])" class="btn btn-accent">Delete</button>
             </td>

src/pages/delivery/viewstatus/out_for_delivery.vue

@@ -15,20 +15,18 @@
         </ul>
       </div>
 
-      <div class="flex start pb-10">Out for Delivery </div>
+      <div class="flex start pb-10 text-2xl">Todays Deliveries </div>
-      <div class="flex justify-start pb-5">
+      <div class="flex justify-end pb-5">
-        <button @click.prevent="printtTicketAll" class="btn btn-accent">
+        <button @click.prevent="printtTicketAll" class="btn btn-accent btn-sm">
           Print All
         </button>
       </div>
 
-      <div class="overflow-x-auto">
+      <div class="overflow-x-auto bg-neutral">
-
         <table class="table">
           <!-- head -->
           <thead>
             <tr>
-
               <th>Delivery Id</th>
               <th>Name</th>
               <th>Status</th>
@@ -48,7 +46,6 @@
 
               <td>{{ oil['id'] }} </td>
               <router-link :to="{ name: 'customerProfile', params: { id: oil['customer_id'] } }">
-
                 <td>{{ oil['customer_name'] }} </td>
               </router-link>
               <td>
@@ -84,15 +81,15 @@
 
               <td class="flex gap-5">
                 <router-link :to="{ name: 'deliveryOrder', params: { id: oil['id'] } }">
-                  <button class="btn btn-accent">View</button>
+                  <button class="btn btn-accent btn-sm">View</button>
                 </router-link>
                 <router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
-                  <button class="btn btn-accent">Edit</button>
+                  <button class="btn btn-accent btn-sm">Edit</button>
                 </router-link>
-                <button @click.prevent="deleteCall(oil['id'])" class="btn btn-accent">
+                <button @click.prevent="deleteCall(oil['id'])" class="btn btn-accent btn-sm">
                   Delete
                 </button>
-                <button @click.prevent="printTicket(oil['id'])" class="btn btn-accent">
+                <button @click.prevent="printTicket(oil['id'])" class="btn btn-accent btn-sm">
                   Print
                 </button>
               </td>
@@ -228,7 +225,7 @@ export default defineComponent({
     },
 
     printtTicketAll() {
-      let path = import.meta.env.VITE_PRINT_URL + '/command/printticket/all/print_today';
+      let path = import.meta.env.VITE_PRINT_URL + '/command/printticket/print_today';
       axios({
         method: 'delete',
         url: path,

src/pages/delivery/viewstatus/tommorrow.vue

@@ -5,7 +5,7 @@
       <SideBar />
     </div>
     <div class=" w-full px-10 ">
-      <div class="text-sm breadcrumbs  pb-10">
+      <div class="text-sm breadcrumbs  mb-10">
         <ul>
           <li>
             <router-link :to="{ name: 'home' }">
@@ -15,14 +15,14 @@
         </ul>
       </div>
 
-      <div class="flex start pb-10">Tommorrows Deliveries </div>
+      <div class="flex start pb-10 text-2xl">Tommorrows Deliveries </div>
-      <div class="flex justify-start pb-5">
+      <div class="flex justify-end pb-5">
-        <button @click.prevent="printtTicketAll" class="btn btn-accent">
+        <button @click.prevent="printtTicketAll" class="btn btn-accent btn-sm">
           Print All
         </button>
       </div>
 
-      <div class="overflow-x-auto">
+      <div class="overflow-x-auto bg-neutral">
         <div class="flex start"> </div>
         <table class="table">
           <!-- head -->
@@ -81,15 +81,15 @@
 
               <td class="flex gap-5">
                 <router-link :to="{ name: 'deliveryOrder', params: { id: oil['id'] } }">
-                  <button class="btn btn-accent">View</button>
+                  <button class="btn btn-accent btn-sm">View</button>
                 </router-link>
                 <router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
-                  <button class="btn btn-accent">Edit</button>
+                  <button class="btn btn-accent btn-sm">Edit</button>
                 </router-link>
-                <button @click.prevent="deleteCall(oil['id'])" class="btn btn-accent">
+                <button @click.prevent="deleteCall(oil['id'])" class="btn btn-accent btn-sm">
                   Delete
                 </button>
-                <button @click.prevent="printTicket(oil['id'])" class="btn btn-accent">
+                <button @click.prevent="printTicket(oil['id'])" class="btn btn-accent btn-sm">
                   Print
                 </button>
               </td>
@@ -171,7 +171,7 @@ export default defineComponent({
         })
     },
     get_oil_orders(page: any) {
-      let path = import.meta.env.VITE_BASE_URL + '/delivery/outfordelivery/' + page;
+      let path = import.meta.env.VITE_BASE_URL + '/delivery/tommorrow/' + page;
       axios({
         method: 'get',
         url: path,
@@ -207,7 +207,7 @@ export default defineComponent({
 
 
     printtTicketAll() {
-      let path = import.meta.env.VITE_PRINT_URL + '/command/printticket/all/print_tommorrow';
+      let path = import.meta.env.VITE_PRINT_URL + '/command/printticket/print_tommorrow';
       axios({
         method: 'delete',
         url: path,

src/pages/delivery/viewstatus/waiting.vue

@@ -15,103 +15,102 @@
         </ul>
       </div>
 
-      <div class="flex start pb-10">Waiting Deliveries </div>
+      <div class="flex start pb-10 text-2xl">Waiting Deliveries </div>
-      <div class="flex justify-start pb-5">
+      <div class="flex justify-end pb-5">
-        <button @click.prevent="printtTicketAll" class="btn btn-accent">
+        <button @click.prevent="printtTicketAll" class="btn btn-accent btn-sm">
           Print All
         </button>
       </div>
 
-      <div class="overflow-x-auto">
+      <div class="overflow-x-auto bg-neutral">
         <table class="table">
           <!-- head -->
           <thead>
-          <tr>
+            <tr>
-            <th>Ticket Id</th>
+              <th>Ticket Id</th>
-            <th>Name</th>
+              <th>Name</th>
-            <th>Status</th>
+              <th>Status</th>
-            <th>Town</th>
+              <th>Town</th>
-            <th>Address</th>
+              <th>Address</th>
-            <th>Gallons</th>
+              <th>Gallons</th>
-            <th>Date</th>
+              <th>Date</th>
-            <th>Automatic</th>
+              <th>Automatic</th>
-            <th>Prime</th>
+              <th>Prime</th>
-            <th>Same Day</th>
+              <th>Same Day</th>
-          </tr>
+            </tr>
           </thead>
           <tbody>
-          <!-- row 1 -->
+            <!-- row 1 -->
-          <tr v-for="oil in deliveries" :key="oil['id']">  
+            <tr v-for="oil in deliveries" :key="oil['id']">
-            <td>{{ oil['id'] }} </td>
+              <td>{{ oil['id'] }} </td>
               <router-link :to="{ name: 'customerProfile', params: { id: oil['customer_id'] } }">
                 <td>{{ oil['customer_name'] }} </td>
               </router-link>
-            <td>
+              <td>
-              <div v-if="oil['delivery_status'] == 0">Waiting</div>
+                <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'] == 1">delivered</div>
-              <div v-else-if="oil['delivery_status'] == 2">Out for Delivery</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'] == 3">Cancelled</div>
-              <div v-else-if="oil['delivery_status'] == 4">Partial Delivery</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'] == 5">Issue</div>
-               <div v-else-if="oil['delivery_status'] == 10">Finalized</div>
+                <div v-else-if="oil['delivery_status'] == 10">Finalized</div>
-              <div v-else></div>
+                <div v-else></div>
-            </td>
+              </td>
 
-            <td>{{ oil['customer_town'] }}</td>
+              <td>{{ oil['customer_town'] }}</td>
-            <td>{{ oil['customer_address'] }}</td>
+              <td>{{ oil['customer_address'] }}</td>
-            <td>
+              <td>
-              <div v-if="oil['customer_asked_for_fill'] == 1">Fill</div>
+                <div v-if="oil['customer_asked_for_fill'] == 1">Fill</div>
-              <div v-else> {{ oil['gallons_ordered'] }}</div>
+                <div v-else> {{ oil['gallons_ordered'] }}</div>
-            </td>
+              </td>
-            <td>{{ oil['expected_delivery_date'] }}</td>
+              <td>{{ oil['expected_delivery_date'] }}</td>
-            <td>
+              <td>
-              <div v-if="oil['automatic'] == 0">No</div>
+                <div v-if="oil['automatic'] == 0">No</div>
-              <div v-else>Yes</div>
+                <div v-else>Yes</div>
-            </td>
+              </td>
-            <td>
+              <td>
-              <div v-if="oil['prime'] == 0">No</div>
+                <div v-if="oil['prime'] == 0">No</div>
-              <div v-else>Yes</div>
+                <div v-else>Yes</div>
-            </td>
+              </td>
-            <td>
+              <td>
-              <div v-if="oil['same_day'] == 0">No</div>
+                <div v-if="oil['same_day'] == 0">No</div>
-              <div v-else>Yes</div>
+                <div v-else>Yes</div>
-            </td>
+              </td>
 
-            <td class="flex gap-5">
+              <td class="flex gap-5">
-              <router-link :to="{ name: 'deliveryOrder', params: { id: oil['id'] } }">
+                <router-link :to="{ name: 'deliveryOrder', params: { id: oil['id'] } }">
-                <button class="btn btn-accent">View</button>
+                  <button class="btn btn-accent btn-sm">View</button>
-              </router-link>
+                </router-link>
-              <router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
+                <router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
-                <button class="btn btn-accent">Edit</button>
+                  <button class="btn btn-accent btn-sm">Edit</button>
-              </router-link>
+                </router-link>
-              <button @click.prevent="deleteCall(oil['id'])" class="btn btn-accent">Delete</button>
+                <button @click.prevent="deleteCall(oil['id'])" class="btn btn-accent btn-sm">Delete</button>
-              <button @click.prevent="printTicket(oil['id'])" class="btn btn-accent">Print</button>
+                <button @click.prevent="printTicket(oil['id'])" class="btn btn-accent btn-sm">Print</button>
-            </td>
+              </td>
-          </tr>
+            </tr>
           </tbody>
         </table>
       </div>
       <div class="flex justify-center" v-if="recordsLength > 9">
-        <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="perPage"
+        <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="perPage" :options="options">
-                    :options="options">
         </pagination>
         <div class="flex justify-center mb-10"> {{ recordsLength }} items Found</div>
       </div>
     </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 PaginationComp from '../../../components/pagination.vue'
 import SideBar from '../../../layouts/sidebar/sidebar.vue'
 import Footer from '../../../layouts/footers/footer.vue'
-import {notify} from "@kyvg/vue3-notification";
+import { notify } from "@kyvg/vue3-notification";
 
 export default defineComponent({
   name: 'deliveryWaiting',
@@ -158,14 +157,14 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data.ok) {
+          if (response.data.ok) {
-              this.user = response.data.user;
+            this.user = response.data.user;
-            }
+          }
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-            this.user = null
+          this.user = null
-          })
+        })
     },
     get_oil_orders(page: any) {
       let path = import.meta.env.VITE_BASE_URL + '/delivery/waiting/' + page;
@@ -201,7 +200,7 @@ export default defineComponent({
       })
     },
     printtTicketAll() {
-      let path = import.meta.env.VITE_PRINT_URL + '/command/printticket/all/print_waiting';
+      let path = import.meta.env.VITE_PRINT_URL + '/command/printticket/print_waiting';
       axios({
         method: 'delete',
         url: path,
@@ -251,6 +250,4 @@ export default defineComponent({
 })
 </script>
 
-<style scoped>
+<style scoped></style>
-
-</style>

src/pages/employee/edit.vue

@@ -30,7 +30,7 @@
             <div class="mb-4">
               <label class="block text-white text-sm font-bold mb-2">First Name</label>
               <input v-model="CreateEmployeeForm.basicInfo.employee_first_name"
-                class="input input-bordered w-full max-w-xs" id="title" type="text" placeholder="First Name" />
+                class="input input-bordered input-sm w-full max-w-xs" id="title" type="text" placeholder="First Name" />
               <span v-if="v$.CreateEmployeeForm.basicInfo.employee_first_name.$error" class="text-red-600 text-center">
                 {{ v$.CreateEmployeeForm.basicInfo.employee_first_name.$errors[0].$message }}
               </span>
@@ -41,7 +41,7 @@
             <div class="mb-4">
               <label class="block text-white text-sm font-bold mb-2">Last Name</label>
               <input v-model="CreateEmployeeForm.basicInfo.employee_last_name"
-                class="input input-bordered w-full max-w-xs" id="title" type="text" placeholder="Last Name" />
+                class="input input-bordered input-sm w-full max-w-xs" id="title" type="text" placeholder="Last Name" />
               <span v-if="v$.CreateEmployeeForm.basicInfo.employee_last_name.$error" class="text-red-600 text-center">
                 {{ v$.CreateEmployeeForm.basicInfo.employee_last_name.$errors[0].$message }}
               </span>
@@ -52,7 +52,7 @@
             <div class="flex gap-5">
               <div class="flex-1 mb-4">
                 <label class="block text-white text-sm font-bold mb-2">Type of employee</label>
-                <select class="select select-bordered w-full max-w-xs" aria-label="Default select example"
+                <select class="select select-bordered select-sm w-full max-w-xs" aria-label="Default select example"
                   id="employee_type" v-model="CreateEmployeeForm.basicInfo.employee_type">
                   <option class="text-white" v-for="(employee, index) in employList" :key="index"
                     :value="employee['value']">
@@ -68,7 +68,8 @@
             <!-- street address -->
             <div class="col-span-12 mb-5 md:mb-5">
               <label class="block text-white text-sm font-bold mb-2">Street Address</label>
-              <input v-model="CreateEmployeeForm.basicInfo.employee_address" class="input input-bordered w-full max-w-xs"
+              <input v-model="CreateEmployeeForm.basicInfo.employee_address" 
+              class="input input-bordered input-sm w-full max-w-xs"
                 id="address" type="text" placeholder="Address" />
               <span v-if="v$.CreateEmployeeForm.basicInfo.employee_address.$error" class="text-red-600 text-center">
                 {{ v$.CreateEmployeeForm.basicInfo.employee_address.$errors[0].$message }}
@@ -78,14 +79,16 @@
             <!-- apt -->
             <div class="col-span-12 mb-5 md:mb-5">
 
-              <input v-model="CreateEmployeeForm.basicInfo.employee_apt" class="input input-bordered w-full max-w-xs"
+              <input v-model="CreateEmployeeForm.basicInfo.employee_apt"
+               class="input input-bordered input-sm w-full max-w-xs"
                 id="apt" type="text" placeholder="Apt, suite, unit, building, floor, etc" />
             </div>
 
             <!-- employee_town -->
             <div class="col-span-12 md:col-span-4 mb-20 md:mb-5 ">
               <label class="block text-white text-sm font-bold mb-2">Town</label>
-              <input v-model="CreateEmployeeForm.basicInfo.employee_town" class="input input-bordered w-full max-w-xs"
+              <input v-model="CreateEmployeeForm.basicInfo.employee_town"
+               class="input input-bordered input-sm w-full max-w-xs"
                 id="city" type="text" placeholder="Town" />
               <span v-if="v$.CreateEmployeeForm.basicInfo.employee_town.$error" class="text-red-600 text-center">
                 {{ v$.CreateEmployeeForm.basicInfo.employee_town.$errors[0].$message }}
@@ -96,7 +99,7 @@
             <div class="col-span-12 md:col-span-4 mb-5 md:mb-5">
               <label class="block text-white text-sm font-bold mb-2">Phone Number</label>
               <input v-model="CreateEmployeeForm.basicInfo.employee_phone_number" @input="acceptNumber()"
-                class="input input-bordered w-full max-w-xs" id="phone number" type="text" placeholder="Phone Number" />
+                class="input input-bordered input-sm w-full max-w-xs" id="phone number" type="text" placeholder="Phone Number" />
               <span v-if="v$.CreateEmployeeForm.basicInfo.employee_phone_number.$error" class="text-red-600 text-center">
                 {{ v$.CreateEmployeeForm.basicInfo.employee_phone_number.$errors[0].$message }}
               </span>
@@ -105,7 +108,7 @@
             <!-- state -->
             <div class="flex-1 mb-4">
               <label class="block text-white text-sm font-bold mb-2">State</label>
-              <select class="select select-bordered w-full max-w-xs" aria-label="Default select example"
+              <select class="select select-bordered select-sm w-full max-w-xs" aria-label="Default select example"
                 id="employee_state" v-model="CreateEmployeeForm.basicInfo.employee_state">
                 <option class="text-white" v-for="(state, index) in stateList" :key="index" defaultValue="state_default"
                   :value="state['value']">
@@ -120,7 +123,8 @@
             <!-- zip -->
             <div class="col-span-12 md:col-span-4 mb-5 md:mb-0">
               <label class="block text-white text-sm font-bold mb-2">Zip Code</label>
-              <input v-model="CreateEmployeeForm.basicInfo.employee_zip" class="input input-bordered w-full max-w-xs"
+              <input v-model="CreateEmployeeForm.basicInfo.employee_zip" 
+              class="input input-bordered input-sm w-full max-w-xs"
                 id="zip" type="text" placeholder="Zip" />
               <span v-if="v$.CreateEmployeeForm.basicInfo.employee_zip.$error" class="text-red-600 text-center">
                 {{ v$.CreateEmployeeForm.basicInfo.employee_zip.$errors[0].$message }}
@@ -130,25 +134,25 @@
 
             <div class="mb-4">
               <label class="block text-white text-sm font-bold mb-2">Employee BirthDay</label>
-              <input v-model="CreateEmployeeForm.basicInfo.employee_birthday" class="input input-bordered w-full max-w-xs"
+              <input v-model="CreateEmployeeForm.basicInfo.employee_birthday" 
+              class="input input-bordered input-sm w-full max-w-xs"
                 id="title" type="date" min="1945-01-01" max="2030-01-01" />
-
             </div>
 
-
             <div class="text-[18px] mt-10 mb-10">Employee Dates</div>
 
 
             <div class="mb-4">
               <label class="block text-white text-sm font-bold mb-2">Employee Start Date</label>
               <input v-model="CreateEmployeeForm.basicInfo.employee_start_date"
-                class="input input-bordered w-full max-w-xs" id="title" type="date" min="2023-01-01" max="2030-01-01" />
+                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">Employee End Date</label>
-              <input v-model="CreateEmployeeForm.basicInfo.employee_end_date" class="input input-bordered w-full max-w-xs"
+              <input v-model="CreateEmployeeForm.basicInfo.employee_end_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>

src/pages/employee/home.vue

@@ -5,7 +5,7 @@
       <SideBar />
     </div>
     <div class=" w-full px-10 ">
-      <div class="text-sm breadcrumbs">
+      <div class="text-sm breadcrumbs mb-10">
         <ul>
           <li>
             <router-link :to="{ name: 'home' }">
@@ -19,18 +19,20 @@
           </li>
         </ul>
       </div>
-      <div class="flex justify-end">
+
+      <div class="flex start pb-10 text-2xl">Employees </div>
+      <div class="flex justify-end mb-10">
         <router-link :to="{ name: 'employeeCreate' }">
-          <button class="btn btn-accent">Create Employee</button>
+          <button class="btn btn-accent btn-sm">Create Employee</button>
         </router-link>
       </div>
 
-      <div class="overflow-x-auto">
+      <div class="overflow-x-auto bg-neutral">
         <table class="table">
           <!-- head -->
           <thead>
             <tr>
-        
+              <th>Employee ID</th>
               <th>Name</th>
               <th>Type</th>
               <th>Town</th>
@@ -41,7 +43,7 @@
           <tbody>
             <!-- row 1 -->
             <tr v-for="person in employees" :key="person['id']">
-
+              <td>{{ person['id'] }} </td>
               <td>{{ person['employee_first_name'] }} {{ person['employee_last_name'] }}</td>
               <td>
                 <div v-if="person['employee_type'] == 0">Owner</div>
@@ -61,10 +63,10 @@
               <td>{{ person['employee_phone_number'] }}</td>
               <td class="flex gap-5">
                 <router-link :to="{ name: 'employeeEdit', params: { id: person['id'] } }">
-                  <button class="btn btn-accent">Edit</button>
+                  <button class="btn btn-accent btn-sm">Edit</button>
                 </router-link>
-                     <router-link :to="{ name: 'employeeProfile', params: { id: person['id'] } }">
+                <router-link :to="{ name: 'employeeProfile', params: { id: person['id'] } }">
-                  <button class="btn btn-accent">View</button>
+                  <button class="btn btn-accent btn-sm">View</button>
                 </router-link>
               </td>
             </tr>

src/pages/employee/profile/home.vue

@@ -1,10 +1,10 @@
 <template>
-  <Header/>
+  <Header />
 
   <div class="wrapper">
     <div class="flex">
       <div class="">
-        <SideBar/>
+        <SideBar />
       </div>
       <div class=" w-full px-10 ">
         <div class="text-sm breadcrumbs">
@@ -24,56 +24,53 @@
           <div class=" w-full mt-10" v-if="loaded">
             <div class="grid grid-cols-12 gap-5 ">
               <div class="col-span-3 ">
-                <img src="../../../assets/images/user_placeholder.png"
+                <img src="../../../assets/images/user_placeholder.png" alt="Drone Image" width="200" height="250" />
-                     alt="Drone Image"
-                     width="200"
-                     height="250"/>
               </div>
-              <div class="col-span-9 bg-neutral">
+              <div class="col-span-9">
                 <div class="grid grid-cols-12">
-                <div class="col-span-12 font-bold flex justify-end">
+                  <div class="col-span-12 font-bold flex justify-end">
-                <div class="btn">
+                    <div class="btn">
-              <router-link :to="{ name: 'employeeEdit', params: { id: employee.id } }" >
+                      <router-link :to="{ name: 'employeeEdit', params: { id: employee.id } }">
-                Edit Employee
+                        Edit Employee
-              </router-link>
+                      </router-link>
-                </div>
+                    </div>
-                </div>
+                  </div>
-                <div class="col-span-12 font-bold flex">
+                  <div class="col-span-12 font-bold flex">
-                  {{ employee.employee_first_name }}
+                    {{ employee.employee_first_name }}
-                  {{ employee.employee_last_name }}
+                    {{ employee.employee_last_name }}
-                </div>
+                  </div>
-                <div class="col-span-12 font-bold flex">
+                  <div class="col-span-12 font-bold flex">
-                  {{ employee.employee_address }}
+                    {{ employee.employee_address }}
-                  <div v-if="employee.employee_apt != 'None'">
+                    <div v-if="employee.employee_apt != 'None'">
+                      {{ employee.employee_apt }}
+                    </div>
+                  </div>
+                  <div class="col-span-12 font-bold flex">
+                    <div class="pr-2">
+                      {{ employee.employee_town }},
+                    </div>
+
+                    <div class="pr-2">
+                      <div v-if="employee.employee_state == '0'">Massachusetts</div>
+                      <div v-else-if="employee.employee_state == '1'">Rhode Island</div>
+                      <div v-else-if="employee.employee_state == '2'">New Hampshire</div>
+                      <div v-else-if="employee.employee_state == '3'">Maine</div>
+                      <div v-else-if="employee.employee_state == '4'">Vermont</div>
+                      <div v-else-if="employee.employee_state == '5'">Maine</div>
+                      <div v-else-if="employee.employee_state == '6'">New York</div>
+                      <div v-else>Unknown state</div>
+                    </div>
+                    <div class="pr-2">
+                      {{ employee.employee_zip }}
+                    </div>
+                  </div>
+                  <div class="col-span-12 font-bold flex" v-if="employee.employee_apt !== 'None'">
                     {{ employee.employee_apt }}
                   </div>
-                </div>
+                  <div class="col-span-12 font-bold flex">
-                <div class="col-span-12 font-bold flex">
+                    {{ employee.employee_phone_number }}
-                  <div class="pr-2">
-                    {{ employee.employee_town }},
                   </div>
-
+                  <div class="col-span-12 font-bold flex">
-                  <div class="pr-2">
-                    <div v-if="employee.employee_state == '0'">Massachusetts</div>
-                    <div v-else-if="employee.employee_state == '1'">Rhode Island</div>
-                    <div v-else-if="employee.employee_state == '2'">New Hampshire</div>
-                    <div v-else-if="employee.employee_state == '3'">Maine</div>
-                    <div v-else-if="employee.employee_state == '4'">Vermont</div>
-                    <div v-else-if="employee.employee_state == '5'">Maine</div>
-                    <div v-else-if="employee.employee_state == '6'">New York</div>
-                    <div v-else>Unknown state</div>
-                  </div>
-                  <div class="pr-2">
-                    {{ employee.employee_zip }}
-                  </div>
-                </div>
-                <div class="col-span-12 font-bold flex" v-if="employee.employee_apt !== 'None'">
-                  {{ employee.employee_apt }}
-                </div>
-                <div class="col-span-12 font-bold flex">
-                  {{ employee.employee_phone_number }}
-                </div>
-                <div class="col-span-12 font-bold flex">
                     <div v-if="employee.employee_type == '0'">owner</div>
                     <div v-else-if="employee.employee_type == '1'">manager</div>
                     <div v-else-if="employee.employee_type == '2'">secretary</div>
@@ -81,15 +78,15 @@
                     <div v-else-if="employee.employee_type == '4'">driver</div>
                     <div v-else-if="employee.employee_type == '5'">tech</div>
                     <div v-else-if="employee.employee_type == '6'">contract</div>
-                  <div v-else-if="employee.employee_type == '7'">cash</div>
+                    <div v-else-if="employee.employee_type == '7'">cash</div>
-                  <div v-else-if="employee.employee_type == '8'">driver/tech</div>
+                    <div v-else-if="employee.employee_type == '8'">driver/tech</div>
                     <div v-else>Unknown employee type</div>
+                  </div>
                 </div>
               </div>
-              </div>
             </div>
 
-            <div class="col-span-12 bg-neutral p-5 mt-5">
+            <div class="col-span-12 p-5 mt-5">
               <div class="grid grid-cols-12">
                 <div class="col-span-12 font-bold flex text-2xl">
                   Delivery
@@ -112,11 +109,11 @@
       </div>
     </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'
@@ -140,19 +137,19 @@ export default defineComponent({
       user: null,
       loaded: false,
       employee: {
-          id: '',
+        id: '',
-          employee_last_name: "",
+        employee_last_name: "",
-          employee_first_name: "",
+        employee_first_name: "",
-          employee_town: "",
+        employee_town: "",
-          employee_address: "",
+        employee_address: "",
-          employee_apt: "",
+        employee_apt: "",
-          employee_zip: "",
+        employee_zip: "",
-          employee_birthday: "",
+        employee_birthday: "",
-          employee_phone_number: "",
+        employee_phone_number: "",
-          employee_start_date: "",
+        employee_start_date: "",
-          employee_end_date: "",
+        employee_end_date: "",
-          employee_type: '',
+        employee_type: '',
-          employee_state:'',
+        employee_state: '',
       },
     }
   },
@@ -181,17 +178,17 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       })
-          .then((response: any) => {
+        .then((response: any) => {
-            if (response.data.ok) {
+          if (response.data.ok) {
-              this.user = response.data.user;
+            this.user = response.data.user;
-            }
+          }
-          })
+        })
-          .catch(() => {
+        .catch(() => {
-            this.user = null
+          this.user = null
-          })
+        })
     },
 
-    getEmployee (userid:any) {
+    getEmployee(userid: any) {
       let path = import.meta.env.VITE_BASE_URL + "/employee/" + userid;
       axios({
         method: "get",

src/pages/ticket/routes.ts

@@ -0,0 +1,18 @@
+
+
+
+import Ticket from "../ticket/ticket.vue";
+
+
+
+const payRoutes = [
+    {
+        path: '/ticket/:id',
+        name: 'Ticket',
+        component: Ticket,
+    },
+   
+]
+
+export default payRoutes
+//sourceMappingURL=index.ts.map

src/pages/ticket/ticket.vue

@@ -0,0 +1,231 @@
+<template>
+
+    <div class=" absolute" id="page">
+
+
+        <div class="p-10 max-w-5xl bg-white text-black">
+            <div class="grid grid-cols-12">
+                <div class="col-span-9">
+                    <div class="grid grid-cols-12 pb-10">
+                        <div class="col-span-2">#2 Heating</div>
+                        <div class="col-span-2"></div>
+                        <div class="col-span-2">0</div>
+                        <div class="col-span-2">275</div>
+                        <div class="col-span-2">{{ customer.customer_phone_number }}</div>
+                    </div>
+                    <div class="grid grid-cols-12 pl-5 pb-10">
+                        <div class="col-span-8">{{ customer.customer_first_name }} {{ customer.customer_last_name }}
+                        </div>
+                        <div class="col-span-4">{{ customer.account_number }}</div>
+                        <div class="col-span-12">{{ customer.customer_address }} {{ customer.customer_apt }}</div>
+                        <div class="col-span-3">
+                            <div class="grid grid-cols-12">
+                                <div class="col-span-5"> {{ customer.customer_town }}</div>
+                                <div class="col-span-3">{{ customer.customer_state }}</div>
+                                <div class="col-span-4"> {{ customer.customer_zip }}</div>
+                            </div>
+
+                        </div>
+                    </div>
+                    <div class="grid grid-cols-12 pl-5 pb-10">
+                        <div class="col-span-12 pb-5">{{ delivery.dispatcher_notes }}</div>
+                        <div class="col-span-12" v-if="delivery.payment_type == 0">CASH</div>
+                        <div class="col-span-12" v-else-if="delivery.payment_type == 1">Credit Card</div>
+                        <div class="col-span-12" v-else-if="delivery.payment_type == 2">Credit Card/Cash</div>
+                        <div class="col-span-12" v-else></div>
+                    </div>
+                    <div class="grid grid-cols-12">
+                        <div class="col-span-6 flex" v-for="past_delivery in past_deliveries">
+                            <div>{{ past_delivery.when_delivered }} - {{ past_delivery.gallons_delivered }}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-span-3">
+                    <div class="grid grid-cols-12">
+                        <div class="col-span-12 h-7">{{ delivery.when_ordered }}</div>
+                        <div class="col-span-12 h-7 ">{{ delivery.expected_delivery_date }}</div>
+                        <div class="col-span-12 h-7 "></div>
+                        <div class="col-span-12 h-7">{{ delivery.customer_price }}</div>
+                        <div class="col-span-12 h-7">{{ delivery.when_ordered }}</div>
+                        <div class="col-span-12 h-7"></div>
+                        <div class="col-span-12 h-7"></div>
+                        <div class="col-span-12 h-7 ">{{ delivery.driver_employee_id }}</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+
+<script lang="ts">
+
+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 { minLength, required } from "@vuelidate/validators";
+
+export default defineComponent({
+    name: 'Ticket',
+
+    components: {
+        Header,
+        SideBar,
+        Footer,
+
+    },
+
+    data() {
+        return {
+            v$: useValidate(),
+            loaded: false,
+            user: {
+                user_id: 0,
+            },
+            past_deliveries: [
+                {
+                    gallons_delivered: 0,
+                    when_delivered: '',
+                }
+            ],
+            delivery: {
+                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: '',
+                automatic: 0,
+                oil_id: 0,
+                supplier_price: '',
+                customer_price: '',
+                customer_temperature: '',
+                dispatcher_notes: '',
+                prime: 0,
+                same_day: 0,
+                payment_type: 0,
+                payment_card_id: 0,
+                driver_employee_id: 0,
+                driver_first_name: '',
+                driver_last_name: '',
+            },
+            customer: {
+                id: 0,
+                user_id: 0,
+                customer_first_name: '',
+                customer_last_name: '',
+                customer_town: '',
+                customer_address: '',
+                customer_state: 0,
+                customer_zip: '',
+                customer_apt: '',
+                customer_home_type: 0,
+                customer_phone_number: '',
+                account_number: '',
+            },
+
+        }
+    },
+    validations() {
+        return {
+            CreateOilOrderForm: {
+                basicInfo: {
+                    gallons_ordered: { required, minLength: minLength(1) },
+                    expected_delivery_date: { required },
+                },
+            },
+        };
+    },
+    created() {
+        this.userStatus()
+
+    },
+    watch: {
+        $route() {
+
+        },
+    },
+    mounted() {
+        this.getOilOrder(this.$route.params.id)
+
+    },
+
+    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;
+                    }
+                })
+
+        },
+        getOilOrder(delivery_id: any) {
+            let path = import.meta.env.VITE_BASE_URL + "/delivery/order/" + delivery_id;
+            axios({
+                method: "get",
+                url: path,
+                withCredentials: true,
+            })
+                .then((response: any) => {
+                    this.delivery = response.data;
+                    this.getCustomer(this.delivery.customer_id)
+                })
+                .catch(() => {
+                    notify({
+                        title: "Error",
+                        text: "Could not get oil order",
+                        type: "error",
+                    });
+                });
+        },
+
+        getCustomer(userid: any) {
+            let path = import.meta.env.VITE_BASE_URL + '/customer/' + userid;
+            axios({
+                method: 'get',
+                url: path,
+                headers: authHeader(),
+            }).then((response: any) => {
+                this.customer = response.data
+                this.getPastDeliveries(this.customer.id)
+            })
+        },
+
+        getPastDeliveries(userid: any) {
+            let path = import.meta.env.VITE_BASE_URL + '/delivery/past/' + userid;
+            axios({
+                method: 'get',
+                url: path,
+                headers: authHeader(),
+            }).then((response: any) => {
+                this.past_deliveries = response.data
+            })
+        },
+
+    },
+})
+</script>
+
+<style scoped></style>

src/router/index.ts

@@ -10,6 +10,8 @@ import cardRoutes from '../pages/card/routes.ts'
 import autoRoutes from '../pages/automatic/routes.ts'
 import Error404 from '../pages/error/Error404.vue'
 import adminRoutes from "../pages/admin/routes.ts";
+import tickerRoutes from "../pages/ticket/routes.ts";
+
 
 const routes = [
     ...cardRoutes,
@@ -20,6 +22,7 @@ const routes = [
     ...oilRoutes,
     ...autoRoutes,
     ...adminRoutes,
+    ...tickerRoutes,
     {
         path: '/',
         name: 'home',

tailwind.config.js

@@ -6,11 +6,11 @@ module.exports = {
     // themes: ["dracula" ],
     themes: [{
       mytheme: {
-        "primary": "#0256bf",
+        "primary": "#010409",
-        "secondary": "#262732",
+        "secondary": "#161B22",
-        "accent": "#161fac",
+        "accent": "#0256bf",
-        "neutral": "#1e1d24",
+        "neutral": "#21262C",
-        "base-100": "#1e1d24",
+        "base-100": "#0D1117",
         "info": "#74a0d5",
         "success": "#33cc33",
         "warning": "#97520C",

tsconfig.json

@@ -5,6 +5,7 @@
     "module": "ESNext",
     "lib": ["ES2020", "DOM", "DOM.Iterable"],
     "skipLibCheck": true,
+    
 
     /* Bundler mode */
     "moduleResolution": "bundler",