Updated looks

This commit is contained in:
2024-04-04 16:38:35 -04:00
parent 2d9fce2e89
commit 7164e41aa1
36 changed files with 2863 additions and 1567 deletions

View File

@@ -15,13 +15,11 @@
</ul>
</div>
<div class="flex start pb-10">Cancelled Deliveries </div>
<div class="flex justify-start pb-5">
</div>
<div class="flex start pb-10 text-2xl">Cancelled Deliveries </div>
<div class="overflow-x-auto">
<div class="flex start"> </div>
<div class="overflow-x-auto bg-neutral">
<table class="table">
<!-- head -->
<thead>

View File

@@ -15,12 +15,10 @@
</ul>
</div>
<div class="flex start pb-10">Delivered Deliveries </div>
<div class="flex justify-start pb-5">
</div>
<div class="flex start pb-10 text-2xl">Delivered Deliveries </div>
<div class="overflow-x-auto">
<div class="overflow-x-auto bg-neutral">
<table class="table">
<!-- head -->

View File

@@ -15,12 +15,10 @@
</ul>
</div>
<div class="flex start pb-10">Finalized Delivery </div>
<div class="flex justify-start pb-5">
</div>
<div class="flex start pb-10 text-2xl">Finalized Delivery </div>
<div class="overflow-x-auto">
<div class="overflow-x-auto bg-neutral">
<table class="table">
<!-- head -->

View File

@@ -15,13 +15,10 @@
</ul>
</div>
<div class="flex start pb-10">Issue with Delivery </div>
<div class="flex justify-start pb-5">
</div>
<div class="flex start pb-10 text-2xl">Issue with Delivery </div>
<div class="overflow-x-auto">
<div class="overflow-x-auto bg-neutral">
<table class="table">
<!-- head -->
<thead>
@@ -81,7 +78,7 @@
<button class="btn btn-accent">View</button>
</router-link>
<router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
<button class="btn btn-accent btn-accent">Edit</button>
<button class="btn btn-accent ">Edit</button>
</router-link>
<button @click.prevent="deleteCall(oil['id'])" class="btn btn-accent">Delete</button>
</td>

View File

@@ -15,20 +15,18 @@
</ul>
</div>
<div class="flex start pb-10">Out for Delivery </div>
<div class="flex justify-start pb-5">
<button @click.prevent="printtTicketAll" class="btn btn-accent">
<div class="flex start pb-10 text-2xl">Todays Deliveries </div>
<div class="flex justify-end pb-5">
<button @click.prevent="printtTicketAll" class="btn btn-accent btn-sm">
Print All
</button>
</div>
<div class="overflow-x-auto">
<div class="overflow-x-auto bg-neutral">
<table class="table">
<!-- head -->
<thead>
<tr>
<th>Delivery Id</th>
<th>Name</th>
<th>Status</th>
@@ -48,7 +46,6 @@
<td>{{ oil['id'] }} </td>
<router-link :to="{ name: 'customerProfile', params: { id: oil['customer_id'] } }">
<td>{{ oil['customer_name'] }} </td>
</router-link>
<td>
@@ -84,15 +81,15 @@
<td class="flex gap-5">
<router-link :to="{ name: 'deliveryOrder', params: { id: oil['id'] } }">
<button class="btn btn-accent">View</button>
<button class="btn btn-accent btn-sm">View</button>
</router-link>
<router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
<button class="btn btn-accent">Edit</button>
<button class="btn btn-accent btn-sm">Edit</button>
</router-link>
<button @click.prevent="deleteCall(oil['id'])" class="btn btn-accent">
<button @click.prevent="deleteCall(oil['id'])" class="btn btn-accent btn-sm">
Delete
</button>
<button @click.prevent="printTicket(oil['id'])" class="btn btn-accent">
<button @click.prevent="printTicket(oil['id'])" class="btn btn-accent btn-sm">
Print
</button>
</td>
@@ -228,7 +225,7 @@ export default defineComponent({
},
printtTicketAll() {
let path = import.meta.env.VITE_PRINT_URL + '/command/printticket/all/print_today';
let path = import.meta.env.VITE_PRINT_URL + '/command/printticket/print_today';
axios({
method: 'delete',
url: path,

View File

@@ -5,7 +5,7 @@
<SideBar />
</div>
<div class=" w-full px-10 ">
<div class="text-sm breadcrumbs pb-10">
<div class="text-sm breadcrumbs mb-10">
<ul>
<li>
<router-link :to="{ name: 'home' }">
@@ -15,14 +15,14 @@
</ul>
</div>
<div class="flex start pb-10">Tommorrows Deliveries </div>
<div class="flex justify-start pb-5">
<button @click.prevent="printtTicketAll" class="btn btn-accent">
<div class="flex start pb-10 text-2xl">Tommorrows Deliveries </div>
<div class="flex justify-end pb-5">
<button @click.prevent="printtTicketAll" class="btn btn-accent btn-sm">
Print All
</button>
</div>
<div class="overflow-x-auto">
<div class="overflow-x-auto bg-neutral">
<div class="flex start"> </div>
<table class="table">
<!-- head -->
@@ -81,15 +81,15 @@
<td class="flex gap-5">
<router-link :to="{ name: 'deliveryOrder', params: { id: oil['id'] } }">
<button class="btn btn-accent">View</button>
<button class="btn btn-accent btn-sm">View</button>
</router-link>
<router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
<button class="btn btn-accent">Edit</button>
<button class="btn btn-accent btn-sm">Edit</button>
</router-link>
<button @click.prevent="deleteCall(oil['id'])" class="btn btn-accent">
<button @click.prevent="deleteCall(oil['id'])" class="btn btn-accent btn-sm">
Delete
</button>
<button @click.prevent="printTicket(oil['id'])" class="btn btn-accent">
<button @click.prevent="printTicket(oil['id'])" class="btn btn-accent btn-sm">
Print
</button>
</td>
@@ -171,7 +171,7 @@ export default defineComponent({
})
},
get_oil_orders(page: any) {
let path = import.meta.env.VITE_BASE_URL + '/delivery/outfordelivery/' + page;
let path = import.meta.env.VITE_BASE_URL + '/delivery/tommorrow/' + page;
axios({
method: 'get',
url: path,
@@ -207,7 +207,7 @@ export default defineComponent({
printtTicketAll() {
let path = import.meta.env.VITE_PRINT_URL + '/command/printticket/all/print_tommorrow';
let path = import.meta.env.VITE_PRINT_URL + '/command/printticket/print_tommorrow';
axios({
method: 'delete',
url: path,

View File

@@ -15,103 +15,102 @@
</ul>
</div>
<div class="flex start pb-10">Waiting Deliveries </div>
<div class="flex justify-start pb-5">
<button @click.prevent="printtTicketAll" class="btn btn-accent">
<div class="flex start pb-10 text-2xl">Waiting Deliveries </div>
<div class="flex justify-end pb-5">
<button @click.prevent="printtTicketAll" class="btn btn-accent btn-sm">
Print All
</button>
</div>
<div class="overflow-x-auto">
<div class="overflow-x-auto bg-neutral">
<table class="table">
<!-- head -->
<thead>
<tr>
<th>Ticket Id</th>
<th>Name</th>
<th>Status</th>
<th>Town</th>
<th>Address</th>
<th>Gallons</th>
<th>Date</th>
<th>Automatic</th>
<th>Prime</th>
<th>Same Day</th>
</tr>
<tr>
<th>Ticket Id</th>
<th>Name</th>
<th>Status</th>
<th>Town</th>
<th>Address</th>
<th>Gallons</th>
<th>Date</th>
<th>Automatic</th>
<th>Prime</th>
<th>Same Day</th>
</tr>
</thead>
<tbody>
<!-- row 1 -->
<tr v-for="oil in deliveries" :key="oil['id']">
<td>{{ oil['id'] }} </td>
<!-- row 1 -->
<tr v-for="oil in deliveries" :key="oil['id']">
<td>{{ oil['id'] }} </td>
<router-link :to="{ name: 'customerProfile', params: { id: oil['customer_id'] } }">
<td>{{ oil['customer_name'] }} </td>
</router-link>
<td>
<div v-if="oil['delivery_status'] == 0">Waiting</div>
<div v-else-if="oil['delivery_status'] == 1">delivered</div>
<div v-else-if="oil['delivery_status'] == 2">Out for Delivery</div>
<div v-else-if="oil['delivery_status'] == 3">Cancelled</div>
<div v-else-if="oil['delivery_status'] == 4">Partial Delivery</div>
<div v-else-if="oil['delivery_status'] == 5">Issue</div>
<div v-else-if="oil['delivery_status'] == 10">Finalized</div>
<div v-else></div>
</td>
<td>
<div v-if="oil['delivery_status'] == 0">Waiting</div>
<div v-else-if="oil['delivery_status'] == 1">delivered</div>
<div v-else-if="oil['delivery_status'] == 2">Out for Delivery</div>
<div v-else-if="oil['delivery_status'] == 3">Cancelled</div>
<div v-else-if="oil['delivery_status'] == 4">Partial Delivery</div>
<div v-else-if="oil['delivery_status'] == 5">Issue</div>
<div v-else-if="oil['delivery_status'] == 10">Finalized</div>
<div v-else></div>
</td>
<td>{{ oil['customer_town'] }}</td>
<td>{{ oil['customer_address'] }}</td>
<td>
<div v-if="oil['customer_asked_for_fill'] == 1">Fill</div>
<div v-else> {{ oil['gallons_ordered'] }}</div>
</td>
<td>{{ oil['expected_delivery_date'] }}</td>
<td>
<div v-if="oil['automatic'] == 0">No</div>
<div v-else>Yes</div>
</td>
<td>
<div v-if="oil['prime'] == 0">No</div>
<div v-else>Yes</div>
</td>
<td>
<div v-if="oil['same_day'] == 0">No</div>
<div v-else>Yes</div>
</td>
<td>{{ oil['customer_town'] }}</td>
<td>{{ oil['customer_address'] }}</td>
<td>
<div v-if="oil['customer_asked_for_fill'] == 1">Fill</div>
<div v-else> {{ oil['gallons_ordered'] }}</div>
</td>
<td>{{ oil['expected_delivery_date'] }}</td>
<td>
<div v-if="oil['automatic'] == 0">No</div>
<div v-else>Yes</div>
</td>
<td>
<div v-if="oil['prime'] == 0">No</div>
<div v-else>Yes</div>
</td>
<td>
<div v-if="oil['same_day'] == 0">No</div>
<div v-else>Yes</div>
</td>
<td class="flex gap-5">
<router-link :to="{ name: 'deliveryOrder', params: { id: oil['id'] } }">
<button class="btn btn-accent">View</button>
</router-link>
<router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
<button class="btn btn-accent">Edit</button>
</router-link>
<button @click.prevent="deleteCall(oil['id'])" class="btn btn-accent">Delete</button>
<button @click.prevent="printTicket(oil['id'])" class="btn btn-accent">Print</button>
</td>
</tr>
<td class="flex gap-5">
<router-link :to="{ name: 'deliveryOrder', params: { id: oil['id'] } }">
<button class="btn btn-accent btn-sm">View</button>
</router-link>
<router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
<button class="btn btn-accent btn-sm">Edit</button>
</router-link>
<button @click.prevent="deleteCall(oil['id'])" class="btn btn-accent btn-sm">Delete</button>
<button @click.prevent="printTicket(oil['id'])" class="btn btn-accent btn-sm">Print</button>
</td>
</tr>
</tbody>
</table>
</div>
<div class="flex justify-center" v-if="recordsLength > 9">
<pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="perPage"
:options="options">
<pagination @paginate="getPage" :records="recordsLength" v-model="page" :per-page="perPage" :options="options">
</pagination>
<div class="flex justify-center mb-10"> {{ recordsLength }} items Found</div>
</div>
</div>
</div>
<Footer/>
<Footer />
</template>
<script lang="ts">
import {defineComponent} from 'vue'
import { defineComponent } from 'vue'
import axios from 'axios'
import authHeader from '../../../services/auth.header'
import Header from '../../../layouts/headers/headerauth.vue'
import PaginationComp from '../../../components/pagination.vue'
import SideBar from '../../../layouts/sidebar/sidebar.vue'
import Footer from '../../../layouts/footers/footer.vue'
import {notify} from "@kyvg/vue3-notification";
import { notify } from "@kyvg/vue3-notification";
export default defineComponent({
name: 'deliveryWaiting',
@@ -158,14 +157,14 @@ export default defineComponent({
withCredentials: true,
headers: authHeader(),
})
.then((response: any) => {
if (response.data.ok) {
this.user = response.data.user;
}
})
.catch(() => {
this.user = null
})
.then((response: any) => {
if (response.data.ok) {
this.user = response.data.user;
}
})
.catch(() => {
this.user = null
})
},
get_oil_orders(page: any) {
let path = import.meta.env.VITE_BASE_URL + '/delivery/waiting/' + page;
@@ -201,7 +200,7 @@ export default defineComponent({
})
},
printtTicketAll() {
let path = import.meta.env.VITE_PRINT_URL + '/command/printticket/all/print_waiting';
let path = import.meta.env.VITE_PRINT_URL + '/command/printticket/print_waiting';
axios({
method: 'delete',
url: path,
@@ -251,6 +250,4 @@ export default defineComponent({
})
</script>
<style scoped>
</style>
<style scoped></style>