Bugfix/list clickup issue (#5)
Reviewed-on: #5 Co-authored-by: ISMAIL MASSERAN <ismail@koppkb.com> Co-committed-by: ISMAIL MASSERAN <ismail@koppkb.com>
This commit was merged in pull request #5.
This commit is contained in:
@@ -4,37 +4,38 @@ namespace App\Http\Controllers\Mobile;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\TacCode;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Models\User;
|
||||
use DB;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
|
||||
class UserController extends Controller
|
||||
{
|
||||
public function getProfileUser(Request $request)
|
||||
{
|
||||
$user = Auth::user();
|
||||
$user = Auth::user();
|
||||
|
||||
if ($user) {
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'message' => [$user]
|
||||
'message' => [$user],
|
||||
], 200);
|
||||
} else {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Unauthorized'
|
||||
'message' => 'Unauthorized',
|
||||
], 401);
|
||||
}
|
||||
}
|
||||
public function updateProfileUser(Request $request){
|
||||
|
||||
public function updateProfileUser(Request $request)
|
||||
{
|
||||
|
||||
$validator = Validator::make($request->all(), [
|
||||
'nokp' => 'required'
|
||||
'nokp' => 'required',
|
||||
]);
|
||||
|
||||
if ($validator->fails()) {
|
||||
@@ -43,16 +44,16 @@ class UserController extends Controller
|
||||
|
||||
$currentdate = Carbon::now()->toDateTimeString();
|
||||
|
||||
$user_update = User::where('nokp','=',$request->nokp)
|
||||
->update([
|
||||
'bank_acc_pembeli' => $request->bank_acc_pembeli,
|
||||
'bank_acc_no_pembeli' => $request->bank_acc_no_pembeli,
|
||||
'alamat' => $request->alamat,
|
||||
'notelbimbit' => $request->notelbimbit,
|
||||
'notelpejabat' => $request->notelpejabat,
|
||||
'email' => $request->email,
|
||||
'updated_at' => $currentdate
|
||||
]);
|
||||
$user_update = User::where('nokp', '=', $request->nokp)
|
||||
->update([
|
||||
'bank_acc_pembeli' => $request->bank_acc_pembeli,
|
||||
'bank_acc_no_pembeli' => $request->bank_acc_no_pembeli,
|
||||
'alamat' => $request->alamat,
|
||||
'notelbimbit' => $request->notelbimbit,
|
||||
'notelpejabat' => $request->notelpejabat,
|
||||
'email' => $request->email,
|
||||
'updated_at' => $currentdate,
|
||||
]);
|
||||
|
||||
return response()->json($user_update);
|
||||
}
|
||||
@@ -70,36 +71,37 @@ class UserController extends Controller
|
||||
'string' => [
|
||||
'status' => 3,
|
||||
'message' => 'Kata laluan baharu mestilah melebihi 8 karakter.',
|
||||
]
|
||||
],
|
||||
],
|
||||
'confirm_new_password.required' => ['status' => '4', 'message' => 'Sila isi pengesahan kata laluan baharu.'],
|
||||
'confirm_new_password.min' => [
|
||||
'string' => [
|
||||
'status' => 5,
|
||||
'message' => 'Pengesahan kata laluan baharu mestilah melebihi 8 karakter.',
|
||||
]
|
||||
],
|
||||
],
|
||||
]);
|
||||
|
||||
if ($validator->fails()) {
|
||||
$all_errors = [
|
||||
'success' => false,
|
||||
'message' => $validator->errors()
|
||||
'message' => $validator->errors(),
|
||||
];
|
||||
|
||||
return response($all_errors, 201);
|
||||
}
|
||||
|
||||
if (!(Hash::check($request->get('current_password'), Auth::user()->password))) {
|
||||
if (! (Hash::check($request->get('current_password'), Auth::user()->password))) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => [
|
||||
'current_password' => [
|
||||
0 => [
|
||||
'status' => 9,
|
||||
'message' => 'Kata laluan asal salah.'
|
||||
]
|
||||
]
|
||||
]
|
||||
'message' => 'Kata laluan asal salah.',
|
||||
],
|
||||
],
|
||||
],
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -110,10 +112,10 @@ class UserController extends Controller
|
||||
'current_password' => [
|
||||
0 => [
|
||||
'status' => 8,
|
||||
'message' => 'Kata laluan baharu tidak boleh sama dengan kata laluan asal.'
|
||||
]
|
||||
]
|
||||
]
|
||||
'message' => 'Kata laluan baharu tidak boleh sama dengan kata laluan asal.',
|
||||
],
|
||||
],
|
||||
],
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -124,10 +126,10 @@ class UserController extends Controller
|
||||
'current_password' => [
|
||||
0 => [
|
||||
'status' => 12,
|
||||
'message' => 'Kata laluan baharu tidak sama dengan pengesahan kata laluan baharu.'
|
||||
]
|
||||
]
|
||||
]
|
||||
'message' => 'Kata laluan baharu tidak sama dengan pengesahan kata laluan baharu.',
|
||||
],
|
||||
],
|
||||
],
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -140,7 +142,7 @@ class UserController extends Controller
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'status' => 55,
|
||||
'message' => 'Kata laluan berjaya diubah'
|
||||
'message' => 'Kata laluan berjaya diubah',
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -152,7 +154,7 @@ class UserController extends Controller
|
||||
$date = $current->toDateTimeString();
|
||||
$current_date = strtotime($date);
|
||||
$future_date = $current_date + (60 * 2);
|
||||
$expired_date_formated = date("Y-m-d H:i:s", $future_date);
|
||||
$expired_date_formated = date('Y-m-d H:i:s', $future_date);
|
||||
|
||||
$tac_code = rand(100000, 999999);
|
||||
|
||||
@@ -164,7 +166,7 @@ class UserController extends Controller
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'The phone number already request for tac code. Please wait 2 minute from request time for the session to end.',
|
||||
'response' => $check_status_phone_number
|
||||
'response' => $check_status_phone_number,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -173,11 +175,11 @@ class UserController extends Controller
|
||||
'apipassword' => config('app.one_way_sms_password'),
|
||||
'senderid' => 'INFO',
|
||||
'mobileno' => $request->phone_number,
|
||||
'message' => '[ArrahnBid]: '. $tac_code .' is your TAC code. The code is valid for 2 minutes.',
|
||||
'languagetype' => 1
|
||||
'message' => '[ArrahnBid]: '.$tac_code.' is your TAC code. The code is valid for 2 minutes.',
|
||||
'languagetype' => 1,
|
||||
]);
|
||||
|
||||
$tac_code_model = new TacCode();
|
||||
$tac_code_model = new TacCode;
|
||||
$tac_code_model->tac_code = Hash::make($tac_code);
|
||||
$tac_code_model->phone_number = $request->phone_number;
|
||||
$tac_code_model->case_code = 1;
|
||||
@@ -214,7 +216,7 @@ class UserController extends Controller
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'message' => 'Update successful!',
|
||||
'user' => $user
|
||||
'user' => $user,
|
||||
]);
|
||||
} else {
|
||||
return response()->json([
|
||||
|
||||
Reference in New Issue
Block a user