Updated forms

This commit is contained in:
2024-10-24 11:50:58 -04:00
parent c6f806f733
commit cae64eec86
21 changed files with 1186 additions and 924 deletions

View File

@@ -44,8 +44,8 @@
<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 class="col-span-12 " v-if="delivery.customer_asked_for_fill == 0">
{{delivery.gallons_ordered }}</div>
<div class="col-span-12 " v-else>Fill</div>
{{ delivery.gallons_ordered }}</div>
<div class="col-span-12 " v-else>Fill</div>
</div>
@@ -92,34 +92,33 @@
<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>
{{ 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" v-if="promo_active">
<div class="flex gap-2">
<div class="line-through"> {{ delivery.customer_price }}</div> ({{
delivery.customer_price - promo.money_off_delivery}})
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-if="delivery.customer_asked_for_fill == 0">
<div v-if="promo_active">
{{ total_amount_after_discount }}
</div>
<div v-else> {{ total_amount }}</div>
</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>
@@ -142,7 +141,6 @@ export default defineComponent({
Header,
SideBar,
Footer,
},
data() {
@@ -298,7 +296,10 @@ export default defineComponent({
if (response.data.ok) {
this.priceprime = response.data.priceprime;
this.pricesameday = response.data.pricesameday;
this.priceemergency = response.data.priceemergency;
this.total_amount = response.data.total_amount;
this.discount = response.data.discount;
this.total_amount_after_discount = response.data.total_amount_after_discount;
}
})
.catch(() => {