fix(so/penilai/surveyor) : perbaikkan print out, lampiran, send email jadwal, otorisator, dan typo
This commit is contained in:
@@ -79,7 +79,7 @@ use Modules\Lpj\Models\LaluLintasLokasi;
|
||||
use Modules\Lpj\Models\SpekBagunanAnalisaDetail;
|
||||
use Modules\Lpj\Http\Requests\SurveyorRequest;
|
||||
use Modules\Lpj\Http\Requests\FormSurveyorRequest;
|
||||
use Modules\Lpj\Emails\SendJadwalKunjunganEmail;
|
||||
use Modules\Lpj\Jobs\SendJadwalKunjunganEmailJob;
|
||||
use App\Helpers\Lpj;
|
||||
use Modules\Lpj\Models\Authorization;
|
||||
use Modules\Lpj\Services\SurveyorValidateService;
|
||||
@@ -955,7 +955,7 @@ class SurveyorController extends Controller
|
||||
}
|
||||
|
||||
|
||||
public function storeJadwal(Request $request)
|
||||
public function storeJadwal(Request $request, $id)
|
||||
{
|
||||
try {
|
||||
$validate = $request->validate([
|
||||
@@ -964,7 +964,15 @@ class SurveyorController extends Controller
|
||||
'deskripsi_penilaian' => 'required'
|
||||
]);
|
||||
|
||||
$penilaian = Penilaian::findOrFail($validate['id']);
|
||||
$penilaian = Penilaian::findOrFail($id);
|
||||
|
||||
if (Carbon::parse($validate['waktu_penilaian']) <= Carbon::parse($penilaian->tanggal_kunjungan)) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Waktu penilaian harus lebih besar dari tanggal assign.'
|
||||
], 422);
|
||||
}
|
||||
|
||||
|
||||
$emailData = [
|
||||
'email' => $penilaian->permohonan->user->email,
|
||||
@@ -973,28 +981,26 @@ class SurveyorController extends Controller
|
||||
|
||||
];
|
||||
|
||||
Mail::to($emailData['email'])->send(new SendJadwalKunjunganEmail($emailData, $penilaian->permohonan->nomor_resitrasi, $penilaian->permohonan->debiture));
|
||||
SendJadwalKunjunganEmailJob::dispatch($emailData);
|
||||
|
||||
|
||||
|
||||
if (Carbon::parse($validate['waktu_penilaian']) <= Carbon::parse($penilaian->tanggal_kunjungan)) {
|
||||
return redirect()
|
||||
->route('surveyor.index')
|
||||
->with('error', 'Waktu penilaian harus lebih besar dari tanggal assign.');
|
||||
}
|
||||
|
||||
$penilaian->update([
|
||||
'waktu_penilaian' => $validate['waktu_penilaian'],
|
||||
'deskripsi_penilaian' => $validate['deskripsi_penilaian'],
|
||||
]);
|
||||
|
||||
return redirect()
|
||||
->route('surveyor.index')
|
||||
->with('success', 'Jadwal berhasil dibuat.');
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'message' => 'Berhasil kirim jadwal kunjungan'
|
||||
], 200);
|
||||
} catch (\Exception $e) {
|
||||
\Log::error('Error sending email: ' . $e->getMessage());
|
||||
return redirect()
|
||||
->route('surveyor.index')
|
||||
->with('error', 'Internal Server Error: ' . $e->getMessage());
|
||||
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Terjadi kesalahan',
|
||||
'error' => $e->getMessage()
|
||||
], 500);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2635,7 +2641,8 @@ class SurveyorController extends Controller
|
||||
'foto_gistaru',
|
||||
'foto_bhumi',
|
||||
'foto_argis_region',
|
||||
'foto_tempat'
|
||||
'foto_tempat',
|
||||
'foto_sentuh_tanahku'
|
||||
];
|
||||
|
||||
if ($inspeksi) {
|
||||
|
||||
Reference in New Issue
Block a user