added promo. fixed bugs
This commit is contained in:
@@ -28,69 +28,94 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="grid grid-cols-12 pl-6 pb-20 ">
|
||||
<div class="grid grid-cols-12 pl-6 pb-8 ">
|
||||
<div class="col-span-12 ">{{ delivery.dispatcher_notes }}</div>
|
||||
<div class="col-span-12 ">{{ customer_description.description }}</div>
|
||||
<div class="col-span-12 " v-if="delivery.promo_id !== null">Promo: {{ promo.text_on_ticket }}</div>
|
||||
<div class="col-span-12 "></div>
|
||||
<div class="col-span-12 " v-if="delivery.prime == 1">PRIME</div>
|
||||
<div class="col-span-12 " v-if="delivery.same_day == 1">SAME DAY</div>
|
||||
<div class="col-span-12 " v-if="delivery.emergency == 1">EMERGENCY</div>
|
||||
|
||||
<div class="col-span-12 text-lg" v-if="delivery.payment_type == 0">CASH</div>
|
||||
<div class="col-span-12 text-lg" v-else-if="delivery.payment_type == 1">Credit Card</div>
|
||||
<div class="col-span-12 text-lg" v-else-if="delivery.payment_type == 2">Credit Card/Cash</div>
|
||||
<div class="col-span-12 text-lg" v-else-if="delivery.payment_type == 3">Check</div>
|
||||
<div class="col-span-12 text-lg" v-else-if="delivery.payment_type == 4">Other</div>
|
||||
<div class="col-span-12" v-else></div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<div class="grid grid-cols-12">
|
||||
<div class="col-span-6 ">
|
||||
<div class="col-span-12 pl-5">Auburn Oil
|
||||
</div>
|
||||
<div class="col-span-12 pl-5">PO BOX 123</div>
|
||||
<div class="col-span-8 pl-5">
|
||||
<div class="grid grid-cols-12">
|
||||
<div class="col-span-5"> Auburn</div>
|
||||
<div class="col-span-3">
|
||||
Ma
|
||||
</div>
|
||||
<div class="col-span-4">01501 </div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<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="">
|
||||
{{ past_delivery.when_delivered }} - {{ past_delivery.gallons_delivered }}
|
||||
<div class="col-span-12 pl-5">Auburn Oil</div>
|
||||
<div class="col-span-12 pl-5">PO BOX 123</div>
|
||||
<div class="col-span-8 pl-5">
|
||||
<div class="grid grid-cols-12">
|
||||
<div class="col-span-5"> Auburn</div>
|
||||
<div class="col-span-3">
|
||||
Ma
|
||||
</div>
|
||||
<div class="col-span-4">01501 </div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-span-12 pl-5">508 426 8800</div>
|
||||
</div>
|
||||
<div v-else >
|
||||
<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="">
|
||||
{{ past_delivery.when_delivered }} - {{ past_delivery.gallons_delivered }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else>
|
||||
<div class="col-span-6 text-center">Have a Great day :)</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-span-6 ">
|
||||
<div class="col-span-4 ">
|
||||
<div class="grid grid-cols-12 ">
|
||||
<div class="col-span-12 h-7 pl-4 pt-2">{{ delivery.when_ordered }}</div>
|
||||
<div class="col-span-12 h-7 pl-4 pt-2">{{ delivery.expected_delivery_date }}</div>
|
||||
|
||||
<div class="col-span-12 h-7 pl-4 pt-2" v-if="delivery.customer_asked_for_fill == 0 ">{{ delivery.gallons_ordered }}</div>
|
||||
<div class="col-span-12 h-7 pl-4 pt-2" v-if="delivery.customer_asked_for_fill == 0">{{
|
||||
delivery.gallons_ordered }}</div>
|
||||
<div class="col-span-12 h-7 pl-4 pt-2" v-else></div>
|
||||
<div class="col-span-12 h-7 pl-4 pt-2">{{ delivery.customer_price }} </div>
|
||||
|
||||
<div class="col-span-12 h-7 pl-4 pt-4" v-if="delivery.customer_asked_for_fill == 0 ">{{ total_amount }} </div>
|
||||
|
||||
<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>
|
||||
</div>
|
||||
<div class="col-span-12 h-7 pl-4 pt-2" v-else>{{ delivery.customer_price }}</div>
|
||||
|
||||
|
||||
<div class="col-span-12 h-7 pl-4 pt-4" v-if="delivery.customer_asked_for_fill == 0">{{
|
||||
total_amount }} </div>
|
||||
<div class="col-span-12 h-7 pl-4 pt-4" v-else></div>
|
||||
|
||||
|
||||
<div class="col-span-12 h-7 pt-6"></div>
|
||||
<div class="col-span-12 h-7"></div>
|
||||
<div class="col-span-12 h-7 pl-8"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -153,7 +178,7 @@ export default defineComponent({
|
||||
automatic: 0,
|
||||
oil_id: 0,
|
||||
supplier_price: '',
|
||||
customer_price: '',
|
||||
customer_price: 0,
|
||||
customer_temperature: '',
|
||||
dispatcher_notes: '',
|
||||
prime: 0,
|
||||
@@ -164,6 +189,7 @@ export default defineComponent({
|
||||
driver_employee_id: 0,
|
||||
driver_first_name: '',
|
||||
driver_last_name: '',
|
||||
promo_id: 0,
|
||||
},
|
||||
customer: {
|
||||
id: 0,
|
||||
@@ -187,9 +213,20 @@ export default defineComponent({
|
||||
fill_location: 0,
|
||||
description: '',
|
||||
},
|
||||
promo_active: false,
|
||||
promo: {
|
||||
id: 0,
|
||||
name_of_promotion: '',
|
||||
description: '',
|
||||
money_off_delivery: 0,
|
||||
text_on_ticket: ''
|
||||
},
|
||||
priceprime: 0,
|
||||
pricesameday: 0,
|
||||
priceemergency: 0,
|
||||
total_amount: 0,
|
||||
discount: 0,
|
||||
total_amount_after_discount: 0,
|
||||
|
||||
}
|
||||
},
|
||||
@@ -220,6 +257,10 @@ export default defineComponent({
|
||||
.then((response: any) => {
|
||||
this.delivery = response.data;
|
||||
this.getCustomer(this.delivery.customer_id)
|
||||
if (this.delivery.promo_id != null) {
|
||||
this.getPromo(this.delivery.promo_id);
|
||||
this.promo_active = true;
|
||||
}
|
||||
|
||||
})
|
||||
.catch(() => {
|
||||
@@ -287,7 +328,6 @@ export default defineComponent({
|
||||
headers: authHeader(),
|
||||
}).then((response: any) => {
|
||||
this.past_deliveries1 = response.data
|
||||
console.log(this.past_deliveries1);
|
||||
})
|
||||
},
|
||||
getPastDeliveries2(userid: any) {
|
||||
@@ -300,6 +340,21 @@ export default defineComponent({
|
||||
this.past_deliveries2 = response.data
|
||||
})
|
||||
},
|
||||
getPromo(promo_id: any) {
|
||||
let path = import.meta.env.VITE_BASE_URL + "/promo/" + promo_id;
|
||||
axios({
|
||||
method: "get",
|
||||
url: path,
|
||||
withCredentials: true,
|
||||
headers: authHeader(),
|
||||
})
|
||||
.then((response: any) => {
|
||||
if (response.data) {
|
||||
this.promo = response.data
|
||||
// this.delivery.promo_id = this.promo.id
|
||||
}
|
||||
})
|
||||
},
|
||||
},
|
||||
})
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user