diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php
index a25adba..bf0956d 100644
--- a/Http/Controllers/KonfirmasiBankController.php
+++ b/Http/Controllers/KonfirmasiBankController.php
@@ -107,44 +107,43 @@ class KonfirmasiBankController extends Controller
 
         $Loans =Loan::where('sk_nasabah',$request->cif)
                     ->whereDate('periode',$startDateLoan )
-                    ->where('outstanding', '<>', 0)
+                    //->where('kode_status_lunas', '<>', 'EXPIRED')
                     ->where('nama_cabang','like', '%'.$request->kodecabang.'%')
                     ->get();
 
         if ($Loans->isEmpty()) {
                 $Loans =Loan::where('sk_nasabah',$request->cif)
                         ->whereDate('periode',$startDateLoan->subDays(1)->format('m/d/Y') )
-                        ->whereNotNull('kode_status_lunas')
-                        ->where('outstanding', '<>', 0)
+                      //  ->where('kode_status_lunas', '<>', 'EXPIRED')
                         ->where('nama_cabang','like', '%'.$request->kodecabang.'%')
                         ->get();
 
                 if ($Loans->isEmpty()) {
                     $Loans =Loan::where('sk_nasabah',$request->cif)
                         ->whereDate('periode',$startDateLoan->subDays(2)->format('m/d/Y') )
-                        ->whereNotNull('kode_status_lunas')
-                        ->where('outstanding', '<>', 0)
+                      // ->where('kode_status_lunas', '<>', 'EXPIRED')
+                        //->where('outstanding', '<>', 0)
                         ->where('nama_cabang','like', '%'.$request->kodecabang.'%')
                         ->get();
                     if ($Loans->isEmpty()) {
                          $Loans =Loan::where('sk_nasabah',$request->cif)
                         ->whereDate('periode',$startDateLoan->subDays(3)->format('m/d/Y') )
-                        ->whereNotNull('kode_status_lunas')
-                        ->where('outstanding', '<>', 0)
+                      // ->where('kode_status_lunas', '<>', 'EXPIRED')
+                        //->where('outstanding', '<>', 0)
                         ->where('nama_cabang','like', '%'.$request->kodecabang.'%')
                         ->get();
                         if ($Loans->isEmpty()) {
                             $Loans =Loan::where('sk_nasabah',$request->cif)
                             ->whereDate('periode',$startDateLoan->subDays(4)->format('m/d/Y') )
-                            ->whereNotNull('kode_status_lunas')
-                            ->where('outstanding', '<>', 0)
+                          // ->where('kode_status_lunas','CURRENT')
+                            //->where('outstanding', '<>', 0)
                             ->where('nama_cabang','like', '%'.$request->kodecabang.'%')
                             ->get();
                             if ($Loans->isEmpty()) {
                                $Loans =Loan::where('sk_nasabah',$request->cif)
                                 ->whereDate('periode',$startDateLoan->subDays(5)->format('m/d/Y') )
-                                ->whereNotNull('kode_status_lunas')
-                                ->where('outstanding', '<>', 0)
+                              //  ->where('kode_status_lunas','CURRENT')
+                                //->where('outstanding', '<>', 0)
                                 ->where('nama_cabang','like', '%'.$request->kodecabang.'%')
                                 ->get();
                             }
@@ -213,11 +212,14 @@ class KonfirmasiBankController extends Controller
 
 
          foreach ($Loans as $key2 => $loan) {
-            $dataLoan[$key2]['ACCOUNT_NUMBER'] = $loan->no_rek;
-            $dataLoan[$key2]['COMPANY_NAME'] = $loan->nama_cabang;
-            $dataLoan[$key2]['SHORT_NAME'] = $loan->product_loan;
-            $dataLoan[$key2]['CURRENCY'] = $loan->kode_mata_uang;
-            $dataLoan[$key2]['WORKING_BALANCE'] = number_format(abs($loan->outstanding), 2, ',', '.') ;
+            if ($loan->kode_status_lunas != 'EXPIRED') {
+                $dataLoan[$key2]['ACCOUNT_NUMBER'] = $loan->no_rek;
+                $dataLoan[$key2]['COMPANY_NAME'] = $loan->nama_cabang;
+                $dataLoan[$key2]['SHORT_NAME'] = $loan->product_loan;
+                $dataLoan[$key2]['CURRENCY'] = $loan->kode_mata_uang;
+                $dataLoan[$key2]['WORKING_BALANCE'] = number_format(abs($loan->outstanding), 2, ',', '.') ;
+            }
+
 
         }
 
@@ -471,47 +473,45 @@ class KonfirmasiBankController extends Controller
 
         $Loans =Loan::whereIn('no_rek',$arrAccount)
                     ->whereDate('periode',$startDateLoan )
-                    ->where('outstanding', '<>', 0)
+                   //->where('kode_status_lunas', '<>', 'EXPIRED')
                     ->where('nama_cabang','like', '%'.$cabang.'%')
                     ->get();
 
 
 
+
         if ($Loans->isEmpty()) {
                 $Loans =Loan::whereIn('no_rek',$arrAccount)
                         ->whereDate('periode',$startDateLoan->subDays(1)->format('m/d/Y') )
-                        ->whereNotNull('kode_status_lunas')
-                        ->where('outstanding', '<>', 0)
+                       //->where('kode_status_lunas', '<>', 'EXPIRED')
                         ->where('nama_cabang','like', '%'.$cabang.'%')
                         ->get();
 
 
+
+
                 if ($Loans->isEmpty()) {
                     $Loans =Loan::whereIn('no_rek',$arrAccount)
                         ->whereDate('periode',$startDateLoan->subDays(2)->format('m/d/Y') )
-                        ->whereNotNull('kode_status_lunas')
-                        ->where('outstanding', '<>', 0)
+                       //->where('kode_status_lunas', '<>', 'EXPIRED')
                         ->where('nama_cabang','like', '%'.$cabang.'%')
                         ->get();
                     if ($Loans->isEmpty()) {
                          $Loans =Loan::whereIn('no_rek',$arrAccount)
                         ->whereDate('periode',$startDateLoan->subDays(3)->format('m/d/Y') )
-                        ->whereNotNull('kode_status_lunas')
-                        ->where('outstanding', '<>', 0)
+                       //->where('kode_status_lunas', '<>', 'EXPIRED')
                         ->where('nama_cabang','like', '%'.$cabang.'%')
                         ->get();
                         if ($Loans->isEmpty()) {
                             $Loans =Loan::whereIn('no_rek',$arrAccount)
                             ->whereDate('periode',$startDateLoan->subDays(4)->format('m/d/Y') )
-                            ->whereNotNull('kode_status_lunas')
-                            ->where('outstanding', '<>', 0)
+                           //->where('kode_status_lunas', '<>', 'EXPIRED')
                             ->where('nama_cabang','like', '%'.$cabang.'%')
                             ->get();
                             if ($Loans->isEmpty()) {
                                $Loans =Loan::whereIn('no_rek',$arrAccount)
                                 ->whereDate('periode',$startDateLoan->subDays(5)->format('m/d/Y') )
-                                ->whereNotNull('kode_status_lunas')
-                                ->where('outstanding', '<>', 0)
+                               //->where('kode_status_lunas', '<>', 'EXPIRED')
                                 ->where('nama_cabang','like', '%'.$cabang.'%')
                                 ->get();
                             }
@@ -620,6 +620,7 @@ class KonfirmasiBankController extends Controller
 
             $DataLoan = [];
             foreach ($Loans as $keyLon => $lon) {
+                 if ($lon->kode_status_lunas != 'EXPIRED') {
                     $DataLoan[$keyLon]['ACCOUNT_NUMBER'] = $lon->no_rek;
                     $DataLoan[$keyLon]['BATCH_DATE'] = $lon->periode;
                     $DataLoan[$keyLon]['SHORT_NAME'] = $lon->product_loan;
@@ -629,6 +630,7 @@ class KonfirmasiBankController extends Controller
                     $DataLoan[$keyLon]['ARRANGEMENT_ID'] = '';
                     $DataLoan[$keyLon]['FIXED_RATE'] =  number_format($lon->interest_rate, 2, ',', '.') ?? '';
                     $DataLoan[$keyLon]['TERM'] = intval($lon->tenor) ;
+                 }
             }