diff --git a/app/Http/Controllers/NocController.php b/app/Http/Controllers/NocController.php
index b4dd9cc..e0b3cd3 100644
--- a/app/Http/Controllers/NocController.php
+++ b/app/Http/Controllers/NocController.php
@@ -175,6 +175,8 @@
                     [
                         'penawaran.permohonan.debiture',
                         'penawaran.permohonan.branch',
+                        'permohonan.debiture',
+                        'permohonan.branch',
                         'penawaran.detail',
                         'penawaran.persetujuan',
                     ],
diff --git a/app/Http/Requests/PersetujuanPenawaranRequest.php b/app/Http/Requests/PersetujuanPenawaranRequest.php
index cc8a03d..32d9599 100644
--- a/app/Http/Requests/PersetujuanPenawaranRequest.php
+++ b/app/Http/Requests/PersetujuanPenawaranRequest.php
@@ -14,6 +14,7 @@
         public function rules()
         {
             return [
+                'permohonan_id'              => 'nullable|exists:permohonan,id',
                 'penawaran_id'               => 'nullable|exists:penawaran,id',
                 'nomor_proposal_penawaran'   => 'nullable|string|max:255',
                 'tanggal_proposal_penawaran' => 'nullable|date',
diff --git a/app/Models/Permohonan.php b/app/Models/Permohonan.php
index 0618829..055fc38 100644
--- a/app/Models/Permohonan.php
+++ b/app/Models/Permohonan.php
@@ -38,7 +38,6 @@
             'registrasi_catatan',
             'registrasi_by',
             'registrasi_at',
-            'jenis_penilaian_id',
             'region_id',
             'sla',
             // andy add
@@ -134,6 +133,10 @@
             return $this->belongsTo(JenisFasilitasKredit::class);
         }
 
+        public function jenisPenilaian(){
+            return $this->belongsTo(JenisPenilaian::class);
+        }
+
         public function penilaian()
         {
             return $this->belongsTo(Penilaian::class, 'nomor_registrasi', 'nomor_registrasi');
diff --git a/app/Models/PersetujuanPenawaran.php b/app/Models/PersetujuanPenawaran.php
index ebaf8af..014a5a3 100644
--- a/app/Models/PersetujuanPenawaran.php
+++ b/app/Models/PersetujuanPenawaran.php
@@ -10,6 +10,7 @@
         protected $table = 'persetujuan_penawaran';
 
         protected $fillable = [
+            'permohonan_id',
             'penawaran_id',
             'nomor_proposal_penawaran',
             'tanggal_proposal_penawaran',
@@ -42,6 +43,10 @@
             return $this->belongsTo(PenawaranTender::class, 'penawaran_id');
         }
 
+        public function permohonan(){
+            return $this->belongsTo(Permohonan::class, 'permohonan_id');
+        }
+
         // Relationship with Region
         public function region()
         {
diff --git a/module.json b/module.json
index bcd7811..036edf7 100644
--- a/module.json
+++ b/module.json
@@ -166,7 +166,19 @@
             {
                 "title": "Pembayaran",
                 "path": "pembayaran",
-                "icon": "ki-filled ki-file-added text-lg text-success",
+                "icon": "ki-filled ki-credit-cart text-lg text-primary",
+                "classes": "",
+                "attributes": [],
+                "permission": "",
+                "roles": [
+                    "administrator",
+                    "pemohon-ao"
+                ]
+            },
+            {
+                "title": "Approval Pembayaran",
+                "path": "pembayaran.approval",
+                "icon": "ki-filled ki-ensure text-lg text-info",
                 "classes": "",
                 "attributes": [],
                 "permission": "",
diff --git a/resources/views/noc/index.blade.php b/resources/views/noc/index.blade.php
index 3aa73b6..dcc1c63 100644
--- a/resources/views/noc/index.blade.php
+++ b/resources/views/noc/index.blade.php
@@ -125,29 +125,38 @@
                         nomor_registrasi: {
                             title: 'Nomor Registrasi',
                             render: (item, data) => {
-                                return `${data.penawaran.nomor_registrasi}`;
+                                if(data.permohonan) {
+                                    return `${data.permohonan.nomor_registrasi}`;
+                                }
+                                return `${data.penawaran.permohonan.nomor_registrasi}`;
                             },
                         },
                         nama_debitur: {
                             title: 'Nama Debitur',
                             render: (item, data) => {
+                                if(data.permohonan) {
+                                    return `${data.permohonan.debiture.name}`;
+                                }
                                 return `${data.penawaran.permohonan.debiture.name}`;
                             },
                         },
                         cabang: {
                             title: 'Cabang',
                             render: (item, data) => {
+                                if(data.permohonan) {
+                                    return `${data.permohonan.branch.name}`;
+                                }
                                 return `${data.penawaran.permohonan.branch.name}`;
                             },
                         },
                         tanggal_setor: {
-                            title: 'Cabang',
+                            title: 'Tanggal Setor',
                             render: (item, data) => {
                                 return `${window.formatTanggalIndonesia(data.created_at)}`;
                             },
                         },
                         nominal_bayar: {
-                            title: 'Cabang',
+                            title: 'Nominal Bayar',
                             render: (item, data) => {
                                 return `${window.formatRupiah(data.nominal_bayar)}`;
                             },
@@ -165,7 +174,7 @@
                             },
                         },
                         tanggal_penyelesaian: {
-                            title: 'Cabang',
+                            title: 'Tanggal Penyelesaian',
                             render: (item, data) => {
                                 if(data.status==1) {
                                     return `${window.formatTanggalIndonesia(data.updated_at)}`;