diff --git a/app/Http/Controllers/BankDataController.php b/app/Http/Controllers/BankDataController.php index 133f7a4..98d9018 100644 --- a/app/Http/Controllers/BankDataController.php +++ b/app/Http/Controllers/BankDataController.php @@ -34,10 +34,10 @@ class BankDataController extends Controller if(isset($item->data_pembanding)){ $data_pembanding = json_decode($item->data_pembanding); foreach ($data_pembanding->data_pembanding as $dataPembanding) { - $lat = trim($dataPembanding->kordinat_lat); - $lng = trim($dataPembanding->kordinat_lng); + $lat = $dataPembanding->kordinat_lat; + $lng = $dataPembanding->kordinat_lng; - if (!empty($lat) && !empty($lng)) { + if (!empty($lat) && !empty($lng) && $lng !== null && $lat !== null && $lat !== '' && $lng !== '') { $lat = floatval($lat); $lng = floatval($lng); @@ -48,15 +48,15 @@ class BankDataController extends Controller 'district_code' => $dataPembanding->district_code, 'city_code' => $dataPembanding->city_code, 'province_code' => $dataPembanding->province_code, - 'tahun' => $dataPembanding->tahun, - 'luas_tanah' => $dataPembanding->luas_tanah, - 'luas_bangunan' => $dataPembanding->luas_bangunan, - 'tahun_bangunan' => $dataPembanding->tahun_bangunan, - 'status_nara_sumber' => $dataPembanding->status_nara_sumber, - 'harga' => $dataPembanding->harga, - 'harga_diskon' => $dataPembanding->harga_diskon, - 'diskon' => str_replace(',','.',$dataPembanding->diskon), - 'total' => $dataPembanding->total, + 'tahun' => is_numeric($dataPembanding->tahun) ? $dataPembanding->tahun : 0, + 'luas_tanah' => is_numeric($dataPembanding->luas_tanah) ? $dataPembanding->luas_tanah : 0, + 'luas_bangunan' => is_numeric($dataPembanding->luas_bangunan) ? $dataPembanding->luas_bangunan : 0, + 'tahun_bangunan' => is_numeric($dataPembanding->tahun_bangunan) ? $dataPembanding->tahun_bangunan : 0, + 'harga' => is_numeric($dataPembanding->harga) ? $dataPembanding->harga : 0, + 'harga_diskon' => is_numeric($dataPembanding->harga_diskon) ? $dataPembanding->harga_diskon : 0, + 'diskon' => is_numeric(str_replace(',', '.', $dataPembanding->diskon)) ? str_replace(',', '.', $dataPembanding->diskon) : 0, + 'total' => is_numeric($dataPembanding->total) ? $dataPembanding->total : 0, + 'harga_penawaran' => is_numeric($dataPembanding->harga_penawaran) ? $dataPembanding->harga_penawaran : 0, 'nama_nara_sumber' => $dataPembanding->nama_nara_sumber, 'peruntukan' => $dataPembanding->peruntukan, 'penawaran' => $dataPembanding->penawaran, @@ -65,7 +65,6 @@ class BankDataController extends Controller 'jenis_aset' => $dataPembanding->jenis_aset, 'foto_objek' => $dataPembanding->foto_objek, 'tanggal' => $dataPembanding->tanggal, - 'harga_penawaran' => $dataPembanding->harga_penawaran, ]; BankData::updateOrCreate( diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index a70202c..9e5d1b0 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -514,7 +514,7 @@ class PenilaianController extends Controller $status = 'done'; } - if ($status == 'done') { + if ($status == 'done' && $permohonan->status_bayar === 'sudah_bayar' && $permohonan->penilai->type_penilai === 'standar' || $permohonan->penilai->type_penilai === 'sederhana') { $_permohonan = Permohonan::with(['documents.jenisJaminan','penilaian._user_penilai','penilai','documents.detail.jenisLegalitasJaminan'])->find(6); if (isset($_permohonan->penilai->lpj)) { diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php index 593629e..5f6d2eb 100644 --- a/resources/views/penilaian/form.blade.php +++ b/resources/views/penilaian/form.blade.php @@ -45,9 +45,9 @@ Tim Penilai yang di tunjuk
- + + type="text" value="{{ $regionName->name ?? '' }}" readonly> @error('teams_id') {{ $message }} @enderror