major update

This commit is contained in:
2024-10-17 17:01:42 -04:00
parent 9029993c49
commit c6f806f733
41 changed files with 899 additions and 254 deletions

View File

@@ -210,10 +210,13 @@
</div>
<div class="col-span-12 py-3" v-if="delivery.promo_id != 0">
<div class="col-span-12 font-bold py-5 " v-if="delivery.payment_type == 0">
<div class="">
CASH Total: ${{ total_amount_after_discount }}
<div class="col-span-12 py-3" v-if="delivery.promo_id != null">
<div class="col-span-12 " v-if="delivery.payment_type == 0">
<div class="font-bold py-5">
CASH Total:
</div>
<div class="col-span-12 text-gray-500">
${{ total_amount_after_discount }}
</div>
</div>
<div class="col-span-12 font-bold py-5 text-accent" v-if="delivery.payment_type == 1">
@@ -233,10 +236,13 @@
</div>
</div>
<div class="col-span-12 py-3" v-else>
<div class="col-span-12 font-bold py-5 " v-if="delivery.payment_type == 0">
<div class="">
CASH Total: ${{ total_amount }}
<div class="col-span-12 " v-if="delivery.payment_type == 0">
<div class="font-bold py-5">
CASH Total:
</div>
<div class="col-span-12 text-gray-500">
${{ total_amount }}
</div>
</div>
<div class="col-span-12 font-bold py-5 text-accent" v-if="delivery.payment_type == 1">
<div class="">
@@ -260,32 +266,39 @@
<div class="flex justify-between">
<div class="" v-if="delivery.payment_type == 0">
<button class="btn btn-accent btn-sm" @click="checkoutOilUpdatePayment(0)">
Confirm Cash Payment
<button class="btn bg-green-800 btn-sm" @click="checkoutOilUpdatePayment(0)">
Confirm Delivery
</button>
</div>
<div class="" v-if="delivery.payment_type == 1">
<button class="btn btn-accent btn-sm" @click="checkoutOilUpdatePayment(1)">
Pay Credit Terminal
<button class="btn bg-green-800 btn-sm" @click="checkoutOilUpdatePayment(1)">
Confirm Delivery
</button>
</div>
<div class="" v-if="delivery.payment_type == 2">
<button class="btn btn-accent btn-sm" @click="checkoutOilUpdatePayment(2)">
Cash + Pay Credit Terminal
<button class="btn bg-green-800 btn-sm" @click="checkoutOilUpdatePayment(2)">
Confirm Delivery
</button>
</div>
<div class="" v-if="delivery.payment_type == 3">
<button class="btn btn-accent btn-sm" @click="checkoutOilUpdatePayment(3)">
Check + Pay Credit Terminal
<button class="btn bg-green-800 btn-sm" @click="checkoutOilUpdatePayment(3)">
Confirm Delivery
</button>
</div>
<div class="" v-if="delivery.payment_type == 4">
<button class="btn btn-accent btn-sm" @click="checkoutOilUpdatePayment(3)">
Other
<button class="btn bg-green-800 btn-sm" @click="checkoutOilUpdatePayment(3)">
Confirm Delivery
</button>
</div>
</div>
<div class="col-span-12 py-10">
<router-link :to="{ name: 'deliveryEdit', params: { id: delivery.id } }">
<button class="btn btn-sm btn-secondary">Edit Delivery</button>
</router-link>
</div>
</div>
</div>
</div>
@@ -447,6 +460,7 @@ export default defineComponent({
})
.then((response: any) => {
if (response.data.ok) {
console.log(response.data)
this.priceprime = response.data.priceprime;
this.pricesameday = response.data.pricesameday;
this.priceemergency = response.data.priceemergency;
@@ -530,7 +544,7 @@ export default defineComponent({
.catch(() => {
notify({
title: "Error",
text: "Could not get oil order",
text: "Could not get delivery",
type: "error",
});
});