daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender

Browse Source
This commit is contained in:
rahmatrafli1
2025-03-20 11:53:09 +07:00
parent 4a4b168084 bb052decae
commit f97df3f902
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Http/Controllers/BankDataController.php
View File

@@ -34,10 +34,10 @@ class BankDataController extends Controller
if(isset($item->data_pembanding)){ if(isset($item->data_pembanding)){
$data_pembanding = json_decode($item->data_pembanding); $data_pembanding = json_decode($item->data_pembanding);
foreach ($data_pembanding->data_pembanding as $dataPembanding) { foreach ($data_pembanding->data_pembanding as $dataPembanding) {
$lat = trim($dataPembanding->kordinat_lat); $lat = $dataPembanding->kordinat_lat;
$lng = trim($dataPembanding->kordinat_lng); $lng = $dataPembanding->kordinat_lng;
if (!empty($lat) && !empty($lng)) { if (!empty($lat) && !empty($lng) && $lng !== null && $lat !== null && $lat !== '' && $lng !== '') {
$lat = floatval($lat); $lat = floatval($lat);
$lng = floatval($lng); $lng = floatval($lng);
@@ -48,15 +48,15 @@ class BankDataController extends Controller
'district_code' => $dataPembanding->district_code, 'district_code' => $dataPembanding->district_code,
'city_code' => $dataPembanding->city_code, 'city_code' => $dataPembanding->city_code,
'province_code' => $dataPembanding->province_code, 'province_code' => $dataPembanding->province_code,
'tahun' => $dataPembanding->tahun, 'tahun' => is_numeric($dataPembanding->tahun) ? $dataPembanding->tahun : 0,
'luas_tanah' => $dataPembanding->luas_tanah, 'luas_tanah' => is_numeric($dataPembanding->luas_tanah) ? $dataPembanding->luas_tanah : 0,
'luas_bangunan' => $dataPembanding->luas_bangunan, 'luas_bangunan' => is_numeric($dataPembanding->luas_bangunan) ? $dataPembanding->luas_bangunan : 0,
'tahun_bangunan' => $dataPembanding->tahun_bangunan, 'tahun_bangunan' => is_numeric($dataPembanding->tahun_bangunan) ? $dataPembanding->tahun_bangunan : 0,
'status_nara_sumber' => $dataPembanding->status_nara_sumber, 'harga' => is_numeric($dataPembanding->harga) ? $dataPembanding->harga : 0,
'harga' => $dataPembanding->harga, 'harga_diskon' => is_numeric($dataPembanding->harga_diskon) ? $dataPembanding->harga_diskon : 0,
'harga_diskon' => $dataPembanding->harga_diskon, 'diskon' => is_numeric(str_replace(',', '.', $dataPembanding->diskon)) ? str_replace(',', '.', $dataPembanding->diskon) : 0,
'diskon' => str_replace(',','.',$dataPembanding->diskon), 'total' => is_numeric($dataPembanding->total) ? $dataPembanding->total : 0,
'total' => $dataPembanding->total, 'harga_penawaran' => is_numeric($dataPembanding->harga_penawaran) ? $dataPembanding->harga_penawaran : 0,
'nama_nara_sumber' => $dataPembanding->nama_nara_sumber, 'nama_nara_sumber' => $dataPembanding->nama_nara_sumber,
'peruntukan' => $dataPembanding->peruntukan, 'peruntukan' => $dataPembanding->peruntukan,
'penawaran' => $dataPembanding->penawaran, 'penawaran' => $dataPembanding->penawaran,
@@ -65,7 +65,6 @@ class BankDataController extends Controller
'jenis_aset' => $dataPembanding->jenis_aset, 'jenis_aset' => $dataPembanding->jenis_aset,
'foto_objek' => $dataPembanding->foto_objek, 'foto_objek' => $dataPembanding->foto_objek,
'tanggal' => $dataPembanding->tanggal, 'tanggal' => $dataPembanding->tanggal,
'harga_penawaran' => $dataPembanding->harga_penawaran,
]; ];
BankData::updateOrCreate( BankData::updateOrCreate(

2
app/Http/Controllers/PenilaianController.php
View File

@@ -514,7 +514,7 @@ class PenilaianController extends Controller
$status = 'done'; $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); $_permohonan = Permohonan::with(['documents.jenisJaminan','penilaian._user_penilai','penilai','documents.detail.jenisLegalitasJaminan'])->find(6);
if (isset($_permohonan->penilai->lpj)) { if (isset($_permohonan->penilai->lpj)) {

4
resources/views/penilaian/form.blade.php
View File

@@ -45,9 +45,9 @@
Tim Penilai yang di tunjuk Tim Penilai yang di tunjuk
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<input class="input" type="hidden" name="teams_id" value="{{ $regionName->id }}"> <input class="input" type="hidden" name="teams_id" value="{{ $regionName->id ?? '' }}">
<input class="input @error('teams_id') border-danger bg-danger-light @enderror" <input class="input @error('teams_id') border-danger bg-danger-light @enderror"
type="text" value="{{ $regionName->name }}" readonly> type="text" value="{{ $regionName->name ?? '' }}" readonly>
@error('teams_id') @error('teams_id')
<em class="alert text-danger text-sm">{{ $message }}</em> <em class="alert text-danger text-sm">{{ $message }}</em>
@enderror @enderror