diff --git a/src/layouts/headers/headerauth.vue b/src/layouts/headers/headerauth.vue index b7e2aaf..c6dfbc1 100755 --- a/src/layouts/headers/headerauth.vue +++ b/src/layouts/headers/headerauth.vue @@ -13,9 +13,12 @@ - - Auburn Oil - +
+ {{ dayOfWeek }} + + {{ currentDate }} + +
@@ -101,7 +101,7 @@ Print Ticket - + diff --git a/src/pages/customer/home.vue b/src/pages/customer/home.vue index 5d20d81..a18559a 100755 --- a/src/pages/customer/home.vue +++ b/src/pages/customer/home.vue @@ -21,9 +21,7 @@ {{ customer_count }} customers found - - Add New Customer - +
@@ -38,7 +36,7 @@ Town Automatic Phone Number - Actions + @@ -52,22 +50,8 @@ {{ person.customer_town }} {{ person.customer_automatic ? 'Yes' : 'No' }} {{ person.customer_phone_number }} - -
- - New Delivery - - - New Service - - - Edit - - - View - -
- + + diff --git a/src/pages/customer/profile/profile.vue b/src/pages/customer/profile/profile.vue index d5c7405..e24a082 100755 --- a/src/pages/customer/profile/profile.vue +++ b/src/pages/customer/profile/profile.vue @@ -772,7 +772,6 @@ onSubmitSocial(commentText: string) { this.currentParts = response.data; } catch (error) { console.error("Failed to fetch customer parts:", error); - notify({ title: "Error", text: "Could not fetch equipment parts.", type: "error" }); } }, openPartsModal() { diff --git a/src/pages/delivery/update_tickets/finalize_ticket.vue b/src/pages/delivery/update_tickets/finalize_ticket.vue index c0be817..d72ca85 100755 --- a/src/pages/delivery/update_tickets/finalize_ticket.vue +++ b/src/pages/delivery/update_tickets/finalize_ticket.vue @@ -384,7 +384,6 @@ export default defineComponent({ this.total_amount = response.data.delivery.total_amount || 0; this.preChargeTotal = response.data.delivery.total_amount || 0; - this.FinalizeOilOrderForm.gallons_delivered = this.deliveryOrder.gallons_delivered || ''; await this.getCustomer(this.deliveryOrder.customer_id); diff --git a/src/pages/delivery/update_tickets/finalize_ticket_auto.vue b/src/pages/delivery/update_tickets/finalize_ticket_auto.vue index 1bdf334..1215d1e 100644 --- a/src/pages/delivery/update_tickets/finalize_ticket_auto.vue +++ b/src/pages/delivery/update_tickets/finalize_ticket_auto.vue @@ -99,7 +99,7 @@
- +
diff --git a/src/pages/delivery/update_tickets/finalize_ticket_auto_nocc.vue b/src/pages/delivery/update_tickets/finalize_ticket_auto_nocc.vue index 037086c..2bd019a 100644 --- a/src/pages/delivery/update_tickets/finalize_ticket_auto_nocc.vue +++ b/src/pages/delivery/update_tickets/finalize_ticket_auto_nocc.vue @@ -101,7 +101,7 @@
+ class="input input-bordered input-sm w-full max-w-xs" type="number" step="0.01" placeholder="# gallons" />
diff --git a/src/pages/service/ServiceEditModal.vue b/src/pages/service/ServiceEditModal.vue index 47fbcb2..d19bf79 100644 --- a/src/pages/service/ServiceEditModal.vue +++ b/src/pages/service/ServiceEditModal.vue @@ -8,7 +8,7 @@
-

Edit Service Call

+

Service Call

{{ getServiceTypeName(editableService.type_service_call) }} @@ -24,7 +24,7 @@
{{ customer.account_number }}
{{ customer.customer_first_name }} {{ customer.customer_last_name }}
{{ customer.customer_address }}
-
{{ customer.customer_town }}, {{ customer.customer_state }} {{ customer.customer_zip }}
+
{{ customer.customer_town }}, {{ getStateAbbrev(customer.customer_state) }} {{ customer.customer_zip }}
{{ customer.customer_phone_number }}

Loading customer details...

@@ -184,7 +184,12 @@ export default defineComponent({ if (typeId === undefined || typeId === null) return 'gray'; const colorMap: { [key: number]: string } = { 0: 'blue', 1: 'red', 2: 'green', 3: '#B58900', 4: 'black' }; return colorMap[typeId] || 'gray'; + }, + getStateAbbrev(stateId: number | undefined | null): string { + if (stateId === undefined || stateId === null) return 'Unknown'; + const stateMap: { [key: number]: string } = { 0: 'MA', 1: 'RI', 2: 'NH', 3: 'ME', 4: 'VT', 5: 'CT', 6: 'NY' }; + return stateMap[stateId] || 'Unknown'; } }, }); - \ No newline at end of file +