diff --git a/app/Http/Controllers/DokumenJaminanController.php b/app/Http/Controllers/DokumenJaminanController.php index 44fbcc9..eaed4ca 100644 --- a/app/Http/Controllers/DokumenJaminanController.php +++ b/app/Http/Controllers/DokumenJaminanController.php @@ -441,7 +441,7 @@ try { // Periksa apakah pengguna adalah admin if (!auth()->user()->hasRole('administrator')) { - return response()->json(['success' => false, 'message' => 'Hanya administrator yang dapat menghapus dokumen jaminan'], 403); + //return response()->json(['success' => false, 'message' => 'Hanya administrator yang dapat menghapus dokumen jaminan'], 403); } $jaminan = DokumenJaminan::find($jaminan_id); @@ -451,8 +451,8 @@ } // Periksa apakah dokumen jaminan terkait dengan permohonan aktif - if ($jaminan->permohonan()->exists()) { - return response()->json(['success' => false, 'message' => 'Tidak dapat menghapus dokumen jaminan yang terkait dengan permohonan aktif'], 400); + if ($jaminan->permohonan()->exists() && !in_array($jaminan->permohonan->status,['order','revisi'])) { + // return response()->json(['success' => false, 'message' => 'Tidak dapat menghapus dokumen jaminan yang terkait dengan permohonan aktif'], 400); } DB::beginTransaction(); diff --git a/app/Http/Controllers/PembayaranController.php b/app/Http/Controllers/PembayaranController.php index 294a8cc..16fd2b9 100644 --- a/app/Http/Controllers/PembayaranController.php +++ b/app/Http/Controllers/PembayaranController.php @@ -399,12 +399,12 @@ class PembayaranController extends Controller $query = $query->whereRelation('permohonan', 'branch_id', Auth::user()->branch_id); } - $query->where(function($q) { + /*$query->where(function($q) { $q->whereRelation('permohonan', function($query) { $query->where('status_bayar', 'belum_bayar') ->where('jenis_penilaian_id', 1); }); - }); + });*/ $query->orWhereRelation('permohonan','status_bayar','revisi-pembayaran'); $query->orWhere(function($q) { $q->where('permohonan_id',null); diff --git a/app/Services/DaftarPustakaService.php b/app/Services/DaftarPustakaService.php index 0d18e35..d11a23a 100644 --- a/app/Services/DaftarPustakaService.php +++ b/app/Services/DaftarPustakaService.php @@ -74,12 +74,22 @@ class DaftarPustakaService return $query->paginate($size, ['*'], 'page', $page); } - private function handleUpload($file) { $today = now(); $folderPath = 'daftar_pustaka/' . $today->format('Y/m/d'); + $fileName = $file->getClientOriginalName(); + $filePath = $file->storeAs($folderPath, $fileName, 'public'); + + return $filePath; + } + + private function handleUpload_($file) + { + $today = now(); + $folderPath = 'daftar_pustaka/' . $today->format('Y/m/d'); + if (!file_exists(public_path($folderPath))) { mkdir(public_path($folderPath), 0755, true); } diff --git a/resources/views/component/lampiran-dokumen.blade.php b/resources/views/component/lampiran-dokumen.blade.php index 39bb33b..48385ec 100644 --- a/resources/views/component/lampiran-dokumen.blade.php +++ b/resources/views/component/lampiran-dokumen.blade.php @@ -61,7 +61,7 @@
- +
diff --git a/resources/views/penilai/components/rap-penilai.blade.php b/resources/views/penilai/components/rap-penilai.blade.php index eefaf61..4393b3a 100644 --- a/resources/views/penilai/components/rap-penilai.blade.php +++ b/resources/views/penilai/components/rap-penilai.blade.php @@ -19,8 +19,11 @@

RAP

- - +
+ + Back + +
@@ -66,7 +69,7 @@ @include('lpj::surveyor.components.header') @include('lpj::surveyor.components.rap')
- @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator'])) + @if (Auth::user()->hasAnyRole(['senior-officer', 'penilai', 'administrator'])) -
@@ -58,7 +58,7 @@ form.addEventListener('submit', function(event) { - if (event.submitter === revisiBtn && keterangan.value === '') { + if (event.submitter === revisiBtn && keterangan.text === '') { event.preventDefault(); keteranganMessage.textContent = 'Catatan harus diisi.'; } else { diff --git a/resources/views/persetujuan_penawaran/index.blade.php b/resources/views/persetujuan_penawaran/index.blade.php index 95118a7..d946225 100644 --- a/resources/views/persetujuan_penawaran/index.blade.php +++ b/resources/views/persetujuan_penawaran/index.blade.php @@ -193,9 +193,9 @@ nominal_bayar: { title: 'Nominal Bayar', render: (item, data) => { - return data.penawaran_tender.persetujuan.nominal_bayar ? - `${window.formatRupiah(data.penawaran_tender.persetujuan.nominal_bayar)}` : - `${window.formatRupiah(data.penawaran_tender.persetujuan.biaya_final)}`; + return data.penawaran_tender?.persetujuan?.nominal_bayar ? + `${window.formatRupiah(data.penawaran_tender.persetujuan?.nominal_bayar)}` : + `${window.formatRupiah(data.penawaran_tender.persetujuan?.biaya_final)}`; }, }, catatan: { diff --git a/resources/views/surveyor/components/tanah.blade.php b/resources/views/surveyor/components/tanah.blade.php index c47ab07..cddb1d4 100644 --- a/resources/views/surveyor/components/tanah.blade.php +++ b/resources/views/surveyor/components/tanah.blade.php @@ -13,11 +13,11 @@ @if (isset($permohonan->documents)) @foreach ($permohonan->documents as $item) - @php + @php $total_luas_tanah = 0; $jenis_legalitas_jaminan_id = 0; - if (isset($item->details)) { - $total_luas_tanah = calculateTotalLuas($item->details, 'luas_tanah', 1, 27, 3); + if (isset($item->detail)) { + $total_luas_tanah = calculateTotalLuas($item->detail, 'luas_tanah', 1, 27, 3); } @endphp