Ticket good printing
This commit is contained in:
@@ -90,6 +90,7 @@
|
||||
<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>
|
||||
<div v-else-if="deliveryOrder.delivery_status == 10">Finalized</div>
|
||||
<div v-else></div>
|
||||
</div>
|
||||
|
||||
@@ -111,7 +112,7 @@
|
||||
<div class="col-span-12 font-bold mt-5">
|
||||
When Delivered
|
||||
</div>
|
||||
<div class="col-span-12 text-gray-500 " >
|
||||
<div class="col-span-12 text-gray-500 ">
|
||||
{{ deliveryOrder.when_delivered }}
|
||||
</div>
|
||||
|
||||
@@ -121,8 +122,6 @@
|
||||
<div class="col-span-12 text-gray-500">
|
||||
{{ deliveryOrder.driver_first_name }} {{ deliveryOrder.driver_last_name }}
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -130,15 +129,9 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-span-6 ">
|
||||
<div class="grid grid-cols-12 ">
|
||||
<div class="col-span-12 py-3">
|
||||
<div class="col-span-12">
|
||||
<div v-if="deliveryOrder.prime == 1">
|
||||
<div class="col-span-12 ">
|
||||
Prime
|
||||
@@ -177,7 +170,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 mt-5">
|
||||
<div class="col-span-12 ">
|
||||
<div class="col-span-12 font-bold">
|
||||
Payment
|
||||
</div>
|
||||
@@ -188,17 +181,12 @@
|
||||
<div v-else-if="deliveryOrder.payment_type == 2">Credit Card & cash</div>
|
||||
<div v-else>No Payment Type Added</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 mt-5">
|
||||
<div class="col-span-12 font-bold">
|
||||
<div class="grid grid-cols-12 mb-5">
|
||||
|
||||
<div class="col-span-12 ">
|
||||
Price / Gallon
|
||||
</div>
|
||||
@@ -206,7 +194,6 @@
|
||||
{{ deliveryOrder.customer_price }}
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12 " v-if="deliveryOrder.customer_asked_for_fill == 1">
|
||||
<div class="">
|
||||
Gallons Ordered:
|
||||
@@ -216,7 +203,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12 py-3">
|
||||
<div class="">
|
||||
Gallons delivered:
|
||||
@@ -226,7 +212,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12 py-3">
|
||||
<div class="">
|
||||
Gallons Ordered:
|
||||
@@ -236,7 +221,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12" v-if="deliveryOrder.prime == 1">
|
||||
<div class="">
|
||||
Prime Fee:
|
||||
@@ -246,17 +230,15 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12 " v-if="deliveryOrder.same_day === 1">
|
||||
<div>
|
||||
Same Day
|
||||
Same Day
|
||||
</div>
|
||||
<div class="col-span-12 text-gray-500">
|
||||
{{ pricing.price_same_day }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12 " v-if="deliveryOrder.payment_type == 0">
|
||||
<div class="col-span-12 ">
|
||||
cash total:
|
||||
@@ -266,11 +248,9 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="col-span-12 py-5 " v-if="deliveryOrder.payment_type == 1">
|
||||
<div class="flex">
|
||||
|
||||
<div class="flex">
|
||||
|
||||
<div class="rounded-md border-2 bg-accent">
|
||||
<div class="flex p-2">
|
||||
{{ userCard.type_of_card }}
|
||||
@@ -285,13 +265,12 @@
|
||||
{{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 py-5 " v-if="deliveryOrder.payment_type == 2">
|
||||
<div class="flex ">
|
||||
|
||||
<div class="col-span-12 py-5 " v-if="deliveryOrder.payment_type == 2">
|
||||
<div class="flex ">
|
||||
|
||||
<div class=" rounded-md border-2 bg-accent ">
|
||||
|
||||
<div class="flex p-1 pl-4">
|
||||
@@ -303,13 +282,13 @@
|
||||
<div class="flex p-1 pl-4">
|
||||
{{ userCard.expiration_month }}/ {{ userCard.expiration_year }}
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-span-12 font-bold py-5 text-lg text-accent" v-if="deliveryOrder.payment_type == 1">
|
||||
<div >
|
||||
<div>
|
||||
Pre Charge Credit Card Total
|
||||
</div>
|
||||
<div class="col-span-12 text-green-500">
|
||||
@@ -317,31 +296,31 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-span-12 font-bold py-5 text-lg text-accent" v-if="deliveryOrder.payment_type == 2">
|
||||
<div >
|
||||
<div>
|
||||
Pre Charge Credit Card Total
|
||||
</div>
|
||||
<div class="col-span-12 text-green-500">
|
||||
${{ total_amount }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<form class="rounded-md " enctype="multipart/form-data" @submit.prevent="onSubmit">
|
||||
<div class="grid grid-cols-12 p-5">
|
||||
<div class="col-span-12 md:col-span-12 flex mt-5 mb-5">
|
||||
<button class="btn btn-sm btn-accent">
|
||||
Finalize Delivery
|
||||
</button>
|
||||
<div v-if="deliveryOrder.delivery_status !== 10">
|
||||
<form class="rounded-md " enctype="multipart/form-data" @submit.prevent="onSubmit">
|
||||
<div class="grid grid-cols-12 p-5">
|
||||
<div class="col-span-12 md:col-span-12 flex mt-5 mb-5">
|
||||
<button class="btn btn-sm btn-accent">
|
||||
Finalize Delivery
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</form>
|
||||
</div>
|
||||
<div v-else>Order was finalized</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -481,7 +460,7 @@ export default defineComponent({
|
||||
$route() {
|
||||
this.sumdelivery(this.$route.params.id);
|
||||
this.getOilOrder(this.$route.params.id);
|
||||
|
||||
|
||||
|
||||
},
|
||||
},
|
||||
@@ -520,11 +499,11 @@ export default defineComponent({
|
||||
if (response.data) {
|
||||
this.deliveryOrder = response.data
|
||||
this.getCustomer(this.deliveryOrder.customer_id)
|
||||
|
||||
if (this.deliveryOrder.payment_type === 1 ) {
|
||||
|
||||
if (this.deliveryOrder.payment_type === 1) {
|
||||
this.getPaymentCard(this.deliveryOrder.payment_card_id);
|
||||
}
|
||||
if (this.deliveryOrder.payment_type === 2 ) {
|
||||
if (this.deliveryOrder.payment_type === 2) {
|
||||
this.getPaymentCard(this.deliveryOrder.payment_card_id);
|
||||
}
|
||||
if (response.data.prime == 1) {
|
||||
|
||||
Reference in New Issue
Block a user