From 4b1aabea9ce90d09e728030a60c0e51055fe49b1 Mon Sep 17 00:00:00 2001
From: Edwin Eames <eddwinn@gmail.com>
Date: Tue, 4 Feb 2025 18:22:14 -0500
Subject: [PATCH] added auto info to ticket

---
 src/pages/ticket/ticket.vue     |  15 ++++-
 src/pages/ticket/ticketauto.vue | 107 +++++++++++++++++---------------
 2 files changed, 70 insertions(+), 52 deletions(-)

diff --git a/src/pages/ticket/ticket.vue b/src/pages/ticket/ticket.vue
index c7ff8af..d4b9bac 100644
--- a/src/pages/ticket/ticket.vue
+++ b/src/pages/ticket/ticket.vue
@@ -3,6 +3,8 @@
     <div class=" max-w-5xl  text-black bg-white font-mono text-md">
         <div class="grid grid-cols-12 pt-10">
             <div class="col-span-6">
+
+
                 <div class="grid grid-cols-12">
                     <div class="col-span-2 pt-2 pl-4">#2 </div>
                     <div class="col-span-2 pt-2"></div>
@@ -12,6 +14,8 @@
                     <div class="col-span-3 text-xs  pt-3 ">{{ customer.customer_phone_number }}</div>
                 </div>
 
+
+
                 <div class="grid grid-cols-12 pt-2 pb-2">
                     <div class="col-span-9 pl-5">
                         {{ customer.customer_first_name }} {{ customer.customer_last_name }}
@@ -30,8 +34,9 @@
                     </div>
                 </div>
 
-                <div class="grid grid-cols-12 pl-6 pb-6 gap-10 max-h-32">
 
+
+                <div class="grid grid-cols-12 pl-6 pb-6 gap-10 max-h-32">
                     <div class="col-span-6">
                         <div class="grid grid-cols-12">
                             <div class="col-span-12 ">{{ customer_description.description }}</div>
@@ -62,6 +67,8 @@
                 </div>
 
 
+
+
                 <div class="grid grid-cols-12">
                     <div class="col-span-6 ">
                         <div class="col-span-12 pl-5">Auburn Oil</div>
@@ -90,6 +97,11 @@
                         </div>
                     </div>
                 </div>
+
+
+
+
+
             </div>
 
 
@@ -341,6 +353,7 @@ export default defineComponent({
             }).then((response: any) => {
                 this.customer = response.data
                 this.getPastDeliveries1(this.customer.id)
+         
                 this.getPastDeliveries2(this.customer.id)
                 this.getCustomerDescription(this.customer.id)
                 this.getCustomerTank(this.customer.id)
diff --git a/src/pages/ticket/ticketauto.vue b/src/pages/ticket/ticketauto.vue
index c55eeb4..b949bbf 100644
--- a/src/pages/ticket/ticketauto.vue
+++ b/src/pages/ticket/ticketauto.vue
@@ -3,20 +3,23 @@
     <div class=" max-w-5xl  text-black bg-white font-mono text-md">
         <div class="grid grid-cols-12 pt-10">
             <div class="col-span-6">
+
                 <div class="grid grid-cols-12">
                     <div class="col-span-2 pt-2 pl-4">#2 </div>
                     <div class="col-span-2 pt-2"></div>
                     <div class="col-span-2 pt-2"></div>
-                    <div class="col-span-2 pt-2 "></div>
-                    <div class="col-span-1 pt-2 "></div>
-                    <div class="col-span-3 text-xs  pt-2 ">{{ customer.customer_phone_number }}</div>
+                    <div class="col-span-2 pt-2 ">{{ customer_tank.tank_size }}</div>
+                    <div class="col-span-1 pt-2 ">{{ customer_description.fill_location }}</div>
+                    <div class="col-span-3 text-xs  pt-3 ">{{ customer.customer_phone_number }}</div>
                 </div>
 
                 <div class="grid grid-cols-12 pt-2 pb-2">
-                    <div class="col-span-9 pl-5">{{ customer.customer_first_name }} {{ customer.customer_last_name }}
+                    <div class="col-span-9 pl-5">
+                        {{ customer.customer_first_name }} {{ customer.customer_last_name }}
                     </div>
                     <div class="col-span-3 ">{{ customer.account_number }}</div>
                     <div class="col-span-12 pl-5">{{ customer.customer_address }}</div>
+                    <div class="col-span-12 pl-5">{{ customer.customer_apt }}</div>
                     <div class="col-span-8 pl-5">
                         <div class="grid grid-cols-12">
                             <div class="col-span-5"> {{ customer.customer_town }}</div>
@@ -28,19 +31,14 @@
                     </div>
                 </div>
 
-                <div class="grid grid-cols-12 pl-6 pb-6 gap-10 max-h-32">
 
+                <div class="grid grid-cols-12 pl-6 pb-6 gap-10 max-h-32">
                     <div class="col-span-6">
                         <div class="grid grid-cols-12">
                             <div class="col-span-12 ">{{ customer_description.description }}</div>
-                          
                             <div class="col-span-12 "></div>
-
-
                             <div class="col-span-12 text-lg" >Credit Card</div>
-
-                           
-                            <div class="col-span-12 ">Fill</div>
+                            <div class="col-span-12" >AUTO</div>
                         </div>
                     </div>
                     <div class="col-span-6 border-2" v-if="delivery.dispatcher_notes">
@@ -51,6 +49,9 @@
                 </div>
 
 
+
+
+
                 <div class="grid grid-cols-12">
                     <div class="col-span-6 ">
                         <div class="col-span-12 pl-5">Auburn Oil</div>
@@ -67,11 +68,11 @@
                         <div class="col-span-12 pl-5">508 426 8800</div>
                     </div>
                     <div class="col-span-6 ">
-                        <div v-if="past_deliveries1.length > 1">
-                            <div class="col-span-6" v-for="past_delivery in past_deliveries1">
-                                <div class="">
-                                    {{ past_delivery.when_delivered }} - {{ past_delivery.gallons_delivered }}
-                                </div>
+                        <div v-if="past_deliveries.length > 0">
+                            <div class="col-span-6" v-for="past_delivery in past_deliveries">
+                            
+                                    {{ past_delivery.fill_date }} - {{ past_delivery.gallons_delivered }}
+                                
                             </div>
                         </div>
                         <div v-else>
@@ -79,6 +80,11 @@
                         </div>
                     </div>
                 </div>
+
+
+
+
+
             </div>
 
 
@@ -91,19 +97,10 @@
                 <div class="col-span-4 ">
                     <div class="grid grid-cols-12 ">
                         <div class="col-span-12 h-7 pl-4 pt-2"></div>
-                        <div class="col-span-12 h-7 pl-4 pt-2">{{ delivery.expected_delivery_date }}</div>
-
-                        <div class="col-span-12 h-7 pl-4 pt-2" >
-                           AUTO
-                        </div>
-                    
-               
+                        <div class="col-span-12 h-7 pl-4 pt-2"></div>
+                        <div class="col-span-12 h-7 pl-4 pt-2" ></div>
                         <div class="col-span-12 h-7 pl-4 pt-2" >{{todays_price }}</div>
-
-
                         <div class="col-span-12 h-7 pl-4 pt-4" > </div>
-                    
-
                         <div class="col-span-12 h-7 pt-6"></div>
                         <div class="col-span-12 h-7"></div>
                         <div class="col-span-12 h-7 pl-8"></div>
@@ -140,18 +137,13 @@ export default defineComponent({
             user: {
                 user_id: 0,
             },
-            past_deliveries1: [
+            past_deliveries: [
                 {
                     gallons_delivered: 0,
-                    when_delivered: '',
-                }
-            ],
-            past_deliveries2: [
-                {
-                    gallons_delivered: 0,
-                    when_delivered: '',
+                    fill_date: '',
                 }
             ],
+ 
             delivery: {
                 id: '',
                 customer_id: 0,
@@ -184,6 +176,13 @@ export default defineComponent({
                 driver_last_name: '',
                 promo_id: 0,
             },
+            customer_tank: {
+                id: 0,
+                last_tank_inspection: null,
+                tank_status: false,
+                outside_or_inside: false,
+                tank_size: 0,
+            },
             customer: {
                 id: 0,
                 user_id: 0,
@@ -239,7 +238,7 @@ export default defineComponent({
                 .then((response: any) => {
                     this.delivery = response.data;
                     this.getCustomer(this.delivery.customer_id)
-                   
+
 
                 })
                 .catch(() => {
@@ -250,6 +249,17 @@ export default defineComponent({
                     });
                 });
         },
+        getCustomerTank(userid: any) {
+            let path = import.meta.env.VITE_BASE_URL + '/customer/tank/' + userid;
+            axios({
+                method: 'get',
+                url: path,
+                headers: authHeader(),
+            }).then((response: any) => {
+                this.customer_tank = response.data
+
+            })
+        },
         getCustomerDescription(userid: any) {
             let path = import.meta.env.VITE_BASE_URL + '/customer/description/' + userid;
             axios({
@@ -293,33 +303,28 @@ export default defineComponent({
                 headers: authHeader(),
             }).then((response: any) => {
                 this.customer = response.data
-                this.getPastDeliveries1(this.customer.id)
-                this.getPastDeliveries2(this.customer.id)
+                this.getPastDeliveriesAuto(this.customer.id)
                 this.getCustomerDescription(this.customer.id)
+
+
+                
+                this.getCustomerDescription(this.customer.id)
+                this.getCustomerTank(this.customer.id)
             })
         },
 
-        getPastDeliveries1(userid: any) {
-            let path = import.meta.env.VITE_BASE_URL + '/delivery/past1/' + userid;
+        getPastDeliveriesAuto(userid: any) {
+            let path = import.meta.env.VITE_BASE_URL + '/delivery/auto/' + userid;
             axios({
                 method: 'get',
                 url: path,
                 headers: authHeader(),
             }).then((response: any) => {
-                this.past_deliveries1 = response.data
-            })
-        },
-        getPastDeliveries2(userid: any) {
-            let path = import.meta.env.VITE_BASE_URL + '/delivery/past2/' + userid;
-            axios({
-                method: 'get',
-                url: path,
-                headers: authHeader(),
-            }).then((response: any) => {
-                this.past_deliveries2 = response.data
+                this.past_deliveries = response.data
             })
         },
        
+       
     },
 })
 </script>