diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 71e18787..c3efa315 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -137,21 +137,28 @@ class BookingController extends Controller // just added to try $user_bankslip = $booking->userBankSlip()->first(); - if ($user_bankslip){ - $booking->user_bankslip_path = Storage::url($user_bankslip->bankslip_path); - } + + if($booking){ - $date1 = new DateTime($booking->created_at); - $date2 = new DateTime(); - $difference_in_seconds = ($date1->format('U') + 600) - ($date2->format('U')); - $booking->timeout = $difference_in_seconds; + $date1 = new DateTime($booking->created_at); + + if ($user_bankslip){ + $booking->user_bankslip_path = Storage::url($user_bankslip->bankslip_path); + $date1 = new DateTime($user_bankslip->updated_at); + } + + $date2 = new DateTime(); + $difference_in_seconds = ($date1->format('U') + 600) - ($date2->format('U')); - if (!$booking){ - return response()->json(['success'=>false, 'message'=>'not found'], 404); - } - return $booking; + $booking->timeout = $difference_in_seconds; + + if (!$booking){ + return response()->json(['success'=>false, 'message'=>'not found'], 404); + } + + return $booking; } } @@ -331,6 +338,7 @@ class BookingController extends Controller return response()->json(['message'=>'Image too large, upload files up to 3 MB'], 400); } + if($bankslip_file = $request->file('file')) { /* End Validation */ @@ -345,7 +353,12 @@ class BookingController extends Controller 'user_bankslip', $bankslip_file, $unique_image_path ); - $user_bankslip = new UserBankSlip; + $user_bankslip = $booking->userBankSlip()->first(); + + // if user bankslip not exist, create new one + if(!$user_bankslip){ + $user_bankslip = new UserBankSlip; + } $user_bankslip->booking_id = $booking->id; $user_bankslip->bankslip_path = $upload_path; $user_bankslip->transfer_amount = $request->input('transfer_amount'); @@ -544,12 +557,13 @@ class BookingController extends Controller } // Rejected bankslip cannot be approve again - if($userBankSlip->is_reject == 1) - { - return response()->json(['message'=>'Bankslip already rejected'],200); - } + // if($userBankSlip->is_reject == 1) + // { + // return response()->json(['message'=>'Bankslip already rejected'],200); + // } $userBankSlip->is_approve = 1; + $userBankSlip->is_reject = 0; $userBankSlip->estimated_arrival_time = $request->input('estimated_arrival_time'); $userBankSlip->save(); @@ -581,7 +595,7 @@ class BookingController extends Controller } $userBankSlip->is_reject = 1; - $userBankSlip->reject_reason = $request->reject_reason; + $userBankSlip->reject_reason = $request->input('reject_reason'); $userBankSlip->save(); // update booking status diff --git a/resources/assets/js/pages/admin/booking/verification.vue b/resources/assets/js/pages/admin/booking/verification.vue index 96d421fd..cd0cb8ab 100644 --- a/resources/assets/js/pages/admin/booking/verification.vue +++ b/resources/assets/js/pages/admin/booking/verification.vue @@ -212,7 +212,6 @@ Aprrove Reject -