Total Gallons Delivered
+
+ Total Deliveries Made
+
+
-
@@ -24,10 +24,10 @@
Cancelled
Partial Delivery
Issue
- Finalized
+ Finalized
-
+
{{ props.row.customer_name }}
diff --git a/src/pages/IndexPage.vue b/src/pages/IndexPage.vue
old mode 100644
new mode 100755
index 0cca6a8..f546949
--- a/src/pages/IndexPage.vue
+++ b/src/pages/IndexPage.vue
@@ -89,7 +89,6 @@ export default defineComponent({
})
},
get_employee () {
- console.log(this.user)
const path = import.meta.env.VITE_BASE_URL + '/employee/userid/' + this.user.user_id
axios({
method: "get",
diff --git a/src/pages/TodayDelivery.vue b/src/pages/TodayDelivery.vue
old mode 100644
new mode 100755
index 4dcefe0..f4ad249
--- a/src/pages/TodayDelivery.vue
+++ b/src/pages/TodayDelivery.vue
@@ -1,8 +1,9 @@
@@ -122,12 +124,12 @@ export default defineComponent({
{ name: 'prime', label: 'Prime', field: 'prime' },
{ name: 'same_day', label: 'Same Day', field: 'same_day' },
{ name: 'dispatcher_notes', label: 'Notes', field: 'dispatcher_notes' },
-
]
}
},
mounted() {
this.userStatus()
+ this.updatestatus()
},
methods: {
@@ -146,6 +148,17 @@ export default defineComponent({
}
})
},
+ 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("ok")
+ })
+ },
get_employee() {
const path = import.meta.env.VITE_BASE_URL + '/employee/userid/' + this.user.user_id
axios({
diff --git a/src/pages/TodayFinishedDelivery.vue b/src/pages/TodayFinishedDelivery.vue
new file mode 100644
index 0000000..4ce6ed6
--- /dev/null
+++ b/src/pages/TodayFinishedDelivery.vue
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/TomorrowDelivery.vue b/src/pages/TomorrowDelivery.vue
old mode 100644
new mode 100755
index d6b99f2..9a010a1
--- a/src/pages/TomorrowDelivery.vue
+++ b/src/pages/TomorrowDelivery.vue
@@ -1,7 +1,7 @@
@@ -60,13 +60,13 @@ export default defineComponent({
.then((response: any) => {
if (response.data.ok) {
- this.$router.push({name: "home"});
+ this.$router.push({ name: "home" });
}
})
.catch(() => {
});
},
- sendLogin (payLoad: { username: string; password: string }) {
+ sendLogin(payLoad: { username: string; password: string }) {
let path = import.meta.env.VITE_BASE_URL + "/auth/login"
axios({
method: "post",
@@ -78,7 +78,7 @@ export default defineComponent({
if (response.data.user) {
localStorage.setItem("auth_token", response.data.token)
localStorage.setItem("auth_user", response.data.user)
- this.$router.push({name: "home"})
+ this.$router.push({ name: "home" })
Notify.create({
message: 'You have been logged in!',
@@ -92,7 +92,7 @@ export default defineComponent({
position: 'top'
})
- this.$router.push({name: "lostPassword"});
+ this.$router.push({ name: "lostPassword" });
} else {
Notify.create({
message: "Authorization Failure",
@@ -109,8 +109,7 @@ export default defineComponent({
})
})
},
- onSubmit () {
- console.log("here")
+ onSubmit() {
const payLoad = {
username: this.loginForm.username,
password: this.loginForm.password
@@ -125,6 +124,7 @@ export default defineComponent({
.q-card {
width: 360px;
}
+
.nodec {
text-decoration: none;
}
diff --git a/src/pages/delivery/ViewDelivery.vue b/src/pages/delivery/ViewDelivery.vue
old mode 100644
new mode 100755
index f9c361a..100790c
--- a/src/pages/delivery/ViewDelivery.vue
+++ b/src/pages/delivery/ViewDelivery.vue
@@ -10,10 +10,10 @@
+
+ v-model="filter" class="q-mb-lg">
@@ -27,7 +28,7 @@
Finalized
-
+
{{ props.row.customer_name }}
@@ -71,6 +72,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ props.row.id }}
+
+
+
+ Waiting
+ Delivered
+ Out For Delivery
+ Cancelled
+ Partial Delivery
+ Issue
+ Finalized
+
+
+
+ {{ props.row.customer_name }}
+
+
+
+ {{ props.row.customer_address }}
+
+
+
+ {{ props.row.customer_town }}
+
+
+
+ {{ props.row.gallons_ordered }}
+ Fill
+
+
+
+ No
+ Yes
+
+
+
+ Cash COD
+ Credit
+
+
+
+
+ YES
+
+
+
+
+ YES
+
+
+
+
+ {{ props.row.dispatcher_notes }}
+
+
+
+
+
+
-
@@ -27,7 +27,7 @@
Finalized
-
+
{{ props.row.customer_name }}
diff --git a/src/pages/WaitingDelivery.vue b/src/pages/WaitingDelivery.vue
old mode 100644
new mode 100755
index f503b8c..bb8fee6
--- a/src/pages/WaitingDelivery.vue
+++ b/src/pages/WaitingDelivery.vue
@@ -1,7 +1,7 @@
-
@@ -27,7 +27,7 @@
Finalized
-
+
{{ props.row.customer_name }}
diff --git a/src/pages/auth/Login.vue b/src/pages/auth/Login.vue
old mode 100644
new mode 100755
index a6626e6..748ff7a
--- a/src/pages/auth/Login.vue
+++ b/src/pages/auth/Login.vue
@@ -8,21 +8,21 @@
-
+
-
-
+
-
-
+
-
+
-
+
@@ -138,7 +138,10 @@
-
+
+