Eamco/eamco_office_frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
Edwin Eames
2024-12-23 18:10:29 -05:00
parent bf49bf5711
commit 01c448f368
5 changed files with 152 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/pages/customer/create.vue
View File

@@ -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,

129
src/pages/delivery/edit.vue
View File

@@ -143,7 +143,11 @@
</span>
</div>
<div class="col-span-12 md:col-span-4 mb-5 md:mb-0 gap-10">
<label class="block text-white text-sm font-bold cursor-pointer label">Fill </label>
<input v-model="CreateOilOrderForm.basicInfo.customer_asked_for_fill" class="checkbox checkbox-xs" id="fill"
type="checkbox" />
</div>
<div class="col-span-12 md:col-span-4 mb-5 md:mb-0 gap-10">
<label class="block text-white text-sm font-bold cursor-pointer label">Cash</label>
@@ -204,11 +208,7 @@
{{ v$.CreateCustomerForm.basicInfo.delivery_status.$errors[0].$message }}
</span>
</div>
<div class="col-span-12 md:col-span-4 mb-5 md:mb-0 gap-10">
<label class="block text-white text-sm font-bold cursor-pointer label">Fill </label>
<input v-model="CreateOilOrderForm.basicInfo.customer_asked_for_fill" class="checkbox checkbox-xs" id="fill"
type="checkbox" />
</div>
<div class="mb-4">
<label class="block text-white text-sm font-bold mb-2">Delivery Created </label>
@@ -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);
},
},
})
</script>

23
src/pages/delivery/view.vue
View File

@@ -99,13 +99,13 @@
</div>
<div class="grid grid-cols-12 p-5">
<div class="col-span-12 font-bold">
Status
Status
</div>
<div class="col-span-12 text-sm mb-5 text-gray-500">
<div v-if="deliveryOrder.delivery_status == 0">waiting</div>
<div v-else-if="deliveryOrder.delivery_status == 1">delivered</div>
<div v-else-if="deliveryOrder.delivery_status == 2">Out for Delivery</div>
<div v-else-if="deliveryOrder.delivery_status == 3">Cancelled</div>
<div v-else-if="deliveryOrder.delivery_status == 3">tommorrow</div>
<div v-else-if="deliveryOrder.delivery_status == 4">Partial Delivery</div>
<div v-else-if="deliveryOrder.delivery_status == 5">misdelivery</div>
<div v-else-if="deliveryOrder.delivery_status == 6">unknown</div>
@@ -156,6 +156,7 @@
<div v-if="deliveryOrder.prime == 0">
Prime Required: No
</div>
</div>
<div class="col-span-12 text-gray-500">
<div v-if="deliveryOrder.same_day == 1">
@@ -165,7 +166,14 @@
Same Day: No
</div>
</div>
<div class="col-span-12 text-gray-500">
<div v-if="deliveryOrder.emergency == 1">
Emergency: Yes
</div>
<div v-if="deliveryOrder.emergency == 0">
Emergency: No
</div>
</div>
@@ -290,7 +298,7 @@
{{ userCard.name_on_card }}
</div>
<div class="flex p-1 pl-4">
****-****-****-{{ userCard.last_four_digits }}
{{ userCard.card_number }}
</div>
<div class="flex p-1 pl-4">
{{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
@@ -311,7 +319,7 @@
{{ userCard.name_on_card }}
</div>
<div class="flex p-1 pl-4">
****-****-****-{{ userCard.last_four_digits }}
{{ userCard.card_number }}
</div>
<div class="flex p-1 pl-4">
{{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
@@ -332,7 +340,7 @@
{{ userCard.name_on_card }}
</div>
<div class="flex p-1 pl-4">
****-****-****-{{ userCard.last_four_digits }}
{{ userCard.card_number }}
</div>
<div class="flex p-1 pl-4">
{{ 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;
}

3
src/pages/delivery/viewstatus/tommorrow.vue
View File

@@ -88,6 +88,9 @@
<router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
<button class="btn btn-secondary btn-sm">Edit Delivery</button>
</router-link>
<router-link :to="{ name: 'finalizeTicket', params: { id: oil['id'] } }">
<button class="btn btn-secondary btn-sm">Finalize</button>
</router-link>
<router-link :to="{ name: 'Ticket', params: { id: oil['id'] } }">
<button class="btn btn-success btn-sm ">
Print Ticket

47
src/pages/ticket/ticket.vue
View File

@@ -7,9 +7,9 @@
<div class="col-span-2 pt-2 pl-4">#2 </div>
<div class="col-span-2 pt-2"></div>
<div class="col-span-2 pt-2"></div>
<div class="col-span-2 pt-2 "></div>
<div class="col-span-1 pt-2 "></div>
<div class="col-span-3 text-xs pt-2 ">{{ customer.customer_phone_number }}</div>
<div class="col-span-2 pt-2 ">{{ customer_tank.tank_size }}</div>
<div class="col-span-1 pt-2 ">{{ customer_description.fill_location }}</div>
<div class="col-span-3 text-xs pt-3 ">{{ customer.customer_phone_number }}</div>
</div>
<div class="grid grid-cols-12 pt-2 pb-2">
@@ -80,7 +80,7 @@
<div class="col-span-6 ">
<div v-if="past_deliveries1.length > 1">
<div class="col-span-6" v-for="past_delivery in past_deliveries1">
<div class="">
<div class="" v-if="past_delivery.gallons_delivered != 0.00">
{{ past_delivery.when_delivered }} - {{ past_delivery.gallons_delivered }}
</div>
</div>
@@ -110,8 +110,7 @@
<div class="col-span-12 h-7 pl-4 pt-2" v-if="promo_active">
<div class="flex gap-2">
<div class="line-through"> {{ delivery.customer_price }}</div> ({{
delivery.customer_price - promo.money_off_delivery }})
<div class="line-through"> {{ delivery.customer_price }}</div> ({{ promoprice}})
</div>
</div>
<div class="col-span-12 h-7 pl-4 pt-2" v-else>{{ delivery.customer_price }}</div>
@@ -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({