From 9ae69c3a948302a699fb731df4635d987ca6c8b3 Mon Sep 17 00:00:00 2001
From: KhatamNugraha <nuganugraha2019@gmail.com>
Date: Wed, 23 Aug 2023 12:06:54 +0700
Subject: [PATCH] perbaikan format surat

---
 ...22_040422_update_table_signer_22082023.php |  32 ++++
 ...080937_Update_fasilitas_table_22082023.php |  32 ++++
 ...023744_Update_fasilitas_table_23082023.php |  32 ++++
 Entities/Category.php                         |  35 ++++
 Entities/Company.php                          |  29 ++++
 Http/Controllers/KonfirmasiBankController.php |  76 ++++++---
 Resources/views/exportPdf.blade.php           |  70 ++++----
 Resources/views/pages/exportPdf.blade.php     |  43 +++--
 .../views/pages/index_fasilitas.blade.php     | 151 +++++++++++++++---
 .../views/pages/table_fasilitas.blade.php     |   8 +-
 10 files changed, 402 insertions(+), 106 deletions(-)
 create mode 100644 Database/Migrations/2023_08_22_040422_update_table_signer_22082023.php
 create mode 100644 Database/Migrations/2023_08_22_080937_Update_fasilitas_table_22082023.php
 create mode 100644 Database/Migrations/2023_08_23_023744_Update_fasilitas_table_23082023.php
 create mode 100644 Entities/Category.php
 create mode 100644 Entities/Company.php

diff --git a/Database/Migrations/2023_08_22_040422_update_table_signer_22082023.php b/Database/Migrations/2023_08_22_040422_update_table_signer_22082023.php
new file mode 100644
index 0000000..7dc2f19
--- /dev/null
+++ b/Database/Migrations/2023_08_22_040422_update_table_signer_22082023.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('signers', function (Blueprint $table) {
+              $table->string('signer_type');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('signers', function (Blueprint $table) {
+
+        });
+    }
+};
\ No newline at end of file
diff --git a/Database/Migrations/2023_08_22_080937_Update_fasilitas_table_22082023.php b/Database/Migrations/2023_08_22_080937_Update_fasilitas_table_22082023.php
new file mode 100644
index 0000000..4737f9a
--- /dev/null
+++ b/Database/Migrations/2023_08_22_080937_Update_fasilitas_table_22082023.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('fasilitas', function (Blueprint $table) {
+              $table->string('mata_uang');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('fasilitas', function (Blueprint $table) {
+
+        });
+    }
+};
\ No newline at end of file
diff --git a/Database/Migrations/2023_08_23_023744_Update_fasilitas_table_23082023.php b/Database/Migrations/2023_08_23_023744_Update_fasilitas_table_23082023.php
new file mode 100644
index 0000000..bbb4ce4
--- /dev/null
+++ b/Database/Migrations/2023_08_23_023744_Update_fasilitas_table_23082023.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+         Schema::table('fasilitas', function (Blueprint $table) {
+              $table->string('jenis_rekening')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('fasilitas', function (Blueprint $table) {
+
+        });
+    }
+};
\ No newline at end of file
diff --git a/Entities/Category.php b/Entities/Category.php
new file mode 100644
index 0000000..7848b84
--- /dev/null
+++ b/Entities/Category.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Modules\Konfirmasibank\Entities;
+
+use Spatie\Activitylog\LogOptions;
+use Spatie\Activitylog\Traits\LogsActivity;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class Category extends Model
+{
+    use HasFactory;
+
+    protected $connection = 'db2';
+    protected $table = 'STG_DB.CATEGORY';
+    protected $primaryKey = 'ID';
+
+    //public $incrementing = false;
+
+    protected $fillable = [
+    "'ID',
+    'DESCRIPTION'
+    'SHORT_NAME',"
+    ];
+
+
+    public function customers(): BelongsTo
+    {
+        return $this->belongsTo(Customer::class, 'CUSTOMER_NO');
+    }
+
+
+}
\ No newline at end of file
diff --git a/Entities/Company.php b/Entities/Company.php
new file mode 100644
index 0000000..974b7eb
--- /dev/null
+++ b/Entities/Company.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Konfirmasibank\Entities;
+
+use Spatie\Activitylog\LogOptions;
+use Spatie\Activitylog\Traits\LogsActivity;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class Company extends Model
+{
+    use HasFactory;
+
+    protected $connection = 'db2';
+    protected $table = 'STG_DB.COMPANY';
+    protected $primaryKey = 'ID';
+
+    //public $incrementing = false;
+
+    protected $fillable = [
+    "'ID',
+    'DESCRIPTION'
+    'COMPANY_NAME',"
+    ];
+
+
+}
\ No newline at end of file
diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php
index 4c822c9..4a24890 100644
--- a/Http/Controllers/KonfirmasiBankController.php
+++ b/Http/Controllers/KonfirmasiBankController.php
@@ -11,6 +11,8 @@
     use Modules\Konfirmasibank\Entities\LimitReference;
     use Modules\Konfirmasibank\Entities\Fasilitas;
     use Modules\Konfirmasibank\Entities\Signer;
+    use Modules\Konfirmasibank\Entities\Category;
+    use Modules\Konfirmasibank\Entities\Company;
     use Dompdf\Dompdf;
     use Carbon\Carbon;
     use Illuminate\Support\Facades\View;
@@ -90,8 +92,6 @@
                 abort(403, 'Sorry !! You are Unauthorized to view any master data !');
              }
 
-             dd($request);
-
             $account = explode("," , $request['acc_no']);
 
             $ViewAccount = new ViewAccount;
@@ -158,17 +158,22 @@
 
             $DataProducts = [];
             $ListLimits = $ViewAccount->getLimit($request['cus_no'],$request['periode']);
+            $fasilitas =  Fasilitas::where('nomor_cif',$request['cus_no'] )->where('status',1)->get();
+            $signer = Signer::where('id',$fasilitas[0]['signer_id'])->get();
 
             $data['DataAccounts'] = $DataAccounts;
             $data['DataPinjaman'] = $pinjaman;
             $data['DataLimit'] = $ListLimits;
+            $data['DataFasilitas'] = $fasilitas;
+           // dd($data['DataLimit']);
+            $data['DataSigner'] = $signer;
+
 
             $currentDate = Carbon::now();
-           // $formattedDate = $currentDate->format('Y-m-d');
-
             $html = View::make('konfirmasibank::exportPdf', ['data' => $data])->render();
 
             $pdf = new Dompdf();
+
             $pdf->loadHtml($html);
 
              // Mengatur jenis kertas
@@ -262,11 +267,17 @@
             $data = [];
 
             $fasilitas = Fasilitas::paginate(10)->appends($request->query()['cus_no_fasilitas'],$request->query()['company_name'],$request->query()['batch_date'], $request->query()['status']);
-             // dd($fasilitas);
+            $signer = Signer::all();
+            $Category = Category::all();
+            $Company = Company::all();
+            // dd($fasilitas);
             $limitReference =  LimitReference::all();
             $data['queryParam'] = $request->query();
             $data['fasilitas'] = $fasilitas;
             $data['limitReference'] = $limitReference;
+            $data['signer'] = $signer;
+            $data['Category'] = $Category;
+            $data['Company'] = $Company;
 
             return view('konfirmasibank::pages.index_fasilitas',compact('data'));
 
@@ -321,10 +332,13 @@
                 abort(403, 'Sorry !! You are Unauthorized to create any konfirmasibank.create !');
             }
 
-
             $validated = $request->validate([
                 'nomor_rekening' => 'required|string|max:10|unique:fasilitas,nomor_rekening',
                 'jenis_fasilitas' => 'required|string',
+                'signer_id' => 'required|string',
+                'cabang' => 'required|string',
+                'mata_uang' => 'required|string',
+                'jenis_rekening' => 'required|string',
                 'saldo' => 'required|string',
                 'start_date' => 'required|string',
                 'due_date' => 'required|string',
@@ -332,13 +346,19 @@
                 'fixed_rate' => 'required|string'
             ]);
 
+
+
             if ($validated) {
                 try {
                 // Create New User
                 $fasilitas = new Fasilitas();
                 $fasilitas->nomor_cif = $request->nomor_cif;
                 $fasilitas->nomor_rekening = $request->nomor_rekening;
+                $fasilitas->cabang = $request->cabang;
                 $fasilitas->jenis_fasilitas = $request->jenis_fasilitas;
+                $fasilitas->jenis_rekening = $request->jenis_rekening;
+                $fasilitas->signer_id = $request->signer_id;
+                $fasilitas->mata_uang = $request->mata_uang;
                 $fasilitas->saldo = $request->saldo;
                 $fasilitas->start_date = $request->start_date;
                 $fasilitas->due_date = $request->due_date;
@@ -347,8 +367,8 @@
                 $fasilitas->keterangan = $request->keterangan;
 
                 $fasilitas->save();
-               // return redirect()->route('konfirmasibank.addFasilitas')->with('success', 'Data berhasil ditambahkan');
-               echo json_encode(['status' => 'success', 'message' => ' Data berhasil ditambahkan.']);
+
+               echo json_encode(['status' => 'success', 'message' => 'Add fasilitas successfully.']);
 
             } catch (Exception $e) {
                 return json_encode([
@@ -402,15 +422,21 @@
 
             // Validation Data\
              $validator = Validator::make($request->all(), [
-                'jenis_fasilitas' => 'required|string',
-                'saldo' => 'required|string',
-                'start_date' => 'required|string',
-                'due_date' => 'required|string',
-                'jangka_waktu' => 'required|string',
-                'fixed_rate' => 'required|string'
+                'nomor_rekening_edit' => 'required|string',
+                'cabang_edit' => 'required|string',
+                'jenis_fasilitas_edit' => 'required|string',
+                'jenis_rekening_edit' => 'required|string',
+                'signer_id_edit' => 'required|string',
+                'mata_uang_edit' => 'required|string',
+                'saldo_edit' => 'required|string',
+                'start_date_edit' => 'required|string',
+                'due_date_edit' => 'required|string',
+                'jangka_waktu_edit' => 'required|string',
+                'fixed_rate_edit' => 'required|string'
                 // Other validation rules
             ]);
 
+
             if ($validator->fails()) {
                 return response()->json(['errors' => $validator->errors()], 422); // Return validation errors as JSON
             }
@@ -419,14 +445,18 @@
             if ($validator) {
                 try {
                     $fasilitas = Fasilitas::findOrFail($request->id);
-                    $fasilitas->nomor_rekening = $request->nomor_rekening;
-                    $fasilitas->jenis_fasilitas = $request->jenis_fasilitas;
-                    $fasilitas->saldo = $request->saldo;
-                    $fasilitas->start_date = $request->start_date;
-                    $fasilitas->due_date = $request->due_date;
-                    $fasilitas->jangka_waktu = $request->jangka_waktu;
-                    $fasilitas->fixed_rate = $request->fixed_rate;
-                    $fasilitas->keterangan =  $request->keterangan;
+                    $fasilitas->nomor_rekening = $request->nomor_rekening_edit;
+                    $fasilitas->cabang = $request->cabang_edit;
+                    $fasilitas->jenis_fasilitas = $request->jenis_fasilitas_edit;
+                    $fasilitas->jenis_rekening = $request->jenis_rekening_edit;
+                    $fasilitas->signer_id = $request->signer_id_edit;
+                    $fasilitas->mata_uang = $request->mata_uang_edit;
+                    $fasilitas->saldo = $request->saldo_edit;
+                    $fasilitas->start_date = $request->start_date_edit;
+                    $fasilitas->due_date = $request->due_date_edit;
+                    $fasilitas->jangka_waktu = $request->jangka_waktu_edit;
+                    $fasilitas->fixed_rate = $request->fixed_rate_edit;
+                    $fasilitas->keterangan =  $request->keterangan_edit;
                     $fasilitas->updated_at = $today;
                     $fasilitas->save();
 
@@ -486,4 +516,4 @@
         }
 
 
-    }
\ No newline at end of file
+    }
diff --git a/Resources/views/exportPdf.blade.php b/Resources/views/exportPdf.blade.php
index d521efe..2695b41 100644
--- a/Resources/views/exportPdf.blade.php
+++ b/Resources/views/exportPdf.blade.php
@@ -51,39 +51,22 @@
     {{-- <h1>Contoh Kertas Surat Legal</h1> --}}
   </div>
   <div class="content">
-    <p>Kepada Yth</p>
+
+        <p>Nomor &nbsp; : 577/SUBDIT.OPS/VIII/2023</p>
+        <p>Tanggal :  {{ date('Y/m/d') }}</p><br>
+
+        <p>Kepada Yth</p>
         <P>{{$data['DataPinjaman'][0]['SHORT_NAME']}}</P>
         <p>{{$data['DataPinjaman'][0]['STREET']}}, {{$data['DataPinjaman'][0]['ADDRESS']}}</p>
 
-        <p>Sesuai dengan surat saudara Nomor <span>150/KB-SENTRA1/II/2023</span>   tanggal {{ date('Y/m/d') }}   dengan ini kami smpaikan data – data nasbah sesuai permintaan saudara sebagai berikut : </p>
+        <p>Sesuai dengan surat saudara Nomor <span>150/KB-SENTRA1/II/2023</span>   tanggal {{ date('Y/m/d') }}   dengan ini kami smpaikan data – data nasabah sesuai permintaan saudara sebagai berikut : </p>
 
-        <table class="custom-table">
-            <tr class="tr-custom">
-                <td  style="text-align: left">
-                    <p>Nama Nasabah</p>
-                </td>
-                <td >
-                    :
-                </td>
-                <td  style="text-align: left">
-                    <P>{{$data['DataPinjaman'][0]['SHORT_NAME']}}</P>
-                </td>
-            </tr class="tr-custom">
-             <tr >
-                <td   style="text-align: left">
-                    <p>Nomor CIF</p>
-                </td>
-                <td >
-                    :
-                </td>
-                <td  style="text-align: left">
-                    <P> {{$data['DataAccounts'][0]['CUSTOMER_NO']}}</P>
-                </td>
-            </tr>
-        </table><br>
+
+        <p>Nama Nasabah : {{$data['DataPinjaman'][0]['SHORT_NAME']}}</p>
+        <p>Nomor CIF &nbsp;&nbsp; : {{$data['DataAccounts'][0]['CUSTOMER_NO']}}</p><br>
 
         <p style="font-size: 12px;"> SIMPAMAN NASABAH YANG BERSANGKUTAN PADA BANK</p>
-        <p style="font-size: 12px;">POSISI ....</p>
+        <p style="font-size: 12px;">POSISI {{ date('Y/m/d') }}</p>
         <table class="space1" style="width:100%;">
             <thead style="background-color: dimgrey">
                 <tr class="space1" >
@@ -124,7 +107,7 @@
         </table><br>
 
         <p style="font-size: 12px;">PINJAMAN YANG DI BERIKAN OLEH BANK KEPADA NASABAH</p>
-        <p style="font-size: 12px;">POSISI ....</p>
+        <p style="font-size: 12px;">POSISI {{ date('Y/m/d') }}</p>
         <table class="space1" style="width:100%;">
             <thead style="background-color: dimgrey">
                 <tr class="space1" >
@@ -164,7 +147,7 @@
         </table><br>
 
         <p style="font-size: 12px;">FASILITAS LAIN YANG DI TERIMA OLEH NASABAH</p>
-        <p style="font-size: 12px;">POSISI ....</p>
+        <p style="font-size: 12px;">POSISI {{ date('Y/m/d') }}</p>
         <table class="space1" style="width:100%;">
             <thead style="background-color: dimgrey">
                 <tr class="space1" >
@@ -195,8 +178,25 @@
                             <td class="space1">{{ $limit->EXPIRY_DATE}}</td>
                         </tr>
                     @endforeach
-                @else
+                @endif
+
+                @if(count($data['DataFasilitas'])>0)
+                    @php $i=1 @endphp
+                    @foreach ($data['DataFasilitas'] as $fasilitas)
                         <tr class="space1">
+                            <td class="text-center space1">{{ $i++ }}</td>
+                            <td class="space1">{{ $fasilitas->jenis_fasilitas }}</td>
+                            <td class="space1">{{ $fasilitas->cabang }}</td>
+                            <td class="space1">{{ $fasilitas->jenis_rekening }}</td>
+                            <td class="space1 texet-center">{{ $fasilitas->mata_uang }}</td>
+                            <td class="space1">{{ $fasilitas->saldo }}</td>
+                            <td class="space1">{{ $fasilitas->jangka_waktu }}</td>
+                            <td class="space1">{{ $fasilitas->fixed_rate }}</td>
+                            <td class="space1">{{ $fasilitas->due_date}}</td>
+                        </tr>
+                    @endforeach
+                @else
+                         <tr class="space1">
                             <td class="space1" colspan="9" style="text-align: center;">Tidak Ada Fasilitas</td>
                         </tr>
                 @endif
@@ -205,15 +205,15 @@
         </table><br><br>
 
         <div style="width:300px">
-            <table style="width:100%;" class="space1">
+            <table style="width:100%;border: none;" class="space1">
                 <tr class="space1" style="height:500px">
                     <td class="space1" style="width:20%;font-size:12px;" >
-                        <p style="margin-top:100px; text-align: center;">Nama Pejabat 1</p>
-                        <p style="text-align: center;">Jabatan</p>
+                        <p style="margin-top:100px; text-align: center;">{{$data['DataSigner'][0]['deputy_director_name']}}</p>
+                        <p style="text-align: center;">Deputy Director</p>
                     </td>
                     <td class="space1" style="width:20%;font-size:12px;" >
-                        <p style="margin-top:100px; text-align: center;">Nama Pejabat 2</p>
-                        <p style="text-align: center;">Jabatan</p>
+                        <p style="margin-top:100px; text-align: center;">{{$data['DataSigner'][0]['executive_officer_name']}}</p>
+                        <p style="text-align: center;">Executive Officer</p>
                     </td>
                 </tr>
             </table>
diff --git a/Resources/views/pages/exportPdf.blade.php b/Resources/views/pages/exportPdf.blade.php
index 92b1c22..d1f5426 100644
--- a/Resources/views/pages/exportPdf.blade.php
+++ b/Resources/views/pages/exportPdf.blade.php
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>Membuat Laporan PDF Dengan DOMPDF Laravel</title>
+    <title>Konfirmasi Bank</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
@@ -23,20 +23,32 @@
             text-align: center;
         }
 
+         .container{
+            padding-top:120px
+        }
+
     </style>
 
     <div class="container">
 
-
-
         <p>Kepada Yth</p>
-        <p>Bp. ...</p>
-        <p>Sepatan, Kab. Tanggerang</p>
+        <P>{{$data['DataPinjaman'][0]['SHORT_NAME']}}</P>
+        <p>{{$data['DataPinjaman'][0]['STREET']}}, {{$data['DataPinjaman'][0]['ADDRESS']}}</p>
 
-        <p>Sesuai dengan surat saudara Nomor …. tanggal … dengan ini kami smpaikan data – data nasbah sesuai permintaan saudara sebagai berikut : </p>
+       <p>Sesuai dengan surat saudara Nomor <span>150/KB-SENTRA1/II/2023</span>   tanggal {{ date('Y/m/d') }}   dengan ini kami smpaikan data – data nasabah sesuai permintaan saudara sebagai berikut : </p><br>
 
-        <p>Nama Nasabah   : {{$data[0]->NAME_1}}</p>
-        <p>Nomor Rekening : {{$data[0]->CUSTOMER_NO}}</p><br>
+       <p>Nama Nasabah : {{$data['DataPinjaman'][0]['SHORT_NAME']}}</p>
+       <p>Nomor CIF : {{$data['DataAccounts'][0]['CUSTOMER_NO']}}</p>
+        {{-- <tr style="hight:20px">
+            <td>Nama Nasabah</td>
+            <td>:</td>
+            <td>{{$data['DataPinjaman'][0]['SHORT_NAME']}}</td>
+        </tr>
+         <tr style="hight:20px">
+            <td>Nomor CIF</td>
+            <td>:</td>
+            <td>{{$data['DataAccounts'][0]['CUSTOMER_NO']}}</td>
+        </tr> --}}
 
         <p style="font-size: 12px;"> SIMPAMAN NASABAH YANG BERSANGKUTAN PADA BANK</p>
         <p style="font-size: 12px;">POSISI ....</p>
@@ -55,20 +67,7 @@
                 </tr>
             </thead>
             <tbody>
-                @php $i=1 @endphp
-                @foreach ($data as $val)
-                    <tr class="space1">
-                        <td class="text-center space1">{{ $i++ }}</td>
-                        <td class="space1">{{ $val->ACCOUNT_NUMBER }}</td>
-                        <td class="space1">{{ $val->COMPANY_NAME }}</td>
-                        <td class="space1">{{ $val->SHORT_NAME }}</td>
-                        <td class="space1 texet-center">{{ $val->CURRENCY }}</td>
-                        <td class="space1"></td>
-                        <td class="space1"></td>
-                        <td class="space1"></td>
-                        <td class="space1"></td>
-                    </tr>
-                @endforeach
+
             </tbody>
         </table><br>
 
diff --git a/Resources/views/pages/index_fasilitas.blade.php b/Resources/views/pages/index_fasilitas.blade.php
index f27fbaa..a9226f9 100644
--- a/Resources/views/pages/index_fasilitas.blade.php
+++ b/Resources/views/pages/index_fasilitas.blade.php
@@ -53,10 +53,21 @@
                      <div class="form-group row">
                         <label for="inputName" class="col-sm-3 col-form-label">No Rekening</label>
                         <div class="col-sm-9">
-                           <input type="hidden" class="form-control form-control-sm " name="nomor_cif" value="{{$data['fasilitas'][0]['nomor_cif']}}">
+                           <input type="hidden" class="form-control form-control-sm " name="nomor_cif" value="{{$data['queryParam']['cus_no_fasilitas']}}">
                            <input type="text" class="form-control form-control-sm " name="nomor_rekening" placeholder="Nomor Rekening">
                         </div>
                      </div>
+                     <div class="form-group row">
+                        <label for="inputName" class="col-sm-3 col-form-label">Cabang</label>
+                        <div class="col-sm-9">
+                           <select class="form-select form-select-sm" aria-label="Small select example" name="cabang">
+                              <option selected>Pilih Cabang</option>
+                              @foreach ($data['Company'] as $item)
+                              <option value="{{$item->COMPANY_NAME}}">{{$item->COMPANY_NAME}}</option>
+                              @endforeach
+                           </select>
+                        </div>
+                     </div>
                      <div class="form-group row">
                         <label for="inputName" class="col-sm-3 col-form-label">Jenis Fasilitas</label>
                         <div class="col-sm-9">
@@ -67,6 +78,44 @@
                               @endforeach
                            </select>
                         </div>
+                     </div>
+                      <div class="form-group row">
+                        <label for="inputName" class="col-sm-3 col-form-label">Jenis Rekening</label>
+                        <div class="col-sm-9">
+                           {{-- <input type="text" class="form-control form-control-sm "  id="jnsFasilitas"  name="jenis_fasilitas" placeholder="Jenis Fasilitas"> --}}
+                           <select class="form-select form-select-sm" aria-label="Small select example"
+                              id="jnsRekening-select" name="jenis_rekening">
+                              <option selected>Pilih Jenis Rekening</option>
+                              @foreach ($data['Category'] as $item)
+                                <option value="{{$item->SHORT_NAME}}">{{$item->SHORT_NAME}}</option>
+                              @endforeach
+                           </select>
+                        </div>
+                     </div>
+                     <div class="form-group row">
+                        <label for="inputName" class="col-sm-3 col-form-label">Signer</label>
+                        <div class="col-sm-9">
+                           {{-- <input type="text" class="form-control form-control-sm "  id="jnsFasilitas"  name="jenis_fasilitas" placeholder="Jenis Fasilitas"> --}}
+                           <select class="form-select form-select-sm" aria-label="Small select example" name="signer_id">
+                              <option selected>Pilih Penandatangan</option>
+                              @foreach ($data['signer'] as $item)
+                                 <option value="{{$item->id}}">{{$item->signer_type}}</option>
+                              @endforeach
+                           </select>
+                        </div>
+                     </div>
+                     <div class="form-group row">
+                        <label for="inputName" class="col-sm-3 col-form-label">Mata Uang</label>
+                        <div class="col-sm-9">
+                           {{-- <input type="text" class="form-control form-control-sm "  id="jnsFasilitas"  name="jenis_fasilitas" placeholder="Jenis Fasilitas"> --}}
+                           <select class="form-select form-select-sm" aria-label="Small select example"
+                              id="signerTypeEdit-select" name="mata_uang">
+                              <option selected>Pilih Mata Uang</option>
+                              <option value="IDR">IDR</option>
+                              <option value="USD">USD</option>
+                              <option value="EUR">EUR</option>
+                           </select>
+                        </div>
                      </div>
                      <div class="form-group row">
                         <label for="inputName" class="col-sm-3 col-form-label">Saldo</label>
@@ -129,7 +178,7 @@
             <div class="modal-content">
                <!-- Modal header -->
                <div class="modal-header">
-                  <h5 class="modal-title" id="myModalLabel">Tambah Fasilitas</h5>
+                  <h5 class="modal-title" id="myModalLabel">Edit Fasilitas</h5>
                   <button type="button" class="closeButton" data-dismiss="modal" aria-label="Close">
                      <span aria-hidden="true">&times;</span>
                   </button>
@@ -145,16 +194,29 @@
                         <label for="inputName" class="col-sm-3 col-form-label">No Rekening</label>
                         <div class="col-sm-9">
                            <input type="hidden" class="form-control form-control-sm "  id="id" name="id">
-                           <input type="text" class="form-control form-control-sm " id="norek" name="nomor_rekening"
+                           <input type="text" class="form-control form-control-sm " id="norek" name="nomor_rekening_edit"
                               placeholder="Nomor Rekening">
                         </div>
+                     </div>
+                      <div class="form-group row">
+                        <label for="inputName" class="col-sm-3 col-form-label">Cabang</label>
+                        <div class="col-sm-9">
+                           {{-- <input type="text" class="form-control form-control-sm "  id="jnsFasilitas"  name="jenis_fasilitas" placeholder="Jenis Fasilitas"> --}}
+                           <select class="form-select form-select-sm" aria-label="Small select example"
+                              id="cabangEdit-select" name="cabang_edit">
+                              <option selected>Pilih Cabang</option>
+                              @foreach ($data['Company'] as $item)
+                              <option value="{{$item->COMPANY_NAME}}">{{$item->COMPANY_NAME}}</option>
+                              @endforeach
+                           </select>
+                        </div>
                      </div>
                      <div class="form-group row">
                         <label for="inputName" class="col-sm-3 col-form-label">Jenis Fasilitas</label>
                         <div class="col-sm-9">
                            {{-- <input type="text" class="form-control form-control-sm "  id="jnsFasilitas"  name="jenis_fasilitas" placeholder="Jenis Fasilitas"> --}}
                            <select class="form-select form-select-sm" aria-label="Small select example"
-                              id="jnsFaasilitas-select" name="jenis_fasilitas">
+                              id="jnsFaasilitasEdit-select" name="jenis_fasilitas_edit">
                               <option selected>Pilih Jenis Fasilitas</option>
                               @foreach ($data['limitReference'] as $item)
                               <option value="{{$item->SHORT_NAME}}">{{$item->SHORT_NAME}}</option>
@@ -162,45 +224,84 @@
                            </select>
                         </div>
                      </div>
+                     <div class="form-group row">
+                        <label for="inputName" class="col-sm-3 col-form-label">Jenis Rekening</label>
+                        <div class="col-sm-9">
+                           {{-- <input type="text" class="form-control form-control-sm "  id="jnsFasilitas"  name="jenis_fasilitas" placeholder="Jenis Fasilitas"> --}}
+                           <select class="form-select form-select-sm" aria-label="Small select example"
+                              id="jnsRekeningEdit-select" name="jenis_rekening_edit">
+                              <option selected>Pilih Jenis Rekening</option>
+                              @foreach ($data['Category'] as $item)
+                              <option value="{{$item->SHORT_NAME}}">{{$item->SHORT_NAME}}</option>
+                              @endforeach
+                           </select>
+                        </div>
+                     </div>
+                      <div class="form-group row">
+                        <label for="inputName" class="col-sm-3 col-form-label">Signer</label>
+                        <div class="col-sm-9">
+                           {{-- <input type="text" class="form-control form-control-sm "  id="jnsFasilitas"  name="jenis_fasilitas" placeholder="Jenis Fasilitas"> --}}
+                           <select class="form-select form-select-sm" aria-label="Small select example"
+                              id="signerTypeEdit-select" name="signer_id_edit">
+                              <option selected>Pilih Penandatangan</option>
+                              @foreach ($data['signer'] as $item)
+                              <option value="{{$item->id}}">{{$item->signer_type}}</option>
+                              @endforeach
+                           </select>
+                        </div>
+                     </div>
+                     <div class="form-group row">
+                        <label for="inputName" class="col-sm-3 col-form-label">Mata Uang</label>
+                        <div class="col-sm-9">
+                           {{-- <input type="text" class="form-control form-control-sm "  id="jnsFasilitas"  name="jenis_fasilitas" placeholder="Jenis Fasilitas"> --}}
+                           <select class="form-select form-select-sm" aria-label="Small select example"
+                              id="mataUangEdit-select" name="mata_uang_edit">
+                              <option selected>Pilih Mata Uang</option>
+                              <option value="IDR">IDR</option>
+                              <option value="USD">USD</option>
+                              <option value="EUR">EUR</option>
+                           </select>
+                        </div>
+                     </div>
                      <div class="form-group row">
                         <label for="inputName" class="col-sm-3 col-form-label">Saldo</label>
                         <div class="col-sm-9">
-                           <input type="text" class="form-control form-control-sm " id="saldo" name="saldo"
+                           <input type="text" class="form-control form-control-sm " id="saldo" name="saldo_edit"
                               placeholder="Saldo">
                         </div>
                      </div>
                      <div class="form-group row">
                         <label for="inputName" class="col-sm-3 col-form-label">Start Date</label>
                         <div class="col-sm-9">
-                           <input type="date" class="form-control form-control-sm" id="startDate" name="start_date"
+                           <input type="date" class="form-control form-control-sm" id="startDate" name="start_date_edit"
                               placeholder="Start Date">
                         </div>
                      </div>
                      <div class="form-group row">
                         <label for="inputName" class="col-sm-3 col-form-label">Due Date</label>
                         <div class="col-sm-9">
-                           <input type="date" class="form-control form-control-sm " id="dueDatae" name="due_date"
+                           <input type="date" class="form-control form-control-sm " id="dueDatae" name="due_date_edit"
                               placeholder="Due Date">
                         </div>
                      </div>
                      <div class="form-group row">
                         <label for="inputName" class="col-sm-3 col-form-label">Jangka Waktu</label>
                         <div class="col-sm-9">
-                           <input type="text" class="form-control form-control-sm " id="jangkaWaktu" name="jangka_waktu"
+                           <input type="text" class="form-control form-control-sm " id="jangkaWaktu" name="jangka_waktu_edit"
                               placeholder="Jangka Waktu">
                         </div>
                      </div>
                      <div class="form-group row">
                         <label for="inputName" class="col-sm-3 col-form-label">Fixed Rate</label>
                         <div class="col-sm-9">
-                           <input type="text" class="form-control form-control-sm " id="fixedRate" name="fixed_rate"
+                           <input type="text" class="form-control form-control-sm " id="fixedRate" name="fixed_rate_edit"
                               placeholder="Fixed Rate">
                         </div>
                      </div>
                      <div class="form-group row">
                         <label for="inputName" class="col-sm-3 col-form-label">Keterangan</label>
                         <div class="col-sm-9">
-                           <textarea type="text" class="form-control form-control-sm " id="ket" name="keterangan"
+                           <textarea type="text" class="form-control form-control-sm " id="ket" name="keterangan_edit"
                               placeholder="Keterangan"></textarea>
                         </div>
                      </div>
@@ -244,14 +345,10 @@
                type: 'POST',
                url: "{{ route('konfirmasibank.postFasilitas') }}",
                data: formData,
-               dataType: 'json',
-               success: function(response) {
-                alert('tes');
-                  // Handle success response (e.g., show a success message)
+               success: function(data) {
                   $("#myModal").modal('hide');
                   var _data = JSON.parse(data);
                   toastr.success(_data.message);
-                  // Optionally, close the modal
                   location.reload();
 
                },
@@ -282,15 +379,23 @@
                dataType: 'json',
                success: function(response) {
                   console.log(response);
-                  $('#jnsFaasilitas-select option[value="' + response.jenis_fasilitas + '"]').prop(
+                  $('#jnsFaasilitasEdit-select option[value="' + response.jenis_fasilitas + '"]').prop(
                      'selected', true);
-                  $('input[name="nomor_rekening"]').val(response.nomor_rekening);
-                  $('input[name="jenis_fasilitas"]').val(response.jenis_fasilitas);
-                  $('input[name="saldo"]').val(response.saldo);
-                  $('input[name="start_date"]').val(response.start_date);
-                  $('input[name="due_date"]').val(response.due_date);
-                  $('input[name="jangka_waktu"]').val(response.jangka_waktu);
-                  $('input[name="fixed_rate"]').val(response.fixed_rate);
+                  $('#signerTypeEdit-select option[value="' + response.signer_id + '"]').prop(
+                     'selected', true);
+                  $('#jnsRekeningEdit-select option[value="' + response.jenis_rekening + '"]').prop(
+                     'selected', true);
+                  $('#mataUangEdit-select option[value="' + response.mata_uang + '"]').prop(
+                     'selected', true);
+                  $('#cabangEdit-select option[value="' + response.cabang + '"]').prop(
+                     'selected', true);
+                  $('input[name="nomor_rekening_edit"]').val(response.nomor_rekening);
+                  $('input[name="jenis_fasilitas_edit"]').val(response.jenis_fasilitas);
+                  $('input[name="saldo_edit"]').val(response.saldo);
+                  $('input[name="start_date_edit"]').val(response.start_date);
+                  $('input[name="due_date_edit"]').val(response.due_date);
+                  $('input[name="jangka_waktu_edit"]').val(response.jangka_waktu);
+                  $('input[name="fixed_rate_edit"]').val(response.fixed_rate);
 
                   $('#ket').val(response.keterangan);
                   $('#id').val(response.id);
diff --git a/Resources/views/pages/table_fasilitas.blade.php b/Resources/views/pages/table_fasilitas.blade.php
index 3b0bab8..933a61c 100644
--- a/Resources/views/pages/table_fasilitas.blade.php
+++ b/Resources/views/pages/table_fasilitas.blade.php
@@ -3,12 +3,13 @@
       <tr>
          <th class="text-center">No</th>
          <th class="text-center">No Rekening</th>
+         <th class="text-center">Jenis Fasilitas</th>
+         <th class="text-center">Cabang</th>
          <th class="text-center">Jenis Rekening</th>
          <th class="text-center">Saldo</th>
          <th class="text-center">Start Date</th>
          <th class="text-center">Due Date</th>
          <th class="text-center">Fixed Rate</th>
-         <th class="text-center">Keterangan</th>
          <th class="text-center" width="100px">Aksi</th>
       </tr>
    </thead>
@@ -22,11 +23,12 @@
             <td class="text-center">{{($no++ )}}</td>
             <td class="text-center">{{$item['nomor_rekening']}}</td>
             <td class="text-center">{{$item['jenis_fasilitas']}}</td>
+            <td class="text-center">{{$item['cabang']}}</td>
+            <td class="text-center">{{$item['jenis_rekening']}}</td>
             <td class="text-center">{{$item['saldo']}}</td>
             <td class="text-center">{{$item['start_date']}}</td>
             <td class="text-center">{{$item['due_date']}}</td>
             <td class="text-center">{{$item['fixed_rate']}}</td>
-            <td class="text-center">{{$item['keterangan']}}</td>
             <td class="text-center">
                 <a href="#" class="kt_edit_form btn btn-icon btn-bg-light  btn-active-light-warning btn-sm me-1 btnEdit" data-id="{{$item['id']}}">{!!getIcon("pencil", "fs-1 text-warning","duotune") !!}</a>
                 <a href="#" class="kt_edit_form btn btn-icon btn-bg-light  btn-active-light-danger btn-sm me-1 btnDelete"data-id="{{$item['id']}}">{!! getIcon("trash", "fs-1 text-danger","duotune") !!}</a>
@@ -48,7 +50,7 @@
       </tr>
    </tbody>
 </table>
-{{ $data['fasilitas']->appends(['cus_no_fasilitas' =>''.$data['fasilitas'][0]['nomor_rekening'].'','company_name' =>''.$data['queryParam']['company_name'].'' ,'batch_date' =>''.$data['queryParam']['batch_date'].'','status'=>1])->links('pagination::bootstrap-5') }}
+{{ $data['fasilitas']->appends(['cus_no_fasilitas' =>''.$data['queryParam']['cus_no_fasilitas'] .'','company_name' =>''.$data['queryParam']['company_name'].'' ,'batch_date' =>''.$data['queryParam']['batch_date'].'','status'=>1])->links('pagination::bootstrap-5') }}
 {{-- {!! $data['fasilitas']->links('pagination::bootstrap-5') !!} --}}
  {{-- {!! $data['fasilitas']->links() !!} --}}