diff --git a/app/Http/Controllers/PersetujuanPenawaranController.php b/app/Http/Controllers/PersetujuanPenawaranController.php
index 3838167..271697d 100644
--- a/app/Http/Controllers/PersetujuanPenawaranController.php
+++ b/app/Http/Controllers/PersetujuanPenawaranController.php
@@ -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');
diff --git a/resources/views/persetujuan_penawaran/form.blade.php b/resources/views/persetujuan_penawaran/form.blade.php
index 2666607..79fd23c 100644
--- a/resources/views/persetujuan_penawaran/form.blade.php
+++ b/resources/views/persetujuan_penawaran/form.blade.php
@@ -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
diff --git a/resources/views/persetujuan_penawaran/index.blade.php b/resources/views/persetujuan_penawaran/index.blade.php
index 3c15f74..95118a7 100644
--- a/resources/views/persetujuan_penawaran/index.blade.php
+++ b/resources/views/persetujuan_penawaran/index.blade.php
@@ -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