From 01c448f3687c15f898fdb5cea84d63d90e433cbb Mon Sep 17 00:00:00 2001 From: Edwin Eames Date: Mon, 23 Dec 2024 18:10:29 -0500 Subject: [PATCH] small fixes --- src/pages/customer/create.vue | 29 ++++- src/pages/delivery/edit.vue | 129 ++++++++++---------- src/pages/delivery/view.vue | 23 ++-- src/pages/delivery/viewstatus/tommorrow.vue | 3 + src/pages/ticket/ticket.vue | 47 ++++++- 5 files changed, 152 insertions(+), 79 deletions(-) diff --git a/src/pages/customer/create.vue b/src/pages/customer/create.vue index a0d0da9..bda8e30 100755 --- a/src/pages/customer/create.vue +++ b/src/pages/customer/create.vue @@ -165,6 +165,8 @@ import SideBar from '../../layouts/sidebar/sidebar.vue' import Footer from '../../layouts/footers/footer.vue' import useValidate from "@vuelidate/core"; import { email, minLength, required } from "@vuelidate/validators"; +import { notify } from "@kyvg/vue3-notification"; + export default defineComponent({ name: 'CustomerCreate', @@ -291,7 +293,11 @@ export default defineComponent({ customer_state: number; customer_description: string; - }) { + }) + + { + + let path = import.meta.env.VITE_BASE_URL + "/customer/create"; axios({ method: "post", @@ -311,6 +317,27 @@ export default defineComponent({ }) }, onSubmit() { + if (this.CreateCustomerForm.basicInfo.customer_zip === ''){ + notify({ + title: "Error", + text: "No zip code added!", + type: "error", + }); + } + if (this.CreateCustomerForm.basicInfo.customer_last_name === ''){ + notify({ + title: "Error", + text: "No last name added!", + type: "error", + }); + } + if (this.CreateCustomerForm.basicInfo.customer_address === ''){ + notify({ + title: "Error", + text: "No address added!", + type: "error", + }); + } let payload = { customer_last_name: this.CreateCustomerForm.basicInfo.customer_last_name, customer_first_name: this.CreateCustomerForm.basicInfo.customer_first_name, diff --git a/src/pages/delivery/edit.vue b/src/pages/delivery/edit.vue index d5db497..83b39f3 100755 --- a/src/pages/delivery/edit.vue +++ b/src/pages/delivery/edit.vue @@ -143,7 +143,11 @@ - +
+ + +
@@ -204,11 +208,7 @@ {{ v$.CreateCustomerForm.basicInfo.delivery_status.$errors[0].$message }}
-
- - -
+
@@ -598,64 +598,6 @@ export default defineComponent({ .catch(() => { }); }, - editOilOrder(payload: { - gallons_ordered: string; - customer_asked_for_fill: boolean; - prime: boolean; - same_day: boolean; - emergency: boolean; - delivery_status: string; - expected_delivery_date: string; - created_delivery_date: string; - dispatcher_notes_taken: string; - cash: boolean; - credit: boolean; - check: boolean; - credit_card_id: any; - promo_id: any; - driver_employee_id: string, - }) { - let path = import.meta.env.VITE_BASE_URL + "/delivery/edit/" + this.deliveryOrder.id; - axios({ - method: "post", - url: path, - data: payload, - withCredentials: true, - headers: authHeader(), - }) - .then((response: any) => { - if (response.data.ok) { - this.updatestatus() - this.$router.push({ name: "deliveryOrder", params: { id: this.deliveryOrder.id } }); - } - if (response.data.error) { - this.$router.push("/"); - } - }) - }, - - onSubmit() { - let payload = { - gallons_ordered: this.CreateOilOrderForm.basicInfo.gallons_ordered, - customer_asked_for_fill: this.CreateOilOrderForm.basicInfo.customer_asked_for_fill, - expected_delivery_date: this.CreateOilOrderForm.basicInfo.expected_delivery_date, - created_delivery_date: this.CreateOilOrderForm.basicInfo.created_delivery_date, - dispatcher_notes_taken: this.CreateOilOrderForm.basicInfo.dispatcher_notes_taken, - prime: this.CreateOilOrderForm.basicInfo.prime, - emergency: this.CreateOilOrderForm.basicInfo.emergency, - same_day: this.CreateOilOrderForm.basicInfo.same_day, - delivery_status: this.CreateOilOrderForm.basicInfo.delivery_status, - driver_employee_id: this.CreateOilOrderForm.basicInfo.driver_driver, - cash: this.CreateOilOrderForm.basicInfo.cash, - credit: this.CreateOilOrderForm.basicInfo.card, - check: this.CreateOilOrderForm.basicInfo.check, - promo_id: this.CreateOilOrderForm.basicInfo.promo_id, - credit_card_id: this.CreateOilOrderForm.basicInfo.userCards, - }; - - this.editOilOrder(payload); - - }, updatestatus() { let path = import.meta.env.VITE_BASE_URL + '/delivery/updatestatus'; axios({ @@ -697,6 +639,65 @@ export default defineComponent({ }); }, + editOilOrder(payload: { + gallons_ordered: string; + customer_asked_for_fill: boolean; + prime: boolean; + same_day: boolean; + emergency: boolean; + delivery_status: string; + expected_delivery_date: string; + created_delivery_date: string; + dispatcher_notes_taken: string; + cash: boolean; + credit: boolean; + check: boolean; + credit_card_id: any; + promo_id: any; + driver_employee_id: string, + }) { + let path = import.meta.env.VITE_BASE_URL + "/delivery/edit/" + this.deliveryOrder.id; + axios({ + method: "post", + url: path, + data: payload, + withCredentials: true, + headers: authHeader(), + }) + .then((response: any) => { + if (response.data.ok === 'true') { + this.updatestatus() + this.$router.push({ name: "deliveryOrder", params: { id: this.deliveryOrder.id } }); + } + if (response.data.error) { + this.$router.push("/"); + } + }) + }, + + onSubmit() { + let payload = { + gallons_ordered: this.CreateOilOrderForm.basicInfo.gallons_ordered, + customer_asked_for_fill: this.CreateOilOrderForm.basicInfo.customer_asked_for_fill, + expected_delivery_date: this.CreateOilOrderForm.basicInfo.expected_delivery_date, + created_delivery_date: this.CreateOilOrderForm.basicInfo.created_delivery_date, + dispatcher_notes_taken: this.CreateOilOrderForm.basicInfo.dispatcher_notes_taken, + prime: this.CreateOilOrderForm.basicInfo.prime, + emergency: this.CreateOilOrderForm.basicInfo.emergency, + same_day: this.CreateOilOrderForm.basicInfo.same_day, + delivery_status: this.CreateOilOrderForm.basicInfo.delivery_status, + driver_employee_id: this.CreateOilOrderForm.basicInfo.driver_driver, + cash: this.CreateOilOrderForm.basicInfo.cash, + credit: this.CreateOilOrderForm.basicInfo.card, + check: this.CreateOilOrderForm.basicInfo.check, + promo_id: this.CreateOilOrderForm.basicInfo.promo_id, + credit_card_id: this.CreateOilOrderForm.basicInfo.userCards, + }; + + this.editOilOrder(payload); + + }, + }, }) diff --git a/src/pages/delivery/view.vue b/src/pages/delivery/view.vue index 0d1dad3..19fa10d 100755 --- a/src/pages/delivery/view.vue +++ b/src/pages/delivery/view.vue @@ -99,13 +99,13 @@
- Status + Status
waiting
delivered
Out for Delivery
-
Cancelled
+
tommorrow
Partial Delivery
misdelivery
unknown
@@ -156,6 +156,7 @@
Prime Required: No
+
@@ -165,7 +166,14 @@ Same Day: No
- +
+
+ Emergency: Yes +
+
+ Emergency: No +
+
@@ -290,7 +298,7 @@ {{ userCard.name_on_card }}
- ****-****-****-{{ userCard.last_four_digits }} + {{ userCard.card_number }}
{{ userCard.expiration_month }}/ {{ userCard.expiration_year }} @@ -311,7 +319,7 @@ {{ userCard.name_on_card }}
- ****-****-****-{{ userCard.last_four_digits }} + {{ userCard.card_number }}
{{ userCard.expiration_month }}/ {{ userCard.expiration_year }} @@ -332,7 +340,7 @@ {{ userCard.name_on_card }}
- ****-****-****-{{ userCard.last_four_digits }} + {{ userCard.card_number }}
{{ userCard.expiration_month }}/ {{ userCard.expiration_year }} @@ -602,8 +610,7 @@ export default defineComponent({ withCredentials: true, }) .then((response: any) => { - - if (response.data.userCard.card_number === '') { + if (response.data.card_number === '') { this.userCard === null; this.userCardfound = false; } diff --git a/src/pages/delivery/viewstatus/tommorrow.vue b/src/pages/delivery/viewstatus/tommorrow.vue index a704883..86c19b9 100644 --- a/src/pages/delivery/viewstatus/tommorrow.vue +++ b/src/pages/delivery/viewstatus/tommorrow.vue @@ -88,6 +88,9 @@ + + +
@@ -80,7 +80,7 @@
-
+
{{ past_delivery.when_delivered }} - {{ past_delivery.gallons_delivered }}
@@ -110,8 +110,7 @@
-
{{ delivery.customer_price }}
({{ - delivery.customer_price - promo.money_off_delivery }}) +
{{ delivery.customer_price }}
({{ promoprice}})
{{ delivery.customer_price }}
@@ -220,6 +219,13 @@ export default defineComponent({ customer_phone_number: '', account_number: '', }, + customer_tank: { + id: 0, + last_tank_inspection: null, + tank_status: false, + outside_or_inside: false, + tank_size: 0, + }, customer_description: { id: 0, customer_id: 0, @@ -228,6 +234,7 @@ export default defineComponent({ fill_location: 0, description: '', }, + promoprice: 0, promo_active: false, promo: { id: 0, @@ -275,6 +282,7 @@ export default defineComponent({ if (this.delivery.promo_id != null) { this.getPromo(this.delivery.promo_id); this.promo_active = true; + this.getPrice(delivery_id) } }) @@ -335,6 +343,18 @@ export default defineComponent({ this.getPastDeliveries1(this.customer.id) this.getPastDeliveries2(this.customer.id) this.getCustomerDescription(this.customer.id) + this.getCustomerTank(this.customer.id) + }) + }, + 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 + }) }, @@ -358,6 +378,21 @@ export default defineComponent({ this.past_deliveries2 = response.data }) }, + + getPrice(delivery_id: any) { + let path = import.meta.env.VITE_BASE_URL + "/promo/promoprice/" + delivery_id; + axios({ + method: "get", + url: path, + withCredentials: true, + headers: authHeader(), + }) + .then((response: any) => { + if (response.data) { + this.promoprice = response.data.price + } + }) + }, getPromo(promo_id: any) { let path = import.meta.env.VITE_BASE_URL + "/promo/" + promo_id; axios({