Merge branch 'integration/confirmation-n-transfer' into 'master'

update confirmation and transfer page

See merge request CIEFWorldwideSdnBhd/exchange!42
This commit is contained in:
Jack Goh
2018-06-28 07:51:03 +00:00
5 changed files with 415 additions and 94 deletions
+8 -2
View File
@@ -132,6 +132,12 @@ class BookingController extends Controller
public function show($id)
{
$booking = Booking::where('user_id',Auth::user()->id)->where('id', $id)->first();
// 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);
@@ -145,8 +151,8 @@ class BookingController extends Controller
}
return $booking;
}
}
}
public function adminShow($id)
{
$booking = Booking::where('id', $id)->first();