Added checks and updated ticket

src/layouts/footers/footer.vue

@@ -1,24 +1,22 @@
 <template>
   <footer class="footer p-10 bg-neutral text-neutral-content mt-20 bg-secondary">
     <nav>
-      <h6 class="footer-title">Services</h6>
+      <h6 class="footer-title">Social</h6>
-      <a class="link link-hover">Branding</a>
+      <a class="link link-hover" href="https://www.facebook.com/auburnoil">Facebook</a>
-      <a class="link link-hover">Design</a>
+      <a class="link link-hover" href="https://www.google.com/search?client=firefox-b-1-d&sca_esv=02c44965d6d4b280&sca_upv=1&cs=1&output=search&kgmid=/g/11wcbqrx5l&q=Auburn+Oil&shndl=30&shem=lsde&source=sh/x/loc/act/m1/1&kgs=52995d809762cd61">Google</a>
-      <a class="link link-hover">Marketing</a>
+      <a class="link link-hover" href="auburnoil.com">Website</a>
-      <a class="link link-hover">Advertisement</a>
     </nav>
     <nav>
-      <h6 class="footer-title">Company</h6>
+      <h6 class="footer-title">Quick Call</h6>
-      <a class="link link-hover">About us</a>
+      <a class="link link-hover">Trask Tank Worcester - (508) 791-5064</a>
-      <a class="link link-hover">Contact</a>
+      <a class="link link-hover">Eddys Truck - (508) 304-9552</a>
-      <a class="link link-hover">Jobs</a>
+      <a class="link link-hover">Spring Rebuilders - (508) 799-9342</a>
-      <a class="link link-hover">Press kit</a>
     </nav>
     <nav>
-      <h6 class="footer-title">Legal</h6>
+      <h6 class="footer-title">Other</h6>
-      <a class="link link-hover">Terms of use</a>
+      <a class="link link-hover"></a>
-      <a class="link link-hover">Privacy policy</a>
+      <a class="link link-hover"></a>
-      <a class="link link-hover">Cookie policy</a>
+      <a class="link link-hover"></a>
     </nav>
   </footer>
 </template>

src/layouts/headers/headerauth.vue

@@ -14,6 +14,9 @@
     </div>
 
     <div class="basis-1/2 md:basis-1/4 justify-end gap-5">
+
+      <!-- <button class="btn btn-green btn-sm" @click.prevent="increaseCall()">Call</button> -->
+
       <router-link :to="{ name: 'customerCreate' }">
         <button class="btn btn-accent btn-sm">Create Customer</button>
       </router-link>
@@ -198,6 +201,21 @@ export default defineComponent({
 
         })
     },
+    increaseCall() {
+      let path = import.meta.env.VITE_BASE_URL + '/stats/calls/add';
+
+      axios({
+        method: "put",
+        url: path,
+        withCredentials: true,
+        headers: authHeader(),
+      })
+        .then((response: any) => {
+          this.number++;
+
+        })
+    },
+
     getCompany() {
       let path = import.meta.env.VITE_BASE_URL + '/admin/company/' + import.meta.env.VITE_COMPANY_ID;
       axios({

src/pages/Index.vue

@@ -24,6 +24,9 @@
             <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 class="col-span-6 py-2"> Total Calls: {{ call_count }}</div> -->
+         
           </div>
         </div>
 
@@ -67,10 +70,13 @@ export default defineComponent({
     SideBar,
     Footer,
   },
-
+  props: {
+        clickCount: Number
+    },
   data() {
     return {
       token: null,
+      call_count:0,
       delivery_count: 0,
       delivery_count_delivered: 0,
       price_from_supplier: 0,
@@ -107,6 +113,7 @@ export default defineComponent({
   created() {
     this.userStatus()
     this.today_delivery_count()
+    this.today_delivery_delivered()
     this.today_price_oil()
 
   },
@@ -146,7 +153,18 @@ export default defineComponent({
 
         })
     },
-
+    total_calls() {
+      let path = import.meta.env.VITE_BASE_URL + '/stats/call/count/today'
+      axios({
+        method: "get",
+        url: path,
+        withCredentials: true,
+        headers: authHeader(),
+      })
+        .then((response: any) => {
+          this.call_count = response.data.data;
+        })
+    },
     today_delivery_count() {
       let path = import.meta.env.VITE_BASE_URL + '/stats/delivery/count/today'
       axios({
@@ -168,6 +186,7 @@ export default defineComponent({
         headers: authHeader(),
       })
         .then((response: any) => {
+          console.log(response.data)
           this.delivery_count_delivered = response.data.data;
         })
     },

src/pages/customer/profile/home.vue

@@ -286,24 +286,26 @@
                         <div v-if="oil['same_day'] == 0">No</div>
                         <div v-else>Yes</div>
                       </td>
-                      <td class="lg:flex">
+                      <td class="flex gap-5 ">
-                        <div class="pb-2 pr-2">
+                    
                         <router-link  :to="{ name: 'Ticket', params: { id: oil['id'] } }">
-                        <button class="btn btn-accent btn-sm">
+                          <button class="btn btn-accent btn-sm">
-                          Print
+                            Print
-                        </button>
+                          </button>
-                      </router-link>
+                        </router-link>
-                    </div>
+
-                    <div class="pb-2 pr-2">
                         <router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
                           <button class="btn btn-sm btn-accent">Edit</button>
                         </router-link>
-                        </div>
+                        
-                        <div class="pb-2 pr-2">
+                        <router-link :to="{ name: 'finalizeTicket', params: { id: oil['id'] } }">
+                        <button class="btn btn-sm btn-accent">Finalize</button>
+                        </router-link>
+
                         <a @click.prevent="deleteCall(oil['id'])">
                           <button class="btn btn-sm btn-error">Delete</button>
                         </a>
-                        </div>
+                     
                       </td>
                     </tr>
                   </tbody>

src/pages/delivery/edit.vue

@@ -244,6 +244,7 @@ export default defineComponent({
       deliveryStatus: [],
       truckDriversList: [],
       userCards: [],
+
       userCard: {
         date_added: '',
         user_id: '',
@@ -312,6 +313,7 @@ export default defineComponent({
           credit_card_id: 0,
           cash: false,
           card: false,
+          other: false,
           check: false,
           driver_driver: '',
         },
@@ -413,6 +415,13 @@ export default defineComponent({
               this.CreateOilOrderForm.basicInfo.cash = false
               this.CreateOilOrderForm.basicInfo.check = true
             }
+            // Other
+            if (response.data.delivery.payment_type == 4) {
+              this.CreateOilOrderForm.basicInfo.card = false
+              this.CreateOilOrderForm.basicInfo.cash = false
+              this.CreateOilOrderForm.basicInfo.check = false
+              this.CreateOilOrderForm.basicInfo.other = true
+            }
             
           }
         })

src/pages/delivery/routes.ts

@@ -8,7 +8,7 @@ import finalizeTicket from './update_tickets/finalize_ticket.vue';
 import deliveryCancelled from './viewstatus/cancelled.vue';
 import deliveryIssue from './viewstatus/issue.vue';
 import deliveryDelivered from './viewstatus/delivered.vue';
-import deliveryOutForDelivery from './viewstatus/out_for_delivery.vue';
+import deliveryOutForDelivery from './viewstatus/todaysdeliveries.vue';
 import deliveryWaiting from './viewstatus/waiting.vue';
 import deliveryFinalized from './viewstatus/finalized.vue'
 import deliveryTommorrow from './viewstatus/tommorrow.vue'

src/pages/delivery/update_tickets/finalize_ticket.vue

@@ -31,13 +31,15 @@
             <button class="btn btn-sm btn-accent">Edit Order</button>
           </router-link>
         </div>
-        <div class="grid grid-cols-12">
+        <div class="grid grid-cols-12 ">
+
+
           <div class="col-span-6  ">
             <div class="col-span-12 font-bold">
               Customer
             </div>
             <div class="col-span-12 p-5 ">
-              <div class="grid grid-cols-12 mb-10">
+              <div class="grid grid-cols-12 mb-2">
                 <div class="col-span-12 font-bold flex">
                   {{ customer.customer_first_name }}
                   {{ customer.customer_last_name }}
@@ -76,61 +78,61 @@
                   {{ customer.customer_phone_number }}
                 </div>
               </div>
-
+            </div>
-              <div class="col-span-12 ">
+            <div class="col-span-12 ">
-                <div class="grid grid-cols-12 ">
+              <div class="grid grid-cols-12 ">
-                  <div class="col-span-12 font-bold">
+                <div class="col-span-12 font-bold">
-                    Status
+                  Status
-                  </div>
+                </div>
-                  <div class="col-span-12 text-gray-500">
+                <div class="col-span-12 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 == 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-if="deliveryOrder.delivery_status == 10">Finalized</div>
+                  <div v-else-if="deliveryOrder.delivery_status == 10">Finalized</div>
-                    <div v-else></div>
+                  <div v-else></div>
-                  </div>
+                </div>
 
 
-                  <div class="col-span-12 font-bold mt-5">
+                <div class="col-span-12 font-bold mt-5">
-                    Scheduled date/time
+                  Scheduled date/time
-                  </div>
+                </div>
-                  <div class="col-span-12 text-gray-500">
+                <div class="col-span-12 text-gray-500">
-                    {{ deliveryOrder.expected_delivery_date }}
+                  {{ deliveryOrder.expected_delivery_date }}
-                  </div>
+                </div>
 
-                  <div class="col-span-12 font-bold mt-5">
+                <div class="col-span-12 font-bold mt-5">
-                    When Called
+                  When Called
-                  </div>
+                </div>
-                  <div class="col-span-12 text-gray-500 ">
+                <div class="col-span-12 text-gray-500 ">
-                    {{ deliveryOrder.when_ordered }}
+                  {{ deliveryOrder.when_ordered }}
-                  </div>
+                </div>
 
-                  <div class="col-span-12 font-bold mt-5">
+                <div class="col-span-12 font-bold mt-5">
-                    When Delivered
+                  When Delivered
-                  </div>
+                </div>
-                  <div class="col-span-12 text-gray-500 ">
+                <div class="col-span-12 text-gray-500 ">
-                    {{ deliveryOrder.when_delivered }}
+                  {{ deliveryOrder.when_delivered }}
-                  </div>
+                </div>
 
-                  <div class="col-span-12 font-bold mt-5">
+                <div class="col-span-12 font-bold mt-5">
-                    Driver Name
+                  Driver Name
-                  </div>
+                </div>
-                  <div class="col-span-12 text-gray-500">
+                <div class="col-span-12 text-gray-500">
-                    {{ deliveryOrder.driver_first_name }} {{ deliveryOrder.driver_last_name }}
+                  {{ deliveryOrder.driver_first_name }} {{ deliveryOrder.driver_last_name }}
-                  </div>
                 </div>
               </div>
             </div>
-          </div>
+
+            <!-- </div>
 
 
 
-          <div class="col-span-6 ">
+          <div class="col-span-6 "> -->
-            <div class="grid grid-cols-12 ">
+            <div class="grid grid-cols-12 mt-5">
               <div class="col-span-12">
                 <div v-if="deliveryOrder.prime == 1">
                   <div class="col-span-12 ">
@@ -149,7 +151,6 @@
                   </div>
                 </div>
               </div>
-
               <div class="col-span-12 py-3">
                 <div v-if="deliveryOrder.same_day === 1">
                   <div class="col-span-12 ">
@@ -169,7 +170,6 @@
                 </div>
               </div>
             </div>
-
             <div class="col-span-12 ">
               <div class="col-span-12 font-bold">
                 Payment
@@ -179,11 +179,11 @@
                   <div v-if="deliveryOrder.payment_type == 0">Cash</div>
                   <div v-else-if="deliveryOrder.payment_type == 1">Credit Card</div>
                   <div v-else-if="deliveryOrder.payment_type == 2">Credit Card & cash</div>
+                  <div v-else-if="deliveryOrder.payment_type == 3">Check</div>
                   <div v-else>No Payment Type Added</div>
                 </div>
               </div>
             </div>
-
             <div class="col-span-12 mt-5">
               <div class="col-span-12 font-bold">
                 <div class="grid grid-cols-12 mb-5">
@@ -195,7 +195,7 @@
                     {{ deliveryOrder.customer_price }}
                   </div>
 
-                  <div class="col-span-12 " >
+                  <div class="col-span-12 mt-5">
                     <div class="">
                       Gallons Ordered:
                     </div>
@@ -213,8 +213,6 @@
                       {{ deliveryOrder.gallons_delivered }}
                     </div>
                   </div>
-
-
                   <div class="col-span-12" v-if="deliveryOrder.prime == 1">
                     <div class="">
                       Prime Fee:
@@ -223,7 +221,6 @@
                       {{ pricing.price_prime }}
                     </div>
                   </div>
-
                   <div class="col-span-12 " v-if="deliveryOrder.same_day === 1">
                     <div>
                       Same Day
@@ -232,7 +229,6 @@
                       {{ pricing.price_same_day }}
                     </div>
                   </div>
-
                   <div class="col-span-12 " v-if="deliveryOrder.payment_type == 0">
                     <div class="col-span-12 ">
                       cash total:
@@ -241,10 +237,8 @@
                       ${{ total_amount }}
                     </div>
                   </div>
-
                   <div class="col-span-12 py-5 " v-if="deliveryOrder.payment_type == 1">
                     <div class="flex">
-
                       <div class="rounded-md border-2 bg-accent">
                         <div class="flex p-2">
                           {{ userCard.type_of_card }}
@@ -261,12 +255,9 @@
                       </div>
                     </div>
                   </div>
-
                   <div class="col-span-12 py-5 " v-if="deliveryOrder.payment_type == 2">
                     <div class="flex ">
-
                       <div class=" rounded-md border-2 bg-accent ">
-
                         <div class="flex p-1 pl-4">
                           {{ userCard.name_on_card }}
                         </div>
@@ -276,11 +267,24 @@
                         <div class="flex p-1 pl-4">
                           {{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
                         </div>
-
                       </div>
                     </div>
                   </div>
-
+                  <div class="col-span-12 py-5 " v-if="deliveryOrder.payment_type == 3">
+                    <div class="flex ">
+                      <div class=" rounded-md border-2 bg-accent ">
+                        <div class="flex p-1 pl-4">
+                          {{ userCard.name_on_card }}
+                        </div>
+                        <div class="flex p-1 pl-4">
+                          {{ userCard.card_number }}
+                        </div>
+                        <div class="flex p-1 pl-4">
+                          {{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
+                        </div>
+                      </div>
+                    </div>
+                  </div>
                   <div class="col-span-12 font-bold py-5 text-lg text-accent" v-if="deliveryOrder.payment_type == 1">
                     <div>
                       Pre Charge Credit Card Total
@@ -298,25 +302,117 @@
                       ${{ total_amount }}
                     </div>
                   </div>
+                  <div class="col-span-12 font-bold py-5 text-lg text-accent" v-if="deliveryOrder.payment_type == 3">
+                    <div>
+                      Pre Charge Credit Card Total
+                    </div>
+                    <div class="col-span-12 text-green-500">
+                      ${{ total_amount }}
+                    </div>
+                  </div>
+
                 </div>
               </div>
             </div>
-
-
-            <div v-if="deliveryOrder.delivery_status !== 10">
-              <form class="rounded-md " enctype="multipart/form-data" @submit.prevent="onSubmit">
-                <div class="grid grid-cols-12    p-5">
-                  <div class="col-span-12 md:col-span-12 flex mt-5 mb-5">
-                    <button class="btn btn-sm btn-accent">
-                      Finalize Delivery
-                    </button>
-                  </div>
-                </div>
-              </form>
-            </div>
-            <div v-else>Order was finalized</div>
           </div>
 
+
+
+
+
+          <div class="col-span-6">
+            <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="FinalizeOilOrderForm.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 Card</label>
+                <input v-model="FinalizeOilOrderForm.card" class="checkbox checkbox-xs" id="Credit" 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">Check</label>
+                <input v-model="FinalizeOilOrderForm.check" class="checkbox checkbox-xs" id="check" 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">Other</label>
+                <input v-model="FinalizeOilOrderForm.other" class="checkbox checkbox-xs" id="check" type="checkbox" />
+              </div>
+
+              <div class="mb-4">
+                <label class="block text-white text-sm font-bold mb-2">Cash Recieved</label>
+                <input v-model="FinalizeOilOrderForm.cash_recieved"
+                  class="input input-bordered input-sm w-full max-w-xs" id="title" type="text"
+                  placeholder="Cash from delivery recieved" />
+              </div>
+              <div class="mb-4">
+                <label class="block text-white text-sm font-bold mb-2">check Number</label>
+                <input v-model="FinalizeOilOrderForm.check_number"
+                  class="input input-bordered input-sm w-full max-w-xs" id="title" type="text"
+                  placeholder="Check Number" />
+              </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="FinalizeOilOrderForm.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 Status</label>
+                <select class="select select-bordered select-sm w-full max-w-xs" aria-label="Default select example"
+                  id="delivery_status" v-model="FinalizeOilOrderForm.delivery_status">
+                  <option class="text-white" v-for="(delivery, index) in deliveryStatus" :key="index"
+                    :value="delivery['value']">
+                    {{ delivery['text'] }}
+                  </option>
+                </select>
+
+              </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">Filled </label>
+                <input v-model="FinalizeOilOrderForm.customer_filled" class="checkbox checkbox-xs" id="fill"
+                  type="checkbox" />
+              </div>
+              <div class="mb-4">
+                <label class="block text-white text-sm font-bold mb-2">Gallons Delivered</label>
+                <input v-model="FinalizeOilOrderForm.gallons_delivered"
+                  class="input input-bordered input-sm w-full max-w-xs" id="title" type="text"
+                  placeholder="# gallons" />
+              </div>
+
+              <div class="col-span-12 md:col-span-4 mb-5 md:mb-0 gap-10">
+                <label class="block text-white text-sm font-bold cursor-pointer label">Emergency</label>
+                <input v-model="FinalizeOilOrderForm.emergency" 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">Prime</label>
+                <input v-model="FinalizeOilOrderForm.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="FinalizeOilOrderForm.same_day" class="checkbox checkbox-xs" id="same_day"
+                  type="checkbox" />
+              </div>
+
+
+              <div class="col-span-12 md:col-span-12 flex mt-5 mb-5">
+                <button class="btn btn-accent btn-sm">
+                  Finalize Delivery
+                </button>
+              </div>
+            </form>
+          </div>
+
+
         </div>
       </div>
     </div>
@@ -352,6 +448,30 @@ export default defineComponent({
       user: {
         id: 0
       },
+      deliveryStatus: [],
+      userCards: [],
+      deliveryNotesDriver: [],
+      priceprime: 0,
+      pricesameday: 0,
+      total_amount: 0,
+
+      FinalizeOilOrderForm: {
+        cash: false,
+        card: false,
+        check: false,
+        other: false,
+        cash_recieved: '',
+        check_number: 0,
+        delivery_status: '',
+        userCards: [],
+        credit_card_id: 0,
+        driver: 0,
+        gallons_delivered: '',
+        customer_filled: false,
+        prime: false,
+        same_day: false,
+        emergency: false,
+      },
       CreateOilOrderForm: {
         basicInfo: {
           gallons_delivered: '',
@@ -359,13 +479,11 @@ export default defineComponent({
           same_day: false,
           cash: false,
           card: false,
+          check: false,
+          other: false,
           userCards: []
-
-
         },
       },
-      deliveryNotesDriver: [],
-
       userCard: {
         date_added: '',
         user_id: '',
@@ -379,7 +497,6 @@ export default defineComponent({
         accepted_or_declined: '',
         main_card: '',
       },
-
       customer: {
         id: 0,
         user_id: 0,
@@ -392,7 +509,6 @@ export default defineComponent({
         customer_home_type: 0,
         customer_phone_number: '',
       },
-
       deliveryMoney: {
         time_added: '',
         total_amount_oil: '',
@@ -401,7 +517,6 @@ export default defineComponent({
         total_amount_fee: '',
         total_amount: '',
       },
-
       deliveryOrder: {
         id: '',
         customer_id: 0,
@@ -441,9 +556,6 @@ export default defineComponent({
         price_prime: 0,
         date: "",
       },
-      priceprime: 0,
-      pricesameday: 0,
-      total_amount: 0
     }
   },
 
@@ -454,14 +566,13 @@ export default defineComponent({
     $route() {
       this.sumdelivery(this.$route.params.id);
       this.getOilOrder(this.$route.params.id);
-
-
     },
   },
   mounted() {
     this.sumdelivery(this.$route.params.id);
     this.getOilOrder(this.$route.params.id);
     this.getOilPricing();
+    this.getDeliveryStatusList();
 
   },
 
@@ -481,6 +592,7 @@ export default defineComponent({
           }
         })
     },
+
     getOilOrder(delivery_id: any) {
       let path = import.meta.env.VITE_BASE_URL + "/delivery/order/" + delivery_id;
       axios({
@@ -494,26 +606,106 @@ export default defineComponent({
             this.deliveryOrder = response.data
             this.getCustomer(this.deliveryOrder.customer_id)
 
+
             if (this.deliveryOrder.payment_type === 1) {
               this.getPaymentCard(this.deliveryOrder.payment_card_id);
             }
             if (this.deliveryOrder.payment_type === 2) {
               this.getPaymentCard(this.deliveryOrder.payment_card_id);
             }
+            if (this.deliveryOrder.payment_type === 3) {
+              this.getPaymentCard(this.deliveryOrder.payment_card_id);
+            }
             if (response.data.prime == 1) {
-              this.CreateOilOrderForm.basicInfo.prime = true
+              this.FinalizeOilOrderForm.prime = true
             }
             if (response.data.same_day == 1) {
-              this.CreateOilOrderForm.basicInfo.same_day = true
+              this.FinalizeOilOrderForm.same_day = true
+            }
+            if (response.data.emergency == 1) {
+              this.FinalizeOilOrderForm.emergency = true
+            }
+            this.FinalizeOilOrderForm.cash_recieved = response.data.cash_recieved;
+            this.FinalizeOilOrderForm.check_number = response.data.check_number;
+            this.FinalizeOilOrderForm.delivery_status = response.data.delivery_status;
+
+            if (response.data.customer_filled == 1) {
+              this.FinalizeOilOrderForm.customer_filled = true
+            }
+            // Cash
+            if (response.data.payment_type == 0) {
+              this.FinalizeOilOrderForm.card = false
+              this.FinalizeOilOrderForm.cash = true
+              this.FinalizeOilOrderForm.check = false
+              this.FinalizeOilOrderForm.other = false
+            }
+            // Credit card
+            if (response.data.payment_type == 1) {
+              this.FinalizeOilOrderForm.card = true
+              this.FinalizeOilOrderForm.cash = false
+              this.FinalizeOilOrderForm.check = false
+              this.FinalizeOilOrderForm.other = false
+            }
+            // Credit card/Cash
+            if (response.data.payment_type == 2) {
+              this.FinalizeOilOrderForm.card = true
+              this.FinalizeOilOrderForm.cash = true
+              this.FinalizeOilOrderForm.check = false
+              this.FinalizeOilOrderForm.other = false
+            }
+            // Check
+            if (response.data.payment_type == 3) {
+              this.FinalizeOilOrderForm.card = false
+              this.FinalizeOilOrderForm.cash = false
+              this.FinalizeOilOrderForm.check = true
+              this.FinalizeOilOrderForm.other = false
+            }
+            // Other
+            if (response.data.payment_type == 4) {
+              this.FinalizeOilOrderForm.card = false
+              this.FinalizeOilOrderForm.cash = false
+              this.FinalizeOilOrderForm.check = false
+              this.FinalizeOilOrderForm.other = true
             }
 
-            this.CreateOilOrderForm.basicInfo.gallons_delivered = response.data.gallons_delivered;
+            this.FinalizeOilOrderForm.gallons_delivered = response.data.gallons_delivered;
 
           }
         })
     },
 
 
+
+
+    getPaymentCard(card_id: any) {
+      let path = import.meta.env.VITE_BASE_URL + "/payment/card/" + card_id;
+      axios({
+        method: "get",
+        url: path,
+        withCredentials: true,
+      })
+        .then((response: any) => {
+          this.userCard = response.data;
+          this.FinalizeOilOrderForm.userCards = response.data.id
+        })
+        .catch(() => {
+        });
+    },
+    getPaymentCards(user_id: any) {
+      let path = import.meta.env.VITE_BASE_URL + "/payment/cards/" + user_id;
+      axios({
+        method: "get",
+        url: path,
+        withCredentials: true,
+      })
+        .then((response: any) => {
+          this.userCards = response.data;
+        })
+        .catch(() => {
+        });
+    },
+
+
     getCustomer(user_id: any) {
       let path = import.meta.env.VITE_BASE_URL + "/customer/" + user_id;
       axios({
@@ -523,6 +715,16 @@ export default defineComponent({
       })
         .then((response: any) => {
           this.customer = response.data;
+          this.getPaymentCards(this.deliveryOrder.customer_id);
+          if (this.deliveryOrder.payment_type == 1) {
+            this.getPaymentCard(this.deliveryOrder.payment_card_id)
+          }
+          if (this.deliveryOrder.payment_type == 2) {
+            this.getPaymentCard(this.deliveryOrder.payment_card_id)
+          }
+          if (this.deliveryOrder.payment_type == 3) {
+            this.getPaymentCard(this.deliveryOrder.payment_card_id)
+          }
         })
         .catch(() => {
           notify({
@@ -532,19 +734,7 @@ export default defineComponent({
           });
         });
     },
-    getPaymentCard(card_id: any) {
+
-      let path = import.meta.env.VITE_BASE_URL + "/payment/card/" + card_id;
-      axios({
-        method: "get",
-        url: path,
-        withCredentials: true,
-      })
-        .then((response: any) => {
-          this.userCard = response.data;
-        })
-        .catch(() => {
-        });
-    },
 
     getOilPricing() {
       let path = import.meta.env.VITE_BASE_URL + "/info/price/oil/table";
@@ -590,41 +780,7 @@ export default defineComponent({
         });
     },
 
-    editOilOrder(payload: {
+
-      gallons_delivered: string;
-      prime: boolean;
-      same_day: boolean;
-      cash: boolean;
-      credit: boolean;
-      credit_card_id: any;
-    }) {
-      let path = import.meta.env.VITE_BASE_URL + "/deliverydata/finalize/" + this.deliveryOrder.id;
-      axios({
-        method: "put",
-        url: path,
-        data: payload,
-        withCredentials: true,
-        headers: authHeader(),
-      })
-        .then((response: any) => {
-          if (response.data.ok) {
-            notify({
-              title: "Success",
-              text: "Ticket is finalized",
-              type: "success",
-            });
-            this.$router.push({ name: "DeliveryHome" });
-          }
-          if (response.data.error) {
-            notify({
-              title: "Error",
-              text: "Could not finalize ticket",
-              type: "error",
-            });
-            this.$router.push("DeliveryHome");
-          }
-        })
-    },
     UpdateAuto(payload: {
       gallons: string,
       delivery_id: string,
@@ -655,25 +811,95 @@ export default defineComponent({
           }
         })
     },
-    onSubmit() {
-      if (this.deliveryOrder.automatic == 1){
-        let auto_payload = {
-            gallons: this.CreateOilOrderForm.basicInfo.gallons_delivered,
-            delivery_id: this.deliveryOrder.id
 
+    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(() => {
+        });
+    },
+
+    FinalizeOrder(payload: {
+      cash: boolean,
+      card: boolean,
+      check: boolean,
+      other: boolean,
+      cash_recieved: string,
+      check_number: number,
+      delivery_status: any,
+      credit_card_id: number,
+      driver_employee_id: number,
+      gallons_delivered: string,
+      customer_filled: boolean,
+      prime: boolean,
+      same_day: boolean,
+      emergency: boolean,
+
+
+    }) {
+      let path = import.meta.env.VITE_BASE_URL + "/deliverydata/finalize/" + this.deliveryOrder.id;
+      axios({
+        method: "put",
+        url: path,
+        data: payload,
+        withCredentials: true,
+        headers: authHeader(),
+      })
+        .then((response: any) => {
+          if (response.data.ok) {
+            notify({
+              title: "Success",
+              text: "Ticket is finalized",
+              type: "success",
+            });
+            this.$router.push({ name: "delivery" });
+            console.log("here")
           }
+          if (response.data.error) {
+            notify({
+              title: "Error",
+              text: "Could not finalize ticket",
+              type: "error",
+            });
+            this.$router.push("delivery");
+          }
+        })
+    },
+    onSubmit() {
+      if (this.deliveryOrder.automatic == 1) {
+        let auto_payload = {
+          gallons: this.CreateOilOrderForm.basicInfo.gallons_delivered,
+          delivery_id: this.deliveryOrder.id
+
+        }
         this.UpdateAuto(auto_payload);
       }
 
       let payload = {
-        gallons_delivered: this.CreateOilOrderForm.basicInfo.gallons_delivered,
+        cash: this.FinalizeOilOrderForm.cash,
-        prime: this.CreateOilOrderForm.basicInfo.prime,
+        card: this.FinalizeOilOrderForm.card,
-        same_day: this.CreateOilOrderForm.basicInfo.same_day,
+        check: this.FinalizeOilOrderForm.check,
-        cash: this.CreateOilOrderForm.basicInfo.cash,
+        other: this.FinalizeOilOrderForm.other,
-        credit: this.CreateOilOrderForm.basicInfo.card,
+        cash_recieved: this.FinalizeOilOrderForm.cash_recieved,
-        credit_card_id: this.CreateOilOrderForm.basicInfo.userCards,
+        check_number: this.FinalizeOilOrderForm.check_number,
+        delivery_status: this.FinalizeOilOrderForm.delivery_status,
+        credit_card_id: this.FinalizeOilOrderForm.credit_card_id,
+        driver_employee_id: this.FinalizeOilOrderForm.driver,
+        gallons_delivered: this.FinalizeOilOrderForm.gallons_delivered,
+        customer_filled: this.FinalizeOilOrderForm.customer_filled,
+        prime: this.FinalizeOilOrderForm.prime,
+        same_day: this.FinalizeOilOrderForm.same_day,
+        emergency: this.FinalizeOilOrderForm.emergency,
+
       };
-      this.editOilOrder(payload);
+      this.FinalizeOrder(payload);
     },
 
   },

src/pages/delivery/update_tickets/missing_data_home.vue

@@ -94,9 +94,7 @@ export default defineComponent({
       token: null,
       user: null,
       deliveries: [
-
       ],
-
     }
   },
 

src/pages/delivery/view.vue

@@ -105,6 +105,7 @@
             <div v-else-if="deliveryOrder.delivery_status == 4">Partial Delivery</div>
             <div v-else-if="deliveryOrder.delivery_status == 5">misdelivery</div>
             <div v-else-if="deliveryOrder.delivery_status == 6">unknown</div>
+            <div v-else-if="deliveryOrder.delivery_status == 10">Finalized</div>
             <div v-else></div>
           </div>
 
@@ -124,6 +125,13 @@
             {{ format_date(deliveryOrder.when_ordered) }}
           </div>
 
+          <div class="col-span-12 font-bold">
+            When Delivered
+          </div>
+          <div class="col-span-12 mb-5 text-sm text-gray-500">
+            {{ format_date(deliveryOrder.when_delivered) }}
+          </div>
+          
 
           <div class="col-span-12 font-bold ">
             Driver:
@@ -156,10 +164,12 @@
             <div v-if="deliveryOrder.payment_type == 0">Cash</div>
             <div v-else-if="deliveryOrder.payment_type == 1">Credit Card</div>
             <div v-else-if="deliveryOrder.payment_type == 2">Credit Card & cash</div>
+            <div v-else-if="deliveryOrder.payment_type == 3">Check</div>
+            <div v-else-if="deliveryOrder.payment_type == 4">Check</div>
             <div v-else>No Payment Type Added</div>
           </div>
           <div class="col-span-12" v-if="deliveryOrder.payment_type == 1">
-            <div class="flex">
+            <div class="flex" v-if="userCardfound">
               <div class="basis-1/3 p-2">
                 <div class="rounded-md border-2 bg-accent">
                   <div class="flex p-3">
@@ -180,7 +190,7 @@
           </div>
 
           <div class="col-span-12" v-if="deliveryOrder.payment_type == 2">
-            <div class="flex">
+            <div class="flex" v-if="userCardfound">
               <div class="basis-1/3 p-2">
                 <div class="bg-accent rounded-md border-2 ">
                   <div class="flex p-3">
@@ -199,6 +209,26 @@
               </div>
             </div>
           </div>
+          <div class="col-span-12" v-if="deliveryOrder.payment_type == 3">
+            <div class="flex" v-if="userCardfound">
+              <div class="basis-1/3 p-2">{{ userCard }}
+                <div class="bg-accent rounded-md border-2 ">
+                  <div class="flex p-3">
+                    {{ userCard.type_of_card }}
+                  </div>
+                  <div class="flex p-1 pl-4">
+                    {{ userCard.name_on_card }}
+                  </div>
+                  <div class="flex p-1 pl-4">
+                    ****-****-****-{{ userCard.last_four_digits }}
+                  </div>
+                  <div class="flex p-1 pl-4">
+                    {{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
 
@@ -271,7 +301,7 @@ export default defineComponent({
       },
 
       deliveryNotesDriver: [],
-
+      userCardfound: false,
       userCard: {
         date_added: '',
         user_id: '',
@@ -397,6 +427,9 @@ export default defineComponent({
         });
     },
     getPaymentCard(card_id: any) {
+      if (card_id){
+
+     
       let path = import.meta.env.VITE_BASE_URL + "/payment/card/" + card_id;
       axios({
         method: "get",
@@ -404,10 +437,24 @@ export default defineComponent({
         withCredentials: true,
       })
         .then((response: any) => {
-          this.userCard = response.data;
+          
+          if (response.data.userCard.card_number === ''){
+            this.userCard === null;
+            this.userCardfound = false;
+          }
+          else{
+            this.userCard = response.data;
+            this.userCardfound = true;
+          }
+       
+
         })
         .catch(() => {
         });
+      }
+      else{
+        this.userCardfound = false;
+      }
     },
 
     getOilOrder(delivery_id: any) {
@@ -428,6 +475,9 @@ export default defineComponent({
             if (this.deliveryOrder.payment_type == 2) {
               this.getPaymentCard(this.deliveryOrder.payment_card_id);
             }
+            if (this.deliveryOrder.payment_type == 3) {
+              this.getPaymentCard(this.deliveryOrder.payment_card_id);
+            }
           }
         })
     },

src/pages/delivery/viewstatus/todaysdeliveries.vue

@@ -20,12 +20,12 @@
 
       </div>
 
-      <div class="overflow-x-auto bg-neutral">
+      <div class="overflow-x-auto">
         <table class="table">
           <!-- head -->
-          <thead>
+          <thead class=" bg-neutral">
             <tr>
-              <th>Delivery Id</th>
+              <th>Id</th>
               <th>Name</th>
               <th>Status</th>
               <th>Town</th>
@@ -36,9 +36,10 @@
               <th>Prime</th>
               <th>Same Day</th>
               <th>Payment</th>
+              <th></th>
             </tr>
           </thead>
-          <tbody>
+          <tbody class="bg-neutral">
             <!-- row 1 -->
 
             <tr v-for="oil in deliveries" :key="oil['id']">
@@ -56,7 +57,7 @@
                 <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-if="oil['delivery_status'] == 10" class="bg-green-600">Finalized</div>
                 <div v-else></div>
               </td>
 
@@ -90,7 +91,10 @@
                 <div v-else></div>
 
               </td>
-              <td class="flex gap-5">
+              <td class="flex gap-2">
+                <router-link :to="{ name: 'finalizeTicket', params: { id: oil['id'] } }">
+                    <button class="btn btn-accent btn-sm">Finalize</button>
+                  </router-link>
                 <router-link :to="{ name: 'deliveryOrder', params: { id: oil['id'] } }">
                   <button class="btn btn-accent btn-sm">View</button>
                 </router-link>

src/pages/pay/pay_oil.vue

@@ -185,7 +185,7 @@
               </div>
               <div class="col-span-12 font-bold py-5 text-accent" v-if="delivery.payment_type == 3">
                 <div class="">
-                  Pre Charge Credit Card Total: ${{ total_amount }}
+                  Check - Pre Charge Credit Card Total: ${{ total_amount }}
                 </div>
               </div>
             </div>

src/pages/ticket/ticket.vue

@@ -43,6 +43,8 @@
                     <div class="col-span-12 text-lg" v-if="delivery.payment_type == 0">CASH</div>
                     <div class="col-span-12 text-lg" v-else-if="delivery.payment_type == 1">Credit Card</div>
                     <div class="col-span-12 text-lg" v-else-if="delivery.payment_type == 2">Credit Card/Cash</div>
+                    <div class="col-span-12 text-lg" v-else-if="delivery.payment_type == 3">Check</div>
+                    <div class="col-span-12 text-lg" v-else-if="delivery.payment_type == 4">Other</div>
                     <div class="col-span-12" v-else></div>