diff --git a/Dockerfile b/Dockerfile
index e62299c..4be3467 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:latest
+FROM node:20.11.1
ENV VITE_BASE_URL="http://localhost:9510"
ENV VITE_AUTO_URL="http://localhost:9514"
diff --git a/Dockerfile.prod b/Dockerfile.prod
index b930d71..9562825 100644
--- a/Dockerfile.prod
+++ b/Dockerfile.prod
@@ -2,6 +2,8 @@
FROM node:20.11.1 AS builder
+ENV TZ="America/New_York"
+
ENV VITE_BASE_URL="http://192.168.1.204:9510"
ENV VITE_PRINT_URL="http://192.168.1.204:9512"
ENV VITE_MONEY_URL="http://192.168.1.204:9513"
diff --git a/src/assets/main.css b/src/assets/main.css
deleted file mode 100755
index 30e3dd3..0000000
--- a/src/assets/main.css
+++ /dev/null
@@ -1,17 +0,0 @@
-select {
- -webkit-appearance: listbox !important
-}
-input[type=file]::-webkit-file-upload-button,
-input[type=file]::file-selector-button {
- /*@apply text-white bg-gray-700 hover:bg-gray-600 rounded-md font-bold text-sm cursor-pointer border-0 py-2.5 pl-4 pr-4;*/
-}
-.wrapper {
- min-height: calc(100vh - 558px);
- margin-top: 20px;
-}
-
-.WrapperPlain {
- min-height: calc(100vh - 75px);
- margin-top: 20px;
-}
-
diff --git a/src/layouts/sidebar/sidebar.vue b/src/layouts/sidebar/sidebar.vue
index 5817725..0a1be9f 100755
--- a/src/layouts/sidebar/sidebar.vue
+++ b/src/layouts/sidebar/sidebar.vue
@@ -61,6 +61,17 @@
Issue Tickets
+
+
+
+
Pending Payment
+
({{ pending_count }})
+
+
+ Pending Payment
+
+
+
Finalized Tickets
@@ -107,16 +118,30 @@ export default defineComponent({
this.getTodayCount();
this.getTommorrowCount();
this.getWaitingCount();
+ this.getPendingCount();
+ this.updatestatus();
},
data() {
return {
waiting_count: 0,
today_count: 0,
tommorrow_count: 0,
+ pending_count: 0,
};
},
methods: {
+ updatestatus() {
+ let path = import.meta.env.VITE_BASE_URL + '/delivery/updatestatus';
+ axios({
+ method: 'get',
+ url: path,
+ headers: authHeader(),
+ }).then((response: any) => {
+ if (response.data.update)
+ console.log("ok")
+ })
+ },
getTodayCount() {
let path = import.meta.env.VITE_BASE_URL + '/deliverystatus/count/today';
axios({
@@ -139,6 +164,17 @@ export default defineComponent({
})
},
+ getPendingCount() {
+ let path = import.meta.env.VITE_BASE_URL + '/deliverystatus/count/pending';
+ axios({
+ method: 'get',
+ url: path,
+ headers: authHeader(),
+ }).then((response: any) => {
+ this.pending_count = response.data.count
+
+ })
+ },
getWaitingCount() {
let path = import.meta.env.VITE_BASE_URL + '/deliverystatus/count/waiting';
axios({
diff --git a/src/main.ts b/src/main.ts
index 3254c8b..02455e1 100755
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,16 +1,13 @@
import { createApp } from 'vue';
import './assets/tailwind.css'
-import './assets/main.css'
import App from './App.vue';
import router from './router';
import Notifications from '@kyvg/vue3-notification';
import Pagination from 'v-pagination-3';
import { createPinia } from 'pinia';
-import { PDFPlugin } from 'vue3-pdfmake';
const app = createApp(App)
app.use(createPinia())
app.use(router)
- app.use(PDFPlugin)
.component('pagination', Pagination);
app.use(Notifications).mount('#app')
\ No newline at end of file
diff --git a/src/pages/Index.vue b/src/pages/Index.vue
index b356b15..6df560a 100755
--- a/src/pages/Index.vue
+++ b/src/pages/Index.vue
@@ -155,6 +155,7 @@ export default defineComponent({
})
},
+
totalgallonsweek() {
let path = import.meta.env.VITE_BASE_URL + '/stats/gallons/week';
axios({
diff --git a/src/pages/card/home.vue b/src/pages/card/home.vue
index 7a17be2..0fc7537 100755
--- a/src/pages/card/home.vue
+++ b/src/pages/card/home.vue
@@ -66,11 +66,11 @@
-
-
+
+
{{ recordsLength }} items Found
-
+
diff --git a/src/pages/customer/home.vue b/src/pages/customer/home.vue
index f418cbf..8de77f7 100755
--- a/src/pages/customer/home.vue
+++ b/src/pages/customer/home.vue
@@ -29,7 +29,7 @@
Quick Tips
@ = last name search
! = address
- # = phone number
+
$ = account number
@@ -48,7 +48,8 @@
-
+
+
|
{{ person['account_number'] }}
@@ -65,7 +66,7 @@
|
{{ person['customer_phone_number'] }} |
-
+ |
Create Delivery
@@ -86,12 +87,14 @@
|
-
-
+
+
-
{{ recordsLength }} items Found
-
+ {{ customer_count }} items Found
+
+
+
diff --git a/src/pages/customer/profile/home.vue b/src/pages/customer/profile/home.vue
index 4c44767..b958a33 100755
--- a/src/pages/customer/profile/home.vue
+++ b/src/pages/customer/profile/home.vue
@@ -252,7 +252,23 @@
{{ card.card_number }}
- {{ card.expiration_month }}/ {{ card.expiration_year }}
+
01
+
02
+
03
+
04
+
05
+
06
+
07
+
08
+
09
+
10
+
11
+
12
+
+
/
+
+
{{ card.expiration_year }}
+
{{ card.zip_code }}
@@ -281,11 +297,30 @@
{{ card.card_number }}
- {{ card.expiration_month }}/ {{ card.expiration_year }}
+
01
+
02
+
03
+
04
+
05
+
06
+
07
+
08
+
09
+
10
+
11
+
12
+
+
/
+
+
{{ card.expiration_year }}
+
{{ card.zip_code }}
+
+ {{ card.security_number }}
+
Edit
@@ -398,9 +433,12 @@
| {{ oil['customer_town'] }} |
{{ oil['customer_name'] }} |
{{ oil['customer_address'] }} |
-
-
- {{ oil['gallons_delivered'] }}
+ |
+ Fill
+ {{ oil['gallons_ordered'] }}
+ |
+
+ {{oil['gallons_delivered']}}
|
{{ oil['expected_delivery_date'] }} |
@@ -497,11 +535,12 @@ export default defineComponent({
name_on_card: '',
main_card: false,
card_number: '',
- expiration_month: '',
+ expiration_month: 0,
type_of_card: '',
last_four_digits: '',
expiration_year: '',
zip_code: '',
+ security_number: '',
}
],
@@ -682,6 +721,7 @@ export default defineComponent({
}).then((response: any) => {
this.customer_last_delivery = response.data.date
+ console.log(response.data)
})
},
getCustomerStats(userid: any) {
diff --git a/src/pages/delivery/create.vue b/src/pages/delivery/create.vue
index 8ca7993..78258d5 100755
--- a/src/pages/delivery/create.vue
+++ b/src/pages/delivery/create.vue
@@ -87,9 +87,6 @@
Create Delivery
-
-
-