diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index c3efa315..9acf3687 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -126,9 +126,7 @@ class BookingController extends Controller } $booking->status_desc = $status_desc; } - return $bookings; - } public function show($id) @@ -146,9 +144,10 @@ class BookingController extends Controller if ($user_bankslip){ $booking->user_bankslip_path = Storage::url($user_bankslip->bankslip_path); + $booking->reject_reason = $user_bankslip->reject_reason; $date1 = new DateTime($user_bankslip->updated_at); } - + $date2 = new DateTime(); $difference_in_seconds = ($date1->format('U') + 600) - ($date2->format('U')); diff --git a/resources/assets/js/pages/booking/uploadUserBankSlip.vue b/resources/assets/js/pages/booking/uploadUserBankSlip.vue index fa1cb4df..8632d54e 100644 --- a/resources/assets/js/pages/booking/uploadUserBankSlip.vue +++ b/resources/assets/js/pages/booking/uploadUserBankSlip.vue @@ -2,7 +2,15 @@ -
+
+

+ Your Bankslip Has Been Rejected, Please Reupload Your Bankslip +

+
+
+
+ +

Waiting For Payment

@@ -107,7 +115,9 @@ export default { booking: { amount: '', bankin_amount: '', - timeout: 1 + timeout: 1, + user_bankslip_path: null, + reject_reason: null, }, rules: { transfer_amount: [{ @@ -132,6 +142,13 @@ export default { this.booking.amount = response.data.amount this.booking.bankin_amount = response.data.bia this.booking.timeout = response.data.timeout * 1000 + + if (response.data.user_bankslip_path) + { + this.booking.user_bankslip_path = response.data.user_bankslip_path + this.booking.reject_reason = response.data.reject_reason + } + this.start = true loading.close()