diff --git a/app/Http/Controllers/AuthMobile/AuthController.php b/app/Http/Controllers/AuthMobile/AuthController.php index ae27b0fa..892189da 100644 --- a/app/Http/Controllers/AuthMobile/AuthController.php +++ b/app/Http/Controllers/AuthMobile/AuthController.php @@ -108,28 +108,36 @@ class AuthController extends Controller $passwordTrue = Hash::check($fields['password'], $user->password); if ($passwordTrue) { - if ($user->status == 'active') { - $token = $user->createToken('myapptoken')->plainTextToken; + + if ($user->user_type != '2') { return response([ - 'statusAkaun' => 1, - 'user' => $user, - 'token' => $token - ]); - } else if ($user->status == 'banned') { - return response()->json([ - 'statusAkaun' => 2, - 'message' => "User banned." - ]); - } else if ($user->status == 'rejected') { - return response([ - 'statusAkaun' => 3, - 'message' => "Rejected." + 'statusAkaun' => 6, + 'message' => "Akaun ini didaftar menggunakan id staff. Sila login ke https://adminbid.arrahn.com.my" ]); } else { - return response([ - 'statusAkaun' => 4, - 'message' => 'Registration in progress,status wait for approval.' - ]); + if ($user->status == 'active') { + $token = $user->createToken('myapptoken')->plainTextToken; + return response([ + 'statusAkaun' => 1, + 'user' => $user, + 'token' => $token + ]); + } else if ($user->status == 'banned') { + return response()->json([ + 'statusAkaun' => 2, + 'message' => "User banned." + ]); + } else if ($user->status == 'rejected') { + return response([ + 'statusAkaun' => 3, + 'message' => "Rejected." + ]); + } else { + return response([ + 'statusAkaun' => 4, + 'message' => 'Registration in progress,status wait for approval.' + ]); + } } } else { return response()->json([ diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index 78a54fa5..9a94009a 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -191,11 +191,10 @@ class LelongMobileController extends Controller $currentdate = Carbon::now(); $currentdate = $currentdate->toDateString(); $lelong = Lelong::where('tarikh_lelong', '=', $currentdate)->select('id', 'masatamat_lelong')->first(); - - $date_convert = strtotime($lelong->masatamat_lelong); - $lelong['masatamat_lelong'] = date("H:i", $date_convert); - + if ($lelong) { + $date_convert = strtotime($lelong->masatamat_lelong); + $lelong['masatamat_lelong'] = date("H:i", $date_convert); $groupCawangan = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id') ->where('user_id', '=', $userId) @@ -867,7 +866,7 @@ class LelongMobileController extends Controller $lelong[$index]['masatamat_lelong'] = date("H:i", $date_convert_2); } - $lelong[$index]['caw_name'] = trim($data['caw_name'], "AR-RAHN "); + $lelong[$index]['caw_name'] = substr($data['caw_name'], 8); } @@ -941,7 +940,7 @@ class LelongMobileController extends Controller $date_convert = strtotime($data['tarikh_lelong']); $lelong[$index]['tarikh_lelong'] = date("d-m-Y", $date_convert); - $lelong[$index]['caw_name'] = trim($data['caw_name'], "AR-RAHN "); + $lelong[$index]['caw_name'] = substr($data['caw_name'], 8); } if ($lelong) { diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 83c017f1..9cf9edc2 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -28,6 +28,7 @@
Sistem LelonganĀ AtasĀ Talian
+