diff --git a/app/Booking.php b/app/Booking.php index ee0b5126..5a1c2e0e 100644 --- a/app/Booking.php +++ b/app/Booking.php @@ -7,7 +7,8 @@ use Illuminate\Database\Eloquent\Model; class Booking extends Model { // protected $guarded = []; - protected $hidden = array("user_id", + protected $hidden = array( "user", + "user_id", "rate_id", "rmb_book_amount", "rmb_book_pay_method", diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 95b24562..3b5f2b39 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -76,7 +76,7 @@ class BookingController extends Controller public function adminIndex(){ $user = Auth::user(); - $bookings = Booking::select('id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status') + $bookings = Booking::select('user_id', 'id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status') ->orderby('updated_at','desc') ->get(); @@ -125,7 +125,8 @@ class BookingController extends Controller break; default: $status_desc = ""; - } + } + $booking->marking = $booking->user->marking; $booking->status_desc = $status_desc; } return $bookings; diff --git a/app/User.php b/app/User.php index ae87b308..351e75a4 100644 --- a/app/User.php +++ b/app/User.php @@ -29,7 +29,7 @@ class User extends Authenticatable implements JWTSubject * @var array */ protected $hidden = [ - 'password', 'remember_token', + 'password', 'remember_token', 'roles' ]; /**