@@ -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 @@
-
-
-
-
-
-
#2
-
-
-
-
-
{{ customer.customer_phone_number }}
+
+
+
+
+
#2
+
+
+
+
+
{{ customer.customer_phone_number }}
+
+
+
+
{{ customer.customer_first_name }} {{ customer.customer_last_name }}
-
-
{{ customer.customer_first_name }} {{ customer.customer_last_name }}
-
-
{{ customer.account_number }}
-
{{ customer.customer_address }}
-
-
-
{{ customer.customer_town }}
-
{{ customer.customer_state }}
-
{{ customer.customer_zip }}
-
-
-
-
-
{{ delivery.dispatcher_notes }}
-
CASH
-
Credit Card
-
Credit Card/Cash
-
-
-
-
-
{{ past_delivery.when_delivered }} - {{ past_delivery.gallons_delivered }}
-
-
-
{{ past_delivery2.when_delivered }} - {{ past_delivery2.gallons_delivered }}
+
{{ customer.account_number }}
+
{{ customer.customer_address }}
+
+
+
{{ customer.customer_town }}
+
+
{{ customer.customer_zip }}
+
+
+
{{ delivery.dispatcher_notes }}
+
CASH
+
Credit Card
+
Credit Card/Cash
+
+
{{ }}
+
+
+
{{ past_delivery.when_delivered }} - {{ past_delivery.gallons_delivered }}
+
+
+
+
{{ past_delivery2.when_delivered }} - {{ past_delivery2.gallons_delivered }}
+
+
+
+
+
Have a Great day :)
+
+
+
+
+
-
-
{{ delivery.when_ordered }}
-
{{ delivery.expected_delivery_date }}
-
{{ delivery.gallons_ordered }}
-
{{ delivery.customer_price }}
-
{{ total_amount }}
+
+
{{ delivery.when_ordered }}
+
{{ delivery.expected_delivery_date }}
+
{{ delivery.gallons_ordered }}
+
{{ delivery.customer_price }}
+
{{ total_amount }}
+
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"',