DONE: enhance UI on admin and voter side, add docker config, fix delete button modal not showing
This commit is contained in:
@@ -48,13 +48,18 @@ class LoginController extends Controller
|
||||
$user_otp->expired_at = $expired_at;
|
||||
$user_otp->save();
|
||||
|
||||
return response()->json([
|
||||
$response = [
|
||||
'status' => 'success',
|
||||
'message' => 'generated SMS Token',
|
||||
'notel' => $voter->telefon,
|
||||
'nokp' => $voter->no_kp,
|
||||
];
|
||||
|
||||
]);
|
||||
if (app()->environment(['local', 'development'])) {
|
||||
$response['debug_otp'] = $sms_token;
|
||||
}
|
||||
|
||||
return response()->json($response);
|
||||
|
||||
}else{
|
||||
return response()->json([
|
||||
@@ -111,7 +116,7 @@ class LoginController extends Controller
|
||||
} else {
|
||||
return response()->json([
|
||||
'status' => 'failed',
|
||||
'message' => 'Invalid ID.'
|
||||
'message' => 'No. KP tidak wujud. Atau sesi mengundi telah tamat'
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,11 @@ class PenyataController extends Controller
|
||||
// GET PENYATA BERDASARKAN NO ANGGOTA
|
||||
public function getPenyata($no_anggota)
|
||||
{
|
||||
return Voter::where('no_anggota', $no_anggota)->firstOrFail();
|
||||
$voter = Voter::where('no_anggota', $no_anggota)->firstOrFail();
|
||||
|
||||
return response()->json([
|
||||
'user' => $voter,
|
||||
]);
|
||||
}
|
||||
|
||||
// SAHKAN PENYATA BERDASARKAN NO ANGGOTA
|
||||
@@ -20,7 +24,8 @@ class PenyataController extends Controller
|
||||
{
|
||||
$request->validate([
|
||||
'persetujuan' => 'required|in:Bersetuju,Tidak Bersetuju',
|
||||
'no_kp' => 'nullable'
|
||||
'no_kp' => 'nullable',
|
||||
'nokp' => 'nullable',
|
||||
]);
|
||||
|
||||
|
||||
@@ -38,18 +43,21 @@ class PenyataController extends Controller
|
||||
], 409); // Conflict
|
||||
}
|
||||
|
||||
$noKp = $request->input('no_kp', $request->input('nokp'));
|
||||
|
||||
$voter->update([
|
||||
'persetujuan' => $request->persetujuan,
|
||||
'status_penyata' => $request->persetujuan === 'Bersetuju'
|
||||
? 'DISAHKAN'
|
||||
: 'PERLU_SEMAK',
|
||||
'no_kp' => $request->nokp,
|
||||
'no_kp' => $noKp,
|
||||
'tarikh_sah' => now()
|
||||
]);
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'status' => $voter->status_penyata
|
||||
'status' => $voter->status_penyata,
|
||||
'user' => $voter->fresh(),
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user