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

Compare commits

base: daengdeni:112262d7d650f503e8ad9375f101105e6d326a9f
Branches Tags
daengdeni:staging daengdeni:lpj-db-migratio
...
compare: daengdeni:04ee3a0c485837e6a253c5097e826d7063f00393
Branches Tags
daengdeni:staging daengdeni:lpj-db-migratio

4 Commits
112262d7d6 ... 04ee3a0c48

Author SHA1 Message Date
Daeng Deni Mardaeni
04ee3a0c48 🔧(permohonan): Perbaiki logika pembuatan PersetujuanPenawaran dan update label menu 
- Menambahkan pengecekan `status_bayar == 'belum_bayar'` sebelum membuat record PersetujuanPenawaran
- Mencegah pembuatan PersetujuanPenawaran jika status pembayaran sudah 'sudah_bayar'
- Memastikan logika bisnis hanya membuat PersetujuanPenawaran untuk permohonan belum dibayar
- Mengoptimalkan query database untuk mengurangi operasi CREATE yang tidak perlu
- Memperbaiki struktur dan indentasi kode di PermohonanController agar lebih mudah dibaca
- Mengubah label menu dari "Data Debitur" menjadi "Data Permohonan" di module.json
- Menyelaraskan istilah menu dengan konten dan fungsi halaman
- Meningkatkan konsistensi data dan efisiensi sistem
- Memperbaiki UX dengan label menu yang lebih relevan dan mudah dipahami
 2025-09-30 17:08:29 +07:00
Daeng Deni Mardaeni
10b5a6c96c ✨(persetujuan-penawaran): Tambah fitur tampilan file dan perbaiki logika persetujuan penawaran 
- Menambahkan auto-fill nominal_bayar dengan nilai biaya_final pada create persetujuan
- Memperbaiki query datatables dengan filter status penawaran lebih spesifik
- Menambahkan whereHas untuk memastikan hanya status 'persetujuan-penawaran' yang ditampilkan
- Menambahkan preview file upload (persetujuan_penawaran, surat_representasi, bukti_bayar)
- Menggunakan Storage::url() untuk generate URL file dengan keamanan optimal
- Menambahkan ikon eye dan badge untuk tampilan preview file
- Memperbaiki fallback nominal_bayar agar otomatis menggunakan biaya_final
- Merapikan struktur HTML dan urutan class Tailwind CSS di index dan form blade
- Mengoptimalkan AJAX request structure dan error handling agar lebih stabil
 2025-09-30 17:06:30 +07:00
Daeng Deni Mardaeni
3aca1d46c2 🧹(surveyor): Optimasi import statements dan perbaikan tampilan detail surveyor 
- Menghapus lebih dari 20 import statements yang tidak digunakan di SurveyorController
- Membersihkan import RedirectResponse, JsonResponse, Response, dan helper tidak relevan
- Menghapus model lama seperti Surveyor, Analisa, dan AnalisaFakta yang tidak digunakan
- Menambahkan import PermohonanHistory untuk fitur catatan revisi survey
- Menambahkan query untuk mengambil catatan revisi terbaru dari PermohonanHistory
- Menampilkan catatan revisi dengan filter status 'revisi-survey' menggunakan latest()
- Mereorganisasi urutan class Tailwind CSS pada detail.blade.php agar lebih konsisten
- Memperbaiki struktur HTML dan indentasi untuk meningkatkan readability
- Mengoptimalkan error handling dan conditional rendering di view untuk tampilan lebih bersih
 2025-09-30 17:01:52 +07:00
Daeng Deni Mardaeni
db55471111 🎨(pembayaran): Perbaiki logika status pembayaran dan optimasi tampilan approval 
- Memperbaiki nested condition untuk jenis_penilaian_id == 2 pada PembayaranController
- Memindahkan logika status 'spk' ke blok else yang sesuai
- Menyempurnakan flow status pembayaran agar konsisten dan bebas konflik
- Menghindari benturan status antara 'proses-laporan' dan 'spk'
- Menyusun ulang class Tailwind CSS pada approval.blade.php agar konsisten dan rapi
- Memperbaiki struktur HTML dan layout card untuk meningkatkan readability dan responsivitas
- Menambahkan fallback nominal_bayar dari biaya_final untuk keandalan data
- Mengoptimalkan tampilan tombol action berdasarkan status_bayar dengan null-checking
- Menambahkan fallback values untuk data kosong serta perbaikan spacing & alignment
- Meningkatkan UX dan accessibility agar approval page lebih user-friendly dan stabil
 2025-09-30 16:57:44 +07:00
9 changed files with 337 additions and 307 deletions
Expand all files Collapse all files

8
app/Http/Controllers/PembayaranController.php
View File

@@ -346,11 +346,11 @@ class PembayaranController extends Controller
} else {
$data['status_bayar'] = 'sudah_bayar';
$data['status'] = 'proses-laporan';
}
if ($permohonan->jenis_penilaian_id == 2) {
$data['status_bayar'] = 'sudah_bayar';
$data['status'] = 'spk';
if ($permohonan->jenis_penilaian_id == 2) {
$data['status_bayar'] = 'sudah_bayar';
$data['status'] = 'spk';
}
}
if ($permohonan->jenis_penilaian_id == 1) {

14
app/Http/Controllers/PermohonanController.php
View File

@@ -360,12 +360,14 @@
$permohonan->keterangan = $request->keterangan;
$permohonan->save();
$persetujuanPenawaran = PersetujuanPenawaran::where('permohonan_id', $id)->first();
if(!$persetujuanPenawaran){
$persetujuanPenawaran = PersetujuanPenawaran::create([
'permohonan_id' => $id,
'created_by' => Auth::id(),
]);
if ($permohonan->status_bayar == 'belum_bayar') {
$persetujuanPenawaran = PersetujuanPenawaran::where('permohonan_id', $id)->first();
if(!$persetujuanPenawaran){
$persetujuanPenawaran = PersetujuanPenawaran::create([
'permohonan_id' => $id,
'created_by' => Auth::id(),
]);
}
}
} catch (Exception $e) {

15
app/Http/Controllers/PersetujuanPenawaranController.php
View File

@@ -40,6 +40,7 @@
$validated = $request->validated();
$validated['created_by'] = Auth::id();
$validated['status'] = '0';
$validated['nominal_bayar'] = $validated['biaya_final'];
$persetujuanPenawaran = PersetujuanPenawaran::updateOrCreate(
['penawaran_id' => $validated['penawaran_id']],
@@ -71,7 +72,7 @@
// Save NOC
try {
$noc = Noc::updateOrCreate([
Noc::updateOrCreate([
'permohonan_id' => $persetujuanPenawaran->permohonan_id,
'persetujuan_penawaran_id' => $persetujuanPenawaran->id
],[
@@ -179,8 +180,8 @@
public function edit($id)
{
$permohonan = Permohonan::with(['debiture', 'penawaranTender.detail'])->find($id);
return view('lpj::persetujuan_penawaran.form', compact('permohonan'));
$persetujuanPenawaran = PersetujuanPenawaran::where('permohonan_id', $id)->first();
return view('lpj::persetujuan_penawaran.form', compact('permohonan', 'persetujuanPenawaran'));
}
/**
@@ -201,8 +202,12 @@
}
// Retrieve data from the database
$query = Permohonan::query()->where(['status' => 'persetujuan-penawaran']);
//$query = Permohonan::query()->where(['status' => 'persetujuan-penawaran']);
$query = Permohonan::query()
->where(['status' => 'persetujuan-penawaran'])
->whereHas('penawaranTender', function ($q) {
$q->where('status', 'persetujuan-penawaran');
});
// Apply search filter if provided
if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search');

28
app/Http/Controllers/SurveyorController.php
View File

@@ -3,25 +3,19 @@
namespace Modules\Lpj\Http\Controllers;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Validator;
use Maatwebsite\Excel\Facades\Excel;
use Modules\Lpj\Exports\BasicDataSurveyorExport;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Str;
use Barryvdh\DomPDF\Facade\Pdf;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Mail;
use Illuminate\Http\Response;
use Modules\Lpj\Models\Debiture;
use Modules\Lpj\Models\LaporanExternal;
use Modules\Lpj\Models\Permohonan;
use Modules\Lpj\Models\Branch;
use Modules\Lpj\Models\Surveyor;
use Modules\Lpj\Models\BentukTanah;
use Modules\Lpj\Models\KonturTanah;
use Modules\Location\Models\Province;
@@ -41,17 +35,8 @@ use Modules\Lpj\Models\SpekBangunan;
use Modules\Lpj\Models\SpekKategoritBangunan;
use Modules\Lpj\Models\SaranaPelengkap;
use Modules\Lpj\Models\ArahMataAngin;
use Modules\Lpj\Models\Analisa;
use Modules\Lpj\Models\Penilaian;
use Modules\Lpj\Models\PerkerasanJalan;
use Modules\Lpj\Models\AnalisaFakta;
use Modules\Lpj\Models\AnalisaLingkungan;
use Modules\Lpj\Models\AnalisaTanahBagunan;
use Modules\Lpj\Models\SpekBangunanAnalisa;
use Modules\Lpj\Models\Denah;
use Modules\Lpj\Models\FotoJaminan;
use Modules\Lpj\Models\Lingkungan;
use Modules\Lpj\Models\LantaiUnit;
use Modules\Lpj\Models\Teams;
use Modules\Lpj\Models\Lantai;
use Modules\Lpj\Models\Inspeksi;
@@ -62,29 +47,24 @@ use Modules\Lpj\Models\PosisiUnit;
use Modules\Lpj\Models\TerletakArea;
use Modules\Lpj\Models\FasilitasObjek;
use Modules\Lpj\Models\MerupakanDaerah;
use Modules\Lpj\Models\ObjekJaminan;
use Modules\Lpj\Models\ModelAlatBerat;
use Modules\Lpj\Models\JenisPesawat;
use Modules\Lpj\Models\DokumenJaminan;
use Modules\Lpj\Models\DetailDokumenJaminan;
use Modules\Lpj\Models\JenisKapal;
use Modules\Lpj\Models\JenisKendaraan;
use Modules\Lpj\Models\RuteJaminan;
use Modules\Lpj\Models\HubunganPemilikJaminan;
use Modules\Lpj\Models\HubunganPenghuniJaminan;
use Modules\Lpj\Models\AnalisaUnit;
use Modules\Lpj\Models\GolonganMasySekitar;
use Modules\Lpj\Models\TingkatKeramaian;
use Modules\Lpj\Models\TujuanPenilaian;
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\Jobs\SendJadwalKunjunganEmailJob;
use App\Helpers\Lpj;
use Modules\Lpj\Models\Authorization;
use Modules\Lpj\Services\SurveyorValidateService;
use Modules\Lpj\Services\SaveFormInspesksiService;
use Modules\Lpj\Models\PermohonanHistory;
class SurveyorController extends Controller
{
@@ -151,13 +131,17 @@ class SurveyorController extends Controller
});
}
$catatan_revisi_survey = PermohonanHistory::where('permohonan_id', $id)
->where('status', 'revisi-survey')->latest()->first();
return view('lpj::surveyor.detail', compact(
'permohonan',
'surveyor',
'branches',
'provinces',
'bentukTanah',
'inspeksiData'
'inspeksiData',
'catatan_revisi_survey',
));
}

2
module.json
View File

@@ -300,7 +300,7 @@
]
},
{
"title": "Data Debitur",
"title": "Data Permohonan",
"path": "debitur",
"icon": "ki-filled ki-people text-lg text-primary",
"classes": "",

175
resources/views/pembayaran/approval.blade.php
View File

@@ -6,9 +6,10 @@
@section('content')
<div class="grid">
<div class="card border border-agi-100 card-grid min-w-full" data-datatable="false" data-datatable-page-size="10" data-datatable-state-save="false"
id="pembayaran-table" data-api-url="{{ route('pembayaran.approval.datatables') }}">
<div class="card-header light:bg-agi-50 py-5 flex-wrap">
<div class="min-w-full border card border-agi-100 card-grid" data-datatable="false" data-datatable-page-size="10"
data-datatable-state-save="false" id="pembayaran-table"
data-api-url="{{ route('pembayaran.approval.datatables') }}">
<div class="flex-wrap py-5 card-header light:bg-agi-50">
<h3 class="card-title">
Daftar Pembayaran
</h3>
@@ -26,74 +27,74 @@
</div>
<div class="card-body">
<div class="scrollable-x-auto">
<table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm"
data-datatable-table="true">
<table class="table text-sm font-medium text-gray-700 align-middle table-auto table-border"
data-datatable-table="true">
<thead>
<tr>
<th class="w-14">
<input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox"/>
</th>
<th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
<span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
<span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="user_id">
<span class="sort"> <span class="sort-label"> User Pemohon </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="branch_id">
<span class="sort"> <span class="sort-label"> Cabang Pemohon </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="debitur_id">
<span class="sort"> <span class="sort-label"> Debitur </span>
<span class="sort-icon"> </span> </span>
</th>
<tr>
<th class="w-14">
<input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox" />
</th>
<th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
<span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
<span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="user_id">
<span class="sort"> <span class="sort-label"> User Pemohon </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="branch_id">
<span class="sort"> <span class="sort-label"> Cabang Pemohon </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="debitur_id">
<span class="sort"> <span class="sort-label"> Debitur </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px] text-center" data-datatable-column="tujuan_penilaian_id">
<span class="sort"> <span class="sort-label"> Status Bayar </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px] text-center" data-datatable-column="tujuan_penilaian_id">
<span class="sort"> <span class="sort-label"> Status Bayar </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tanggal_setor">
<span class="sort"> <span class="sort-label"> Tanggal KSL </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="nominal_bayar">
<span class="sort"> <span class="sort-label"> Nominal bayar </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="bukti_bayar">
<span class="sort"> <span class="sort-label"> Bukti Bayar </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="approval_by">
<span class="sort"> <span class="sort-label"> Approval By </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tanggal_setor">
<span class="sort"> <span class="sort-label"> Tanggal KSL </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="nominal_bayar">
<span class="sort"> <span class="sort-label"> Nominal bayar </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="bukti_bayar">
<span class="sort"> <span class="sort-label"> Bukti Bayar </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="approval_by">
<span class="sort"> <span class="sort-label"> Approval By </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="approve_keterangan_bayar">
<span class="sort"> <span class="sort-label"> Keterangan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="approve_keterangan_bayar">
<span class="sort"> <span class="sort-label"> Keterangan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
</tr>
<th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
</tr>
</thead>
</table>
</div>
<div
class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
<div class="flex items-center gap-2">
class="flex-col gap-3 justify-center font-medium text-gray-600 card-footer md:justify-between md:flex-row text-2sm">
<div class="flex gap-2 items-center">
Show
<select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per
<select class="w-16 select select-sm" data-datatable-size="true" name="perpage"> </select> per
page
</div>
<div class="flex items-center gap-4">
<div class="flex gap-4 items-center">
<span data-datatable-info="true"> </span>
<div class="pagination" data-datatable-pagination="true">
</div>
@@ -195,7 +196,7 @@
render: (item, data) => {
if (data.permohonan) {
return `${data.permohonan.nomor_registrasi}`;
} else if(data.penawaran) {
} else if (data.penawaran) {
return `${data.penawaran.permohonan.nomor_registrasi}`;
}
return "";
@@ -207,7 +208,7 @@
render: (item, data) => {
if (data.permohonan) {
return `${data.permohonan.tanggal_permohonan}`;
} else if(data.penawaran) {
} else if (data.penawaran) {
return `${data.penawaran.permohonan.tanggal_permohonan}`;
}
return "";
@@ -218,8 +219,7 @@
render: (item, data) => {
if (data.permohonan) {
return `${data.permohonan.user.name}`;
}
else if(data.penawaran) {
} else if (data.penawaran) {
return `${data.penawaran.permohonan.user.name}`;
}
return "";
@@ -231,8 +231,7 @@
render: (item, data) => {
if (data.permohonan) {
return `${data.permohonan.branch.name}`;
}
else if(data.penawaran) {
} else if (data.penawaran) {
return `${data.penawaran.permohonan.branch.name}`;
}
return "";
@@ -244,8 +243,7 @@
render: (item, data) => {
if (data.permohonan) {
return `${data.permohonan.debiture.name}`;
}
else if(data.penawaran) {
} else if (data.penawaran) {
return `${data.penawaran.permohonan.debiture.name}`;
}
return "";
@@ -255,13 +253,13 @@
status_bayar: {
title: 'Status Bayar',
render: (item, data) => {
if(data.permohonan){
if (data.permohonan) {
var permohonan = data.permohonan;
} else if(data.penawaran){
} else if (data.penawaran) {
var permohonan = data.penawaran.permohonan;
}
if(permohonan) {
if (permohonan) {
const status = permohonan.status_bayar.replace(/_/g,
' ');
@@ -284,10 +282,11 @@
nominal_bayar: {
title: 'Nominal Bayar',
render: (item, data) => {
return `${window.formatRupiah(data.nominal_bayar)}`;
return data.nominal_bayar ? `${window.formatRupiah(data.nominal_bayar)}` : `${window.formatRu
piah(data.biaya_final)}`;
},
},
bukti_bayar:{
bukti_bayar: {
title: 'Bukti Bayar',
render: (item, data) => {
if (data.bukti_bayar) {
@@ -302,14 +301,14 @@
approve_bayar_by: {
title: 'Status Approve',
render: (item, data) => {
if(data.permohonan){
if (data.permohonan) {
var permohonan = data.permohonan;
} else if(data.penawaran){
} else if (data.penawaran) {
var permohonan = data.penawaran.permohonan;
}
if(permohonan) {
if(permohonan.approve_bayar) {
if (permohonan) {
if (permohonan.approve_bayar) {
return `${permohonan.approve_bayar.name}`;
}
return "";
@@ -321,13 +320,13 @@
approve_keterangan_bayar: {
title: 'Status Approve',
render: (item, data) => {
if(data.permohonan){
if (data.permohonan) {
var permohonan = data.permohonan;
} else if(data.penawaran){
} else if (data.penawaran) {
var permohonan = data.penawaran.permohonan;
}
if(permohonan) {
if (permohonan) {
return `${permohonan.approve_keterangan_bayar}` || '-';
}
@@ -337,26 +336,27 @@
actions: {
title: 'Status',
render: (item, data) => {
if(data.permohonan){
if (data.permohonan) {
var permohonan = data.permohonan;
} else if(data.penawaran){
} else if (data.penawaran) {
var permohonan = data.penawaran.permohonan;
}
var iconPembayaranOtorisator = '';
if(permohonan) {
if (!permohonan.approve_bayar_by) {
iconPembayaranOtorisator = `<a class="btn btn-sm btn-icon btn-clear btn-primary " onclick="handlePembayaran(${permohonan.id},'otorisator')">
if (permohonan) {
if (permohonan.status_bayar !== 'sudah_bayar') {
iconPembayaranOtorisator = `<a class="btn btn-sm btn-icon btn-clear btn-primary" onclick="handlePembayaran(${permohonan.id},'otorisator')">
<i class="ki-filled ki-double-check"></i>
</a>
<a class="btn btn-sm btn-icon btn-clear btn-primary " onclick="handlePembayaran(${permohonan.id}, 'revisi')">
<a class="btn btn-sm btn-icon btn-clear btn-primary" onclick="handlePembayaran(${permohonan.id}, 'revisi')">
<i class="ki-filled ki-arrow-circle-left"></i>
</a>
`;
}
return `<div class="flex flex-nowrap justify-center">` + iconPembayaranOtorisator + `</div>`;
return `<div class="flex flex-nowrap justify-center">` + iconPembayaranOtorisator +
`</div>`;
}
return "";
@@ -368,11 +368,10 @@
let dataTable = new KTDataTable(element, dataTableOptions);
// Custom search functionality
searchInput.addEventListener('input', function () {
searchInput.addEventListener('input', function() {
const searchValue = this.value.trim();
dataTable.search(searchValue, true);
});
</script>
@endpush

33
resources/views/persetujuan_penawaran/form.blade.php
View File

@@ -60,6 +60,17 @@
<input type="file" name="file_persetujuan_penawaran" id="file_persetujuan_penawaran"
class="file-input w-full @error('file_persetujuan_penawaran') border-danger bg-danger-light @enderror"
accept=".pdf,.doc,.docx">
@if (isset($persetujuanPenawaran->file_persetujuan_penawaran) &&
!empty($persetujuanPenawaran->file_persetujuan_penawaran))
<div class="flex items-center mt-2">
<a href="{{ Storage::url($persetujuanPenawaran->file_persetujuan_penawaran) }}"
target="_blank" class="badge badge-sm badge-outline badge-warning">
<i class="mr-2 ki-filled ki-eye"></i> Lihat File
</a>
</div>
@endif
@error('file_persetujuan_penawaran')
<em class="text-sm alert text-danger">{{ $message }}</em>
@enderror
@@ -74,6 +85,16 @@
<input type="file" name="surat_representasi" id="surat_representasi"
class="file-input w-full @error('surat_representasi') border-danger bg-danger-light @enderror"
accept=".pdf,.doc,.docx">
@if (isset($persetujuanPenawaran->surat_representasi) && !empty($persetujuanPenawaran->surat_representasi))
<div class="flex items-center mt-2">
<a href="{{ Storage::url($persetujuanPenawaran->surat_representasi) }}" target="_blank"
class="badge badge-sm badge-outline badge-warning">
<i class="mr-2 ki-filled ki-eye"></i> Lihat File
</a>
</div>
@endif
@error('surat_representasi')
<em class="text-sm alert text-danger">{{ $message }}</em>
@enderror
@@ -87,7 +108,7 @@
<div class="flex flex-wrap items-baseline w-full">
<input type="number" name="nominal_bayar" id="nominal_bayar"
class="input w-full @error('nominal_bayar') border-danger bg-danger-light @enderror"
value="{{ old('nominal_bayar', $persetujuanPenawaran->nominal_bayar ?? '') }}"
value="{{ old('nominal_bayar', $persetujuanPenawaran->nominal_bayar ?? ($persetujuanPenawaran->biaya_final ?? '')) }}"
placeholder="Masukkan nominal bayar">
@error('nominal_bayar')
<em class="text-sm alert text-danger">{{ $message }}</em>
@@ -103,6 +124,16 @@
<input type="file" name="bukti_bayar" id="bukti_bayar"
class="file-input w-full @error('bukti_bayar') border-danger bg-danger-light @enderror"
accept=".pdf,.jpg,.jpeg,.png">
@if (isset($persetujuanPenawaran->bukti_bayar) && !empty($persetujuanPenawaran->bukti_bayar))
<div class="flex items-center mt-2">
<a href="{{ Storage::url($persetujuanPenawaran->bukti_bayar) }}" target="_blank"
class="badge badge-sm badge-outline badge-warning">
<i class="mr-2 ki-filled ki-eye"></i> Lihat File
</a>
</div>
@endif
@error('bukti_bayar')
<em class="text-sm alert text-danger">{{ $message }}</em>
@enderror

333
resources/views/persetujuan_penawaran/index.blade.php
View File

@@ -5,9 +5,11 @@
@endsection
@section('content')
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
<div class="card border border-agi-100 card-grid min-w-full" data-datatable="false" data-datatable-page-size="10" data-datatable-state-save="false" id="persetujuan-penawaran-table" data-api-url="{{ route('persetujuan-penawaran.datatables') }}">
<div class="card-header bg-agi-50 py-5 flex-wrap">
<div class="grid gap-5 mx-auto w-full lg:gap-7.5">
<div class="min-w-full border card border-agi-100 card-grid" data-datatable="false" data-datatable-page-size="10"
data-datatable-state-save="false" id="persetujuan-penawaran-table"
data-api-url="{{ route('persetujuan-penawaran.datatables') }}">
<div class="flex-wrap py-5 card-header bg-agi-50">
<h3 class="card-title">
Daftar Persetujuan Penawaran KJPP
</h3>
@@ -27,57 +29,58 @@
<div class="card-body">
<div class="scrollable-x-auto">
<table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm" data-datatable-table="true">
<table class="table text-sm font-medium text-gray-700 align-middle table-auto table-border"
data-datatable-table="true">
<thead>
<tr>
<th class="w-14">
<input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox"/>
</th>
<th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
<span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="nama_debitur">
<span class="sort"> <span class="sort-label"> Nama Debitur </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="nomor_proposal_penawaran">
<span class="sort"> <span class="sort-label"> Nomor Proposal </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tanggal_proposal_penawaran">
<span class="sort"> <span class="sort-label"> Tanggal Proposal </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="dokumen_persetujuan">
<span class="sort"> <span class="sort-label"> Dokumen Persetujuan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="biaya_final">
<span class="sort"> <span class="sort-label"> Biaya Final </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="nominal_bayar">
<span class="sort"> <span class="sort-label"> Nominal Bayar </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="catatan">
<span class="sort"> <span class="sort-label"> Catatan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
</tr>
<tr>
<th class="w-14">
<input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox" />
</th>
<th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
<span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="nama_debitur">
<span class="sort"> <span class="sort-label"> Nama Debitur </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="nomor_proposal_penawaran">
<span class="sort"> <span class="sort-label"> Nomor Proposal </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tanggal_proposal_penawaran">
<span class="sort"> <span class="sort-label"> Tanggal Proposal </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="dokumen_persetujuan">
<span class="sort"> <span class="sort-label"> Dokumen Persetujuan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="biaya_final">
<span class="sort"> <span class="sort-label"> Biaya Final </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="nominal_bayar">
<span class="sort"> <span class="sort-label"> Nominal Bayar </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="catatan">
<span class="sort"> <span class="sort-label"> Catatan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
</tr>
</thead>
</table>
</div>
<div
class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
<div class="flex items-center gap-2">
class="flex-col gap-3 justify-center font-medium text-gray-600 card-footer md:justify-between md:flex-row text-2sm">
<div class="flex gap-2 items-center">
Show
<select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per
<select class="w-16 select select-sm" data-datatable-size="true" name="perpage"> </select> per
page
</div>
<div class="flex items-center gap-4">
<div class="flex gap-4 items-center">
<span data-datatable-info="true"> </span>
<div class="pagination" data-datatable-pagination="true">
</div>
@@ -85,135 +88,143 @@
</div>
</div>
</div>
@endsection
@endsection
@push('scripts')
<script type="text/javascript">
function prosesData(data) {
Swal.fire({
title: 'Persetujuan Penawaran',
text: "Apakah Anda yakin ingin menyetujui data penawaran ini?",
icon: 'info',
showCancelButton: true,
confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33',
confirmButtonText: 'Ya',
cancelButtonText: 'Tidak'
}).then((result) => {
if (result.isConfirmed) {
window.location.href = `persetujuan-penawaran/${data}/edit`;
} else if (result.dismiss==='cancel') {
$.ajaxSetup({
headers: {
'X-CSRF-TOKEN': '{{ csrf_token() }}'
}
@push('scripts')
<script type="text/javascript">
function prosesData(data) {
Swal.fire({
title: 'Persetujuan Penawaran',
text: "Apakah Anda yakin ingin menyetujui data penawaran ini?",
icon: 'info',
showCancelButton: true,
confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33',
confirmButtonText: 'Ya',
cancelButtonText: 'Tidak'
}).then((result) => {
if (result.isConfirmed) {
window.location.href = `persetujuan-penawaran/${data}/edit`;
} else if (result.dismiss === 'cancel') {
$.ajaxSetup({
headers: {
'X-CSRF-TOKEN': '{{ csrf_token() }}'
}
});
$.ajax(`persetujuan-penawaran/${data}`, {
type: 'GET',
data: {
'status': 'tender'
}
}).then((response) => {
swal.fire('Success!', 'Data Persetujuan telah dikembalikan untuk di kaji ulang',
'success').then(() => {
window.location.reload();
});
}).catch((error) => {
console.error('Error:', error);
Swal.fire('Error!', 'An error occurred while deleting the file.', 'error');
});
}
})
}
</script>
$.ajax(`persetujuan-penawaran/${data}`, {
type: 'GET',
data: {'status': 'tender'}
}).then((response) => {
swal.fire('Success!', 'Data Persetujuan telah dikembalikan untuk di kaji ulang', 'success').then(() => {
window.location.reload();
});
}).catch((error) => {
console.error('Error:', error);
Swal.fire('Error!', 'An error occurred while deleting the file.', 'error');
});
}
})
}
</script>
<script type="module">
const element = document.querySelector('#persetujuan-penawaran-table');
const searchInput = document.getElementById('search');
<script type="module">
const element = document.querySelector('#persetujuan-penawaran-table');
const searchInput = document.getElementById('search');
const apiUrl = element.getAttribute('data-api-url');
const dataTableOptions = {
apiEndpoint: apiUrl,
pageSize: 5,
columns: {
select: {
render: (item, data, context) => {
const checkbox = document.createElement('input');
checkbox.className = 'checkbox checkbox-sm';
checkbox.type = 'checkbox';
checkbox.value = data.id.toString();
checkbox.setAttribute('data-datatable-row-check', 'true');
return checkbox.outerHTML.trim();
},
},
nomor_registrasi: {
title: 'Nomor Registrasi',
},
nama_debitur: {
title: 'Nama Debitur',
render: (item, data) => {
return `${data.debiture.name}`;
},
},
nomor_proposal_penawaran: {
title: 'Nomor Proposal',
render: (item, data) => {
return `${data.penawaran_tender.detail.no_proposal}`;
},
},
tanggal_proposal_penawaran: {
title: 'Tanggal Proposal',
render: (item, data) => {
return window.formatTanggalIndonesia(`${data.penawaran_tender.detail.tgl_proposal}`);
},
const apiUrl = element.getAttribute('data-api-url');
const dataTableOptions = {
apiEndpoint: apiUrl,
pageSize: 5,
columns: {
select: {
render: (item, data, context) => {
const checkbox = document.createElement('input');
checkbox.className = 'checkbox checkbox-sm';
checkbox.type = 'checkbox';
checkbox.value = data.id.toString();
checkbox.setAttribute('data-datatable-row-check', 'true');
return checkbox.outerHTML.trim();
},
},
nomor_registrasi: {
title: 'Nomor Registrasi',
},
nama_debitur: {
title: 'Nama Debitur',
render: (item, data) => {
return `${data.debiture.name}`;
},
},
nomor_proposal_penawaran: {
title: 'Nomor Proposal',
render: (item, data) => {
return `${data.penawaran_tender.detail.no_proposal}`;
},
},
tanggal_proposal_penawaran: {
title: 'Tanggal Proposal',
render: (item, data) => {
return window.formatTanggalIndonesia(`${data.penawaran_tender.detail.tgl_proposal}`);
},
},
dokumen_persetujuan: {
title: 'Dokumen Persetujuan',
render: (item, data) => {
if (data.penawaran_tender.detail.dokumen_persetujuan) {
return `<a href="storage/${data.penawaran_tender.detail.dokumen_persetujuan}" download="${data.penawaran_tender.detail.dokumen_persetujuan}" target="_blank" class="badge badge-sm badge-outline">
},
dokumen_persetujuan: {
title: 'Dokumen Persetujuan',
render: (item, data) => {
if (data.penawaran_tender.detail.dokumen_persetujuan) {
return `<a href="storage/${data.penawaran_tender.detail.dokumen_persetujuan}" download="${data.penawaran_tender.detail.dokumen_persetujuan}" target="_blank" class="badge badge-sm badge-outline">
Download <i class="ki-filled ki-cloud-download"></i>
</a>`;
} else {
return 'Tidak ada dokumen';
}
},
} else {
return 'Tidak ada dokumen';
}
},
biaya_final: {
title: 'Biaya Final',
render: (item, data) => {
return window.formatRupiah(`${data.penawaran_tender.detail.biaya_penawaran}`);
},
},
biaya_final: {
title: 'Biaya Final',
render: (item, data) => {
return window.formatRupiah(`${data.penawaran_tender.detail.biaya_penawaran}`);
},
nominal_bayar: {
title: 'Nominal Bayar'
},
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)}`;
},
catatan: {
title: 'Catatan',
render: (item, data) => {
if(data.penawaran_tender.persetujuan) {
return data.penawaran_tender.persetujuan.catatan;
}
return '-';
},
},
catatan: {
title: 'Catatan',
render: (item, data) => {
if (data.penawaran_tender.persetujuan) {
return data.penawaran_tender.persetujuan.catatan ?? data.approve_keterangan_bayar;
}
return '-';
},
actions: {
title: 'Action',
render: (item, data) => {
return `<div class="flex flex-nowrap justify-center">
},
actions: {
title: 'Action',
render: (item, data) => {
return `<div class="flex flex-nowrap justify-center">
<a class="btn btn-sm btn-outline btn-info" onclick="prosesData(${data.id})">
<i class="ki-filled ki-double-check"></i>
</a>
</div>`;
},
}
},
};
},
}
},
};
let dataTable = new KTDataTable(element, dataTableOptions);
// Custom search functionality
searchInput.addEventListener('input', function () {
const searchValue = this.value.trim();
dataTable.search(searchValue, true);
});
</script>
let dataTable = new KTDataTable(element, dataTableOptions);
// Custom search functionality
searchInput.addEventListener('input', function() {
const searchValue = this.value.trim();
dataTable.search(searchValue, true);
});
</script>
@endpush

36
resources/views/surveyor/detail.blade.php
View File

@@ -17,38 +17,36 @@
</style>
@endpush
@include('lpj::assetsku.includenya')
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
@include('lpj::component.detail-jaminan',['backLink'=>'surveyor.index'])
<div class="grid gap-5 mx-auto w-full lg:gap-7.5">
@include('lpj::component.detail-jaminan', ['backLink' => 'surveyor.index'])
@if ($permohonan->status == 'revisi-survey')
<div class="card border border-agi-100 min-w-full">
<div class="card-header light:bg-agi-50" id="basic_settings">
<div class="card-title flex flex-row gap-1.5">
Catatan Revisi
<div class="min-w-full border card border-agi-100">
<div class="card-header light:bg-agi-50" id="basic_settings">
<div class="flex flex-row gap-1.5 card-title">
Catatan Revisi
</div>
</div>
<div class="card-body">
<p>{{ $permohonan->keterangan ?? '' }}</p>
</div>
</div>
<div class="card-body">
<p>{{ $permohonan->keterangan ?? '' }}</p>
</div>
</div>
</div>
@endif
<div class="card border border-agi-100 min-w-full">
<div class="min-w-full border card border-agi-100">
<div class="card-header light:bg-agi-50" id="basic_settings">
<div class="card-title flex flex-row gap-1.5">
Form Jaminan
<div class="flex flex-row gap-1.5 card-title">
Form Jaminan
</div>
</div>
<div class="card-body">
@include('lpj::surveyor.components.card-tambah')
@include('lpj::surveyor.components.card-tambah')
</div>
<div class="card-footer ">
<div class="card-footer">
<div class="flex gap-5">
<button type="button" id="btnSubmit" class="btn btn-primary">
@@ -109,7 +107,7 @@
console.log('Error checking button status:', error, status, xhr);
if (xhr.responseJSON.message) {
toastrErrorBuild(xhr.responseJSON.message);
}else{
} else {
toastrErrorBuild('Terjadi kesalahan');
}