Added delivery notes. changed waiting/pending

src/pages/delivery/viewstatus/cancelled.vue

@@ -43,16 +43,18 @@
               <div class="hover:text-accent">{{ oil['customer_name'] }} </div>
             </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>
+                <div v-if="oil['delivery_status'] == 0">Waiting</div>
+                <div v-else-if="oil['delivery_status'] == 1">cancelled</div>
+                <div v-else-if="oil['delivery_status'] == 2">Out for Delivery</div>
+                <div v-else-if="oil['delivery_status'] == 3">tommorrow</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" class="bg-green-600">Finalized</div>
+                <div v-else></div>
+
+              
+              </td>
 
             <td>{{ oil['customer_town'] }}</td>
             <td>{{ oil['customer_address'] }}</td>
@@ -87,12 +89,12 @@
           </tbody>
         </table>
       </div>
-      <div class="flex justify-center" v-if="recordsLength > 9">
-        <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="perPage"
-                    :options="options">
+   
+        <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="50"
+                    :options="options" class="mt-10">
         </pagination>
         <div class="flex justify-center mb-10"> {{ recordsLength }} items Found</div>
-      </div>
+      
     </div>
   </div>
 

src/pages/delivery/viewstatus/delivered.vue

@@ -43,16 +43,18 @@
                <div class="hover:text-accent">{{ oil['customer_name'] }} </div>
               </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>
+                <div v-if="oil['delivery_status'] == 0">Waiting</div>
+                <div v-else-if="oil['delivery_status'] == 1">cancelled</div>
+                <div v-else-if="oil['delivery_status'] == 2">Out for Delivery</div>
+                <div v-else-if="oil['delivery_status'] == 3">tommorrow</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" class="bg-green-600">Finalized</div>
+                <div v-else></div>
+
+              
+              </td>
             <td>{{ oil['customer_town'] }}</td>
             <td>{{ oil['customer_address'] }}</td>
             <td>
@@ -82,12 +84,10 @@
           </tbody>
         </table>
       </div>
-      <div class="flex justify-center" v-if="recordsLength > 9">
-        <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="perPage"
-                    :options="options">
+        <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="50"
+                    :options="options" class="mt-10">
         </pagination>
         <div class="flex justify-center mb-10"> {{ recordsLength }} items Found</div>
-      </div>
     </div>
   </div>
 

src/pages/delivery/viewstatus/finalized.vue

@@ -47,13 +47,15 @@
               </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'] == 1">cancelled</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">tommorrow</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>
               <td>{{ oil['customer_town'] }}</td>
               <td>{{ oil['customer_address'] }}</td>
@@ -93,12 +95,10 @@
             </tbody>
           </table>
         </div>
-        <div class="flex justify-center" v-if="recordsLength > 9">
-          <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="perPage"
-                      :options="options">
+          <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="50"
+                      :options="options" class="mt-10">
           </pagination>
           <div class="flex justify-center mb-10"> {{ recordsLength }} items Found</div>
-        </div>
       </div>
     </div>
   
@@ -152,6 +152,7 @@
         this.deliveries = [];
         this.get_oil_orders(page)
       },
+
       userStatus() {
         let path = import.meta.env.VITE_BASE_URL + '/auth/whoami';
         axios({

src/pages/delivery/viewstatus/issue.vue

@@ -44,16 +44,18 @@
                    <div class="hover:text-accent">{{ oil['customer_name'] }} </div> 
                   </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>
+                <div v-if="oil['delivery_status'] == 0">Waiting</div>
+                <div v-else-if="oil['delivery_status'] == 1">cancelled</div>
+                <div v-else-if="oil['delivery_status'] == 2">Out for Delivery</div>
+                <div v-else-if="oil['delivery_status'] == 3">tommorrow</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" class="bg-green-600">Finalized</div>
+                <div v-else></div>
+
+              
+              </td>
 
             <td>{{ oil['customer_town'] }}</td>
             <td>{{ oil['customer_address'] }}</td>
@@ -94,12 +96,10 @@
           </tbody>
         </table>
       </div>
-      <div class="flex justify-center" v-if="recordsLength > 9">
-        <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="perPage"
-                    :options="options">
+        <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="50"
+                    :options="options" class="mt-10">
         </pagination>
         <div class="flex justify-center mb-10"> {{ recordsLength }} items Found</div>
-      </div>
     </div>
   </div>
 

src/pages/delivery/viewstatus/pending.vue

@@ -0,0 +1,240 @@
+<template>
+    <Header />
+    <div class="flex">
+      <div class="">
+        <SideBar />
+      </div>
+      <div class=" w-full px-10 ">
+        <div class="text-sm breadcrumbs  pb-10">
+          <ul>
+            <li>
+              <router-link :to="{ name: 'home' }">
+                Home
+              </router-link>
+            </li>
+          </ul>
+        </div>
+  
+        <div class="flex start pb-10 text-2xl">Pending Payment Deliveries </div>
+        <div class="flex justify-end pb-5">
+  
+        </div>
+  
+        <div class="overflow-x-auto">
+          <table class="table">
+            <!-- head -->
+            <thead class=" bg-neutral">
+              <tr>
+                <th>Id</th>
+                <th>Name</th>
+                <th>Status</th>
+                <th>Town</th>
+                <th>Address</th>
+                <th>Gallons</th>
+                <th>Date</th>
+                <th>Auto</th>
+                <th>Prime</th>
+                <th>Same Day</th>
+                <th>Emergency</th>
+                <th>Payment</th>
+                <th></th>
+              </tr>
+            </thead>
+            <tbody class="bg-neutral">
+              <!-- 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>
+                    <div class="hover:text-accent">{{ oil['customer_name'] }} </div>
+                  </td>
+                </router-link> 
+                <td>
+                <div v-if="oil['delivery_status'] == 0">Waiting</div>
+                <div v-else-if="oil['delivery_status'] == 1">cancelled</div>
+                <div v-else-if="oil['delivery_status'] == 2">Out for Delivery</div>
+                <div v-else-if="oil['delivery_status'] == 3">tommorrow</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" class="bg-green-600">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 class="text-red-600">Yes</div>
+                </td>
+                <td>
+                  <div v-if="oil['same_day'] == 0">No</div>
+                  <div v-else class="text-red-600">Yes</div>
+                </td>
+                <td>
+                  <div v-if="oil['emergency'] == 0">No</div>
+                  <div v-else class="text-red-600">Yes</div>
+                </td>
+                <td>
+   
+                  <div v-if="oil['payment_type'] == 0">Cash</div>
+                  <div v-else-if="oil['payment_type'] == 1">CC</div>
+                  <div v-else-if="oil['payment_type'] == 2">Cash/CC</div>
+                  <div v-else-if="oil['payment_type'] == 3">Check</div>
+                  <div v-else-if="oil['payment_type'] == 4">Other</div>
+  
+                  <div v-else></div>
+  
+                </td>
+                <td class="flex gap-2">
+  
+                  <router-link :to="{ name: 'deliveryOrder', params: { id: oil['id'] } }">
+                    <button class="btn btn-secondary btn-sm">View Delivery</button>
+                  </router-link>
+                  <router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
+                    <button class="btn btn-secondary btn-sm">Edit Delivery</button>
+                  </router-link>
+  
+                    <router-link :to="{ name: 'finalizeTicket', params: { id: oil['id'] } }">
+                      <button class="btn btn-secondary btn-sm">Finalize</button>
+                    </router-link>
+                    <router-link :to="{ name: 'Ticket', params: { id: oil['id'] } }">
+                    <button class="btn btn-success btn-sm">
+                      Print Ticket
+                    </button>
+                  </router-link>
+                  <!-- <button @click.prevent="deleteCall(oil['id'])" class="btn btn-error btn-sm">
+                    Delete
+                  </button> -->
+                </td>
+              </tr>
+            </tbody>
+          </table>
+  
+        </div>
+          <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="50" :options="options" class="mt-10">
+          </pagination>
+          <div class="flex justify-center mb-10"> {{ recordsLength }} items Found</div>
+      </div>
+    </div>
+  
+    <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 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";
+  
+  export default defineComponent({
+    name: 'deliveryPending',
+  
+    components: {
+      Header,
+      SideBar,
+      Footer,
+    },
+  
+    data() {
+      return {
+        token: null,
+        user: null,
+        deliveries: [],
+        page: 1,
+        perPage: 50,
+        recordsLength: 0,
+        options: {
+          edgeNavigation: false,
+          format: false,
+          template: PaginationComp
+        }
+      }
+    },
+    created() {
+      this.userStatus()
+    },
+    mounted() {
+      this.getPage(this.page)
+    },
+    methods: {
+      getPage: function (page: any) {
+        this.deliveries = [];
+        this.get_oil_orders(page)
+      },
+      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
+          })
+      },
+
+  
+      get_oil_orders(page: any) {
+        let path = import.meta.env.VITE_BASE_URL + '/delivery/pending/' + page;
+        axios({
+          method: 'get',
+          url: path,
+          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({
+          method: 'delete',
+          url: path,
+          headers: authHeader(),
+        }).then((response: any) => {
+          if (response.data.ok) {
+            notify({
+              title: "Success",
+              text: "deleted delivery",
+              type: "success",
+            });
+            this.getPage(this.page)
+          } else {
+            notify({
+              title: "Failure",
+              text: "error deleting delivery",
+              type: "success",
+            });
+          }
+        })
+      },
+  
+
+    },
+  })
+  </script>
+  
+  <style scoped></style>

src/pages/delivery/viewstatus/todaysdeliveries.vue

@@ -53,13 +53,15 @@
               </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'] == 1">cancelled</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">tommorrow</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" class="bg-green-600">Finalized</div>
                 <div v-else></div>
+
+              
               </td>
 
               <td>{{ oil['customer_town'] }}</td>
@@ -122,11 +124,9 @@
         </table>
 
       </div>
-      <div class="flex justify-center" v-if="recordsLength > 9">
-        <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="perPage" :options="options">
+        <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="50" :options="options" class="mt-10">
         </pagination>
         <div class="flex justify-center mb-10"> {{ recordsLength }} items Found</div>
-      </div>
     </div>
   </div>
 
@@ -169,7 +169,6 @@ export default defineComponent({
   },
   created() {
     this.userStatus()
-    this.updatestatus();
   },
   mounted() {
     this.getPage(this.page)
@@ -196,18 +195,7 @@ export default defineComponent({
           this.user = null
         })
     },
-    updatestatus() {
-      let path = import.meta.env.VITE_BASE_URL + '/delivery/updatestatus/outfordelivery';
-      axios({
-        method: 'get',
-        url: path,
-        headers: authHeader(),
-      }).then((response: any) => {
-        if (response.data.update)
-          console.log("success")
-        else { }
-      })
-    },
+
 
     get_oil_orders(page: any) {
       let path = import.meta.env.VITE_BASE_URL + '/delivery/outfordelivery/' + page;

src/pages/delivery/viewstatus/tommorrow.vue

@@ -50,9 +50,9 @@
               </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'] == 1">cancelled</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">tommorrow</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>
@@ -99,11 +99,9 @@
           </tbody>
         </table>
       </div>
-      <div class="flex justify-center" v-if="recordsLength > 9">
-        <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="perPage" :options="options">
+        <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="50" :options="options" class="mt-10">
         </pagination>
         <div class="flex justify-center mb-10"> {{ recordsLength }} items Found</div>
-      </div>
     </div>
   </div>
 
@@ -155,6 +153,7 @@ export default defineComponent({
       this.deliveries = [];
       this.get_oil_orders(page)
     },
+
     userStatus() {
       let path = import.meta.env.VITE_BASE_URL + '/auth/whoami';
       axios({

src/pages/delivery/viewstatus/waiting.vue

@@ -102,11 +102,9 @@
           </tbody>
         </table>
       </div>
-      <div class="flex justify-center" v-if="recordsLength > 9">
-        <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="perPage" :options="options">
+        <pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="50" :options="options" class="mt-10">
         </pagination>
         <div class="flex justify-center mb-10"> {{ recordsLength }} items Found</div>
-      </div>
     </div>
   </div>
 
@@ -160,6 +158,7 @@ export default defineComponent({
       this.deliveries = [];
       this.get_oil_orders(page)
     },
+
     userStatus() {
       let path = import.meta.env.VITE_BASE_URL + '/auth/whoami';
       axios({