diff --git a/Entities/ViewAccount.php b/Entities/ViewAccount.php index 4dfe4b0..65218a5 100644 --- a/Entities/ViewAccount.php +++ b/Entities/ViewAccount.php @@ -38,25 +38,27 @@ class ViewAccount extends Model public function getSearchAccount($cif , $kodecabang, $periode){ // $store = DB::connection('oracle'); - $currentDate = Carbon::now(); - $formattedDate = $currentDate->format('Y'); + $today = Carbon::now(); + $currentYear = $today->format("Y"); + $pastYear = $today->subYear(3)->format('Y'); $data = []; if ($cif != null && $kodecabang == null && $periode == null) { - $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS") - ->where('CUSTOMER_NO',$cif) - ->where('BATCH_DATE','LIKE','%'.$formattedDate.'%'); + $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS") + ->where('CUSTOMER_NO',$cif) + ->where('BATCH_DATE','LIKE','%'.$pastYear.'%'); } elseif ($cif != null && $kodecabang != null && $periode == null) { - $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS") - ->where('CUSTOMER_NO',$cif) - ->where('COMPANY_NAME', 'like', "%" .$kodecabang."%") - ->where('BATCH_DATE','LIKE','%'.$formattedDate.'%'); + dd('tess2'); + $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS") + ->where('CUSTOMER_NO',$cif) + ->where('COMPANY_NAME', 'like', "%" .$kodecabang."%") + ->where('BATCH_DATE','LIKE','%'.$pastYear.'%'); }else { - $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS") - ->where('CUSTOMER_NO',$cif) - ->where('COMPANY_NAME', 'like', "%" .$kodecabang."%") - ->where('BATCH_DATE','LIKE','%'.$periode.'%'); + $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS") + ->where('CUSTOMER_NO',$cif) + ->where('COMPANY_NAME', 'like', "%" .$kodecabang."%") + ->where('BATCH_DATE','LIKE','%'.$periode.'%'); } return $data; diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index 1099b3f..5d9e6ed 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -41,12 +41,22 @@ public function index(Request $request) { - // $keyword = $request->input('search'); + $data = []; + // Tanggal awal + // Contoh tanggal saat ini + $today = Carbon::now(); - //$data = ViewAccount::take(10)->get(); - //dd($data); + // Menambahkan 1 tahun ke tanggal saat ini + $currentYear = $today->format("Y"); - return view('konfirmasibank::pages.index'); + // Menambahkan 5 tahun ke tanggal saat ini + $futureYear = $today->subYear(3)->format('Y'); + + $data['currentYear'] = $currentYear; + $data['pastYear'] = $futureYear; + // dd($data); + + return view('konfirmasibank::pages.index',compact('data')); } public function getData(Request $request) @@ -62,6 +72,7 @@ $data[$key]['WORKING_BALANCE'] = $account->WORKING_BALANCE; $data[$key]['PRODUCT'] = $account->PRODUCT; $data[$key]['CURRENCY'] = $account->CURRENCY; + $data[$key]['MATURITY_DATE'] = $account->MATURITY_DATE; } return json_encode($data); } @@ -101,10 +112,6 @@ } } - - - - } diff --git a/Resources/views/pages/index.blade.php b/Resources/views/pages/index.blade.php index 448dab1..4642693 100644 --- a/Resources/views/pages/index.blade.php +++ b/Resources/views/pages/index.blade.php @@ -3,6 +3,10 @@ $route = explode('.', Route::currentRouteName()); @endphp + + + +