From ec5922375550b718fc6345e32eeab4069fd44e43 Mon Sep 17 00:00:00 2001
From: Edwin Eames <eddwinn@gmail.com>
Date: Sat, 14 Sep 2024 17:51:57 -0400
Subject: [PATCH] working print ticket

---
 src/App.vue                                   |  7 +-
 src/pages/automatic/home.vue                  | 14 +--
 .../update_tickets/finalize_ticket.vue        |  2 +-
 src/pages/ticket/ticket.vue                   | 97 +++++++++++--------
 tailwind.config.js                            |  2 +-
 5 files changed, 64 insertions(+), 58 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index e08364e..c4e652d 100755
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,13 +4,16 @@
 
 <template>
 
-  <html class="opensans">
+  <html class="">
   <router-view />
   <notifications position="top center" />
   </html>
 
 </template>
 
-<style>
+<style lang="scss">
 
+#myfont {
+    font-family:  Arial, Helvetica, sans-serif, sans-serif !important;
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/automatic/home.vue b/src/pages/automatic/home.vue
index 9bde514..0a3b7e9 100755
--- a/src/pages/automatic/home.vue
+++ b/src/pages/automatic/home.vue
@@ -25,9 +25,9 @@
         <div class="pl-10">1.50 = large oil usage</div>
         <div class="pl-10"> 1.00 = medium oil usage</div>
         <div class="pl-10">0.50 = small oil usage</div>
-            <form class="col-span-12 rounded-md px-8 pt-6 pb-8 mb-4 w-full" enctype="multipart/form-data"
+            <form class="col-span-12 rounded-md px-8 pt-6 pb-8 mb-4 w-full" 
+            enctype="multipart/form-data"
             @submit.prevent="get_auto_assignment">
-            
                 <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"
@@ -41,7 +41,7 @@
                   <button  class="btn btn-accent btn-sm">
                   Send for delivery
                 </button> 
-                  </form>
+            </form>
       </div>
         <div class="overflow-x-auto bg-neutral">
         
@@ -133,11 +133,9 @@ export default defineComponent({
       truckDriversList: [],
       CreateOilOrderForm: {
         basicInfo: {
-       
           driver_driver: '',
         },
       },
-
     }
   },
 
@@ -168,9 +166,7 @@ export default defineComponent({
             this.user = null
           })
     },
-
     get_oil_orders() {
-    
       let path = import.meta.env.VITE_AUTO_URL + '/delivery/all/customers';
       axios({
         method: 'get',
@@ -178,13 +174,10 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       }).then((response: any) => {
-        console.log("here")
         this.deliveries = response.data
-    
       })
     },
 
-
     getDriversList() {
       let path = import.meta.env.VITE_BASE_URL + "/employee/drivers";
       axios({
@@ -221,7 +214,6 @@ export default defineComponent({
         withCredentials: true,
         headers: authHeader(),
       }).then((response: any) => {
-        console.log(response.data.count)
 
         if (response.data.count > 0) {
           notify({
diff --git a/src/pages/delivery/update_tickets/finalize_ticket.vue b/src/pages/delivery/update_tickets/finalize_ticket.vue
index 064cb82..fc3a917 100755
--- a/src/pages/delivery/update_tickets/finalize_ticket.vue
+++ b/src/pages/delivery/update_tickets/finalize_ticket.vue
@@ -644,7 +644,7 @@ export default defineComponent({
               type: 'postive',
               title: 'top'
             })
-      this.$router.push({ name: "DeliveryHome" });
+            this.$router.push({ name: "DeliveryHome" });
           }
           else {
             notify({
diff --git a/src/pages/ticket/ticket.vue b/src/pages/ticket/ticket.vue
index 7b767cd..867c87a 100644
--- a/src/pages/ticket/ticket.vue
+++ b/src/pages/ticket/ticket.vue
@@ -1,59 +1,70 @@
 <template>
 
-    <div class=" absolute" id="captureRef">
-        <div class=" max-w-5xl  text-black bg-white">
-            <div class="grid grid-cols-12">
-                <div class="col-span-8 ">
-                    <div class="grid grid-cols-12 pb-4 pt-16  ">
-                        <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 pt-2 pl-6 ">{{ customer.customer_phone_number }}</div>
+    <div class=" max-w-5xl  text-black bg-white font-mono text-md">
+        <div class="grid grid-cols-12 pt-12">
+            <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>
+
+                <div class="grid grid-cols-12 pt-2">
+                    <div class="col-span-9 pl-5">{{ customer.customer_first_name }} {{ customer.customer_last_name }}
                     </div>
-                    <div class="grid grid-cols-12 pl-10 pb-10">
-                        <div class="col-span-8">{{ customer.customer_first_name }} {{ customer.customer_last_name }}
-                        </div>
-                        <div class="col-span-4 pl-14">{{ customer.account_number }}</div>
-                        <div class="col-span-12">{{ customer.customer_address }}</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-10 pb-10 pt-5">
-                        <div class="col-span-12 pb-5">{{ delivery.dispatcher_notes }}</div>
-                        <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" v-else></div>
-                    </div>
-                    <div class="grid grid-cols-12 pl-10">
-                        <div class="col-span-6" v-for="past_delivery in past_deliveries1">
-                            <div class="">{{ past_delivery.when_delivered }} - {{ past_delivery.gallons_delivered }}</div>
-                        </div>
-                        <div class="col-span-6" v-for="past_delivery2 in past_deliveries2">
-                            <div class="">{{ past_delivery2.when_delivered }} - {{ past_delivery2.gallons_delivered }}
+                    <div class="col-span-3 ">{{ customer.account_number }}</div>
+                    <div class="col-span-12 pl-5">{{ customer.customer_address }}</div>
+                    <div class="col-span-8 pl-5">
+                        <div class="grid grid-cols-12">
+                            <div class="col-span-5"> {{ customer.customer_town }}</div>
+                            <div class="col-span-3">
+                                <div v-if="customer.customer_state == 0">Ma</div>
                             </div>
+                            <div class="col-span-4"> {{ customer.customer_zip }}</div>
                         </div>
                     </div>
                 </div>
+
+                <div class="grid grid-cols-12 pl-10 pb-10 ">
+                    <div class="col-span-12 pb-5">{{ delivery.dispatcher_notes }}</div>
+                    <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" v-else></div>
+                </div>{{  }}
+                <div class="grid grid-cols-12 pl-10 pt-5" 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>
+                    <div class="col-span-6" v-for="past_delivery2 in past_deliveries2">
+                        <div class="">{{ past_delivery2.when_delivered }} - {{ past_delivery2.gallons_delivered }}
+                        </div>
+                    </div>
+                </div>
+                <div class="grid grid-cols-12 pl-10 pt-5 " v-else>
+                    <div class="col-span-6">            Have a Great day :)</div>
+        
+                </div>
+            </div>
+
+            <div class="col-span-6 ">
                 <div class="col-span-4 ">
-                    <div class="grid grid-cols-12 pt-16">
-                        <div class="col-span-12 h-7 pl-10 pt-2">{{ delivery.when_ordered }}</div>
-                        <div class="col-span-12 h-7 pl-10 pt-5">{{ delivery.expected_delivery_date }}</div>
-                        <div class="col-span-12 h-7 pl-10 pt-8">{{ delivery.gallons_ordered }}</div>
-                        <div class="col-span-12 h-7 pl-10 pt-10">{{ delivery.customer_price }} </div>
-                        <div class="col-span-12 h-7 pl-10 pt-10">{{ total_amount }} </div>
+                    <div class="grid grid-cols-12 ">
+                        <div class="col-span-12 h-7 pl-4 pt-2">{{ delivery.when_ordered }}</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">{{ delivery.gallons_ordered }}</div>
+                        <div class="col-span-12 h-7 pl-4 pt-2">{{ delivery.customer_price }} </div>
+                        <div class="col-span-12 h-7 pl-4 pt-4">{{ total_amount }} </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>
                     </div>
                 </div>
+
             </div>
         </div>
     </div>
diff --git a/tailwind.config.js b/tailwind.config.js
index bc5f74b..a9ec16f 100755
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -405,6 +405,7 @@ module.exports = {
     },
     fontFamily: {
       sans: [
+        'Arial',
         'ui-sans-serif',
         'system-ui',
         '-apple-system',
@@ -412,7 +413,6 @@ module.exports = {
         '"Segoe UI"',
         'Roboto',
         '"Helvetica Neue"',
-        'Arial',
         '"Noto Sans"',
         'sans-serif',
         '"Apple Color Emoji"',
