diff --git a/src/pages/delivery/edit.vue b/src/pages/delivery/edit.vue index 34fdf57..1838a04 100755 --- a/src/pages/delivery/edit.vue +++ b/src/pages/delivery/edit.vue @@ -525,7 +525,11 @@ export default defineComponent({ axios.post(`${import.meta.env.VITE_BASE_URL}/delivery/edit/${this.deliveryOrder.id}`, payload, { withCredentials: true, headers: authHeader() }) .then(() => { notify({ type: 'success', title: 'Success!', text: 'Delivery updated.' }); - this.$router.push({ name: 'deliveryOrder', params: { id: this.deliveryOrder.id } }); + if (paymentType === 1) { + this.$router.push({ name: 'PayOil', params: { id: this.deliveryOrder.id } }); + } else { + this.$router.push({ name: 'deliveryOrder', params: { id: this.deliveryOrder.id } }); + } }) .catch((error: any) => { console.error("Error submitting form:", error); diff --git a/src/pages/delivery/update_tickets/finalize_ticket.vue b/src/pages/delivery/update_tickets/finalize_ticket.vue index 113b1b4..ca7944f 100755 --- a/src/pages/delivery/update_tickets/finalize_ticket.vue +++ b/src/pages/delivery/update_tickets/finalize_ticket.vue @@ -64,70 +64,6 @@ - -
-

Delivery Details

-
-
-
Status
-
- waiting - delivered - Today - Tomorrow - Partial Delivery - misdelivery - unknown - Finalized -
-
-
-
Scheduled Date
-
{{ deliveryOrder.expected_delivery_date }}
-
-
-
When Ordered
-
{{ deliveryOrder.when_ordered }}
-
- -
-
- - -
-

Transaction Summary

-
-
-
- Transaction ID: - {{ transaction.auth_net_transaction_id }} -
-
- Pre-Auth Amount: - ${{ transaction.preauthorize_amount || '0.00' }} -
-
- Charge Amount: - ${{ transaction.charge_amount || '0.00' }} -
-
- Type: - {{ transaction.transaction_type === 0 ? 'Charge' : transaction.transaction_type === 1 ? 'Auth' : 'Capture' }} -
-
- Date: - {{ transaction.created_at }} -
-
- Status: - - {{ transaction.status === 0 ? 'Approved' : 'Declined' }} - -
-
-
-
-

Financial Summary

@@ -204,6 +140,70 @@
+ +
+

Delivery Details

+
+
+
Status
+
+ waiting + delivered + Today + Tomorrow + Partial Delivery + misdelivery + unknown + Finalized +
+
+
+
Scheduled Date
+
{{ deliveryOrder.expected_delivery_date }}
+
+
+
When Ordered
+
{{ deliveryOrder.when_ordered }}
+
+ +
+
+ + +
+

Transaction Summary

+
+
+
+ Transaction ID: + {{ transaction.auth_net_transaction_id }} +
+
+ Pre-Auth Amount: + ${{ transaction.preauthorize_amount || '0.00' }} +
+
+ Charge Amount: + ${{ transaction.charge_amount || '0.00' }} +
+
+ Type: + {{ transaction.transaction_type === 0 ? 'Charge' : transaction.transaction_type === 1 ? 'Auth' : 'Capture' }} +
+
+ Date: + {{ transaction.created_at }} +
+
+ Status: + + {{ transaction.status === 0 ? 'Approved' : 'Declined' }} + +
+
+
+
+ diff --git a/src/pages/pay/oil/pay_oil.vue b/src/pages/pay/oil/pay_oil.vue index 2b2868d..cec14a5 100755 --- a/src/pages/pay/oil/pay_oil.vue +++ b/src/pages/pay/oil/pay_oil.vue @@ -157,7 +157,7 @@ Pay Authorize.net - @@ -528,7 +528,7 @@ export default defineComponent({ type: "success", }); } - this.$router.push({ name: "customerProfile", params: { id: this.customer.id } }); + this.$router.push({ name: "deliveryOrder", params: { id: this.delivery.id } }); } }) .catch(() => {