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

added emergency price/ checks info

Browse Source
This commit is contained in:
Edwin Eames
2024-09-26 08:49:14 -04:00
parent d927f71a55
commit c7907bed8d
8 changed files with 89 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,7 +93,6 @@
</div>
</div>
<div class=" rounded-md mx-5 my-5">
<div class="flex">
Order Date:
@@ -129,6 +128,10 @@
<input v-model="CreateOilOrderForm.basicInfo.card" class="checkbox checkbox-xs" id="Credit"
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">Check</label>
<input v-model="CreateOilOrderForm.basicInfo.check" class="checkbox checkbox-xs" id="check" type="checkbox" />
</div>
<div class="flex-1 mb-4">
<label class="block text-white text-sm font-bold mb-2">Customer Cards Payment</label>
<select class="select select-bordered select-sm w-full max-w-xs" aria-label="Default select example"
@@ -309,6 +312,7 @@ export default defineComponent({
credit_card_id: 0,
cash: false,
card: false,
check: false,
driver_driver: '',
},
},
@@ -392,15 +396,24 @@ export default defineComponent({
if (response.data.delivery.payment_type == 0) {
this.CreateOilOrderForm.basicInfo.card = false
this.CreateOilOrderForm.basicInfo.cash = true
this.CreateOilOrderForm.basicInfo.check = false
}
if (response.data.delivery.payment_type == 1) {
this.CreateOilOrderForm.basicInfo.card = true
this.CreateOilOrderForm.basicInfo.cash = false
this.CreateOilOrderForm.basicInfo.check = false
}
if (response.data.delivery.payment_type == 2) {
this.CreateOilOrderForm.basicInfo.card = true
this.CreateOilOrderForm.basicInfo.cash = true
this.CreateOilOrderForm.basicInfo.check = false
}
if (response.data.delivery.payment_type == 3) {
this.CreateOilOrderForm.basicInfo.card = false
this.CreateOilOrderForm.basicInfo.cash = false
this.CreateOilOrderForm.basicInfo.check = true
}
}
})
},
@@ -481,6 +494,7 @@ export default defineComponent({
dispatcher_notes_taken: string;
cash: boolean;
credit: boolean;
check: boolean;
credit_card_id: any;
driver_employee_id: string,
}) {
@@ -514,6 +528,7 @@ export default defineComponent({
driver_employee_id: this.CreateOilOrderForm.basicInfo.driver_driver,
cash: this.CreateOilOrderForm.basicInfo.cash,
credit: this.CreateOilOrderForm.basicInfo.card,
check: this.CreateOilOrderForm.basicInfo.check,
credit_card_id: this.CreateOilOrderForm.basicInfo.userCards,
};
this.editOilOrder(payload);

31
src/pages/delivery/home.vue
View File

@@ -48,6 +48,7 @@
<th>Automatic</th>
<th>Prime</th>
<th>Same Day</th>
<th>Payment</th>
</tr>
</thead>
<tbody>
@@ -88,8 +89,38 @@
<div v-if="oil['same_day'] == 0">No</div>
<div v-else>Yes</div>
</td>
<td>
<div v-if="oil['payment_type'] == 0">Cash</div>
<div v-else-if="oil['payment_type'] == 1">CC</div>
<div v-else-if="oil['payment_type'] == 2">Cash/CC</div>
<div v-else-if="oil['payment_type'] == 3">Check</div>
<div v-else-if="oil['payment_type'] == 4">Other</div>
<div v-else></div>
</td>
<td class="flex gap-5">
<router-link :to="{ name: 'deliveryOrder', params: { id: oil['id'] } }">
<button class="btn btn-accent btn-sm">View</button>
</router-link>
<router-link :to="{ name: 'deliveryEdit', params: { id: oil['id'] } }">
<button class="btn btn-accent btn-sm">Edit</button>
</router-link>
<router-link :to="{ name: 'Ticket', params: { id: oil['id'] } }">
<button class="btn btn-accent btn-sm">
Print
</button>
</router-link>
<button @click.prevent="deleteCall(oil['id'])" class="btn btn-error btn-sm">
Delete
</button>
<router-link :to="{ name: 'finalizeTicket', params: { id: oil['id'] } }">
<button class="btn btn-accent btn-sm">Finalize</button>
</router-link>

15
src/pages/delivery/viewstatus/out_for_delivery.vue
View File

@@ -32,9 +32,10 @@
<th>Address</th>
<th>Gallons</th>
<th>Date</th>
<th>Automatic</th>
<th>Auto</th>
<th>Prime</th>
<th>Same Day</th>
<th>Payment</th>
</tr>
</thead>
<tbody>
@@ -47,7 +48,7 @@
<td>
<div class="hover:text-accent">{{ oil['customer_name'] }} </div>
</td>
</router-link>
</router-link>
<td>
<div v-if="oil['delivery_status'] == 0">Waiting</div>
<div v-else-if="oil['delivery_status'] == 1">delivered</div>
@@ -78,7 +79,17 @@
<div v-if="oil['same_day'] == 0">No</div>
<div v-else>Yes</div>
</td>
<td>
<div v-if="oil['payment_type'] == 0">Cash</div>
<div v-else-if="oil['payment_type'] == 1">CC</div>
<div v-else-if="oil['payment_type'] == 2">Cash/CC</div>
<div v-else-if="oil['payment_type'] == 3">Check</div>
<div v-else-if="oil['payment_type'] == 4">Other</div>
<div v-else></div>
</td>
<td class="flex gap-5">
<router-link :to="{ name: 'deliveryOrder', params: { id: oil['id'] } }">
<button class="btn btn-accent btn-sm">View</button>