diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index c5d5252..968e584 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -130,7 +130,9 @@ class PenilaianController extends Controller return redirect()->route('penilaian.index')->with('success', 'Penilaian berhasil disimpan'); } catch (Exception $e) { DB::rollBack(); - return redirect()->route('penilaian.index')->with('error', $e->getMessage()); + + return response()->json(['error'=> $e->getMessage()]); + // return redirect()->route('penilaian.index')->with('error', $e->getMessage()); } } } diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 3c86379..4bb1364 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -48,6 +48,8 @@ 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\SendEmail; +use Illuminate\Support\Facades\Mail; class SurveyorController extends Controller { @@ -167,7 +169,7 @@ class SurveyorController extends Controller $rules = $this->getActionSpecificRules($data, $action, $request); $inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id'))->where('jenis_jaminan_id', $request->input('jenis_jaminan_id'))->first(); - if ($request->input('permohonan_id') == $inspeksi->permohonan_id && $request->input('jenis_jaminan_id') == $inspeksi->jenis_jaminan_id) { + if ($inspeksi) { $inspeksi->update(['data_form' => json_encode($rules)]); } else { Inspeksi::create([ @@ -226,7 +228,6 @@ class SurveyorController extends Controller public function storeDenah(Request $request) { - try { $validatedData = $request->validate([ 'foto_denah' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:2048', @@ -237,31 +238,33 @@ class SurveyorController extends Controller $validatedData['foto_denah'] = $this->uploadFile($request->file('foto_denah'), 'foto_denah'); - $formatJsonDenah = [ 'foto_denah' => $validatedData['foto_denah'], 'luas' => $validatedData['luas'], ]; - $inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id'))->where('jenis_jaminan_id', $request->input('jenis_jaminan_id'))->first(); - if ($request->input('permohonan_id') == $inspeksi->permohonan_id && $request->input('jenis_jaminan_id') == $inspeksi->jenis_jaminan_id) { + $inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id')) + ->where('jenis_jaminan_id', $request->input('jenis_jaminan_id')) + ->first(); + + if ($inspeksi) { $inspeksi->update([ 'denah_form' => json_encode($formatJsonDenah) ]); } else { Inspeksi::create([ 'permohonan_id' => $request->input('permohonan_id'), - 'denah_form' => json_encode($formatFotojson) + 'jenis_jaminan_id' => $request->input('jenis_jaminan_id'), + 'denah_form' => json_encode($formatJsonDenah) ]); } return response()->json(['success' => true, 'message' => 'Data berhasil disimpan', - 'data' => $formatJsonDenah], 200); + 'data' => $formatJsonDenah], 200); } catch (Exception $e) { return response()->json(['success' => false, 'message' => 'Data gagal disimpan: ' . $e->getMessage()], 500); } - } @@ -369,19 +372,21 @@ class SurveyorController extends Controller 'foto_lantai_lainnya' => $foto_lantai_lainnya, 'foto_rute_lainnya' => $foto_rute_lainnya, 'basement' => $basement, - 'gerbang' => $gerbang, + 'foto_gerbang' => $gerbang, 'pendamping' => $pendamping ]; $inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id'))->where('jenis_jaminan_id', $request->input('jenis_jaminan_id'))->first(); - if ($request->input('permohonan_id') == $inspeksi->permohonan_id && $request->input('jenis_jaminan_id') == $inspeksi->jenis_jaminan_id) { + + if ($inspeksi) { $inspeksi->update([ 'foto_form' => json_encode($formatFotojson) ]); } else { Inspeksi::create([ 'permohonan_id' => $request->input('permohonan_id'), - 'foto_form' => json_encode($formatFotojson) + 'foto_form' => json_encode($formatFotojson), + 'jenis_jaminan_id' => $request->input('jenis_jaminan_id') ]); } @@ -391,7 +396,9 @@ class SurveyorController extends Controller } } - public function submitSurveyor($id,$jaminanId) + + + public function submitSurveyor($id, $jaminanId) { try { $cekButton = $this->checkButtonStatus($id)->getData(); @@ -445,35 +452,48 @@ class SurveyorController extends Controller public function storeJadwal(Request $request) { try { - $validate = $request->validate([ 'id' => 'required', 'waktu_penilaian' => 'required', 'deskripsi_penilaian' => 'required' ]); - // return response()->json([ - // 'daa'=>$validate - // ]); + // $user = ['user' => 'rustammajid76@gmail.com']; + + // $emailData = [ + // 'email' => 'rustammajid76@gmail.com', + // 'subject' => 'Test', + // 'emailData' => '