diff --git a/Database/Migrations/2023_09_11_070252_update_set_nullable_field.php b/Database/Migrations/2023_09_11_070252_update_set_nullable_field.php new file mode 100644 index 0000000..7b12ad5 --- /dev/null +++ b/Database/Migrations/2023_09_11_070252_update_set_nullable_field.php @@ -0,0 +1,35 @@ +string('cabang')->nullable()->change(); + $table->string('periode')->nullable()->change(); + $table->string('jenis_rekening')->nullable()->change(); + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('fasilitas', function (Blueprint $table) { + + }); + } +}; \ No newline at end of file diff --git a/Entities/ViewAccount.php b/Entities/ViewAccount.php index dc2656e..81c8ac2 100644 --- a/Entities/ViewAccount.php +++ b/Entities/ViewAccount.php @@ -38,7 +38,8 @@ class ViewAccount extends Model 'ARRANGEMENT_ID'" ]; - public function getSearchAccount($cif , $kodecabang, $periode){ + public function getSearchAccount($cif , $kodecabang, $startDate, $endDate){ + // dd($cif , $kodecabang, $startDate, $endDate); // $store = DB::connection('oracle'); $today = Carbon::now(); $currentYear = $today->format("Y"); @@ -47,21 +48,27 @@ class ViewAccount extends Model $data = []; - if ($cif != null && $kodecabang == null && $periode == null) { + if ($cif != null && $kodecabang == null && $startDate == null) { $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS") + ->select( 'ACCOUNT_NUMBER','CUSTOMER_NO','CURRENCY',DB::raw('MAX(CATEGORY) AS CATEGORY'),'SHORT_TITLE',DB::raw('MAX(BATCH_DATE) AS BATCH_DATE'),'PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE')) ->where('CUSTOMER_NO',$cif) - ->where('BATCH_DATE','LIKE','%'.$pastYear.'%'); - } elseif ($cif != null && $kodecabang != null && $periode == null) { - dd('tess2'); + ->whereBetween('BATCH_DATE', [$startDate, $endDate]) + ->groupBy('ACCOUNT_NUMBER' , 'CUSTOMER_NO','CURRENCY','SHORT_TITLE','PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE'); + } elseif ($cif != null && $kodecabang != null && $startDate == null) { + $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS") + ->select( 'ACCOUNT_NUMBER','CUSTOMER_NO','CURRENCY',DB::raw('MAX(CATEGORY) AS CATEGORY'),'SHORT_TITLE',DB::raw('MAX(BATCH_DATE) AS BATCH_DATE'),'PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE')) ->where('CUSTOMER_NO',$cif) ->where('COMPANY_NAME', 'like', "%" .$uppercaseKodeCabang."%") - ->where('BATCH_DATE','LIKE','%'.$pastYear.'%'); + ->whereBetween('BATCH_DATE', [$startDate, $endDate]) + ->groupBy('ACCOUNT_NUMBER' , 'CUSTOMER_NO','CURRENCY','SHORT_TITLE','PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE'); }else { $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS") + ->select( 'ACCOUNT_NUMBER','CUSTOMER_NO','CURRENCY',DB::raw('MAX(CATEGORY) AS CATEGORY'),'SHORT_TITLE',DB::raw('MAX(BATCH_DATE) AS BATCH_DATE'),'PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE')) ->where('CUSTOMER_NO',$cif) ->where('COMPANY_NAME', 'like', "%" .$uppercaseKodeCabang."%") - ->where('BATCH_DATE','LIKE','%'.$periode.'%'); + ->whereBetween('BATCH_DATE', [$startDate, $endDate]) + ->groupBy('ACCOUNT_NUMBER' , 'CUSTOMER_NO','CURRENCY','SHORT_TITLE','PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE'); } return $data; @@ -69,7 +76,11 @@ class ViewAccount extends Model public function getAccount($cus_no,$account,$kodecabang,$periode){ $data = []; - $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS")->select('*')->where('CUSTOMER_NO',$cus_no)->whereIn('ACCOUNT_NUMBER',$account)->get(); + $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS") + ->select( 'ACCOUNT_NUMBER','CUSTOMER_NO','CURRENCY',DB::raw('MAX(CATEGORY) AS CATEGORY'),'SHORT_TITLE',DB::raw('MAX(BATCH_DATE) AS BATCH_DATE'),'PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE')) + ->where('CUSTOMER_NO',$cus_no)->whereIn('ACCOUNT_NUMBER',$account) + ->groupBy('ACCOUNT_NUMBER' , 'CUSTOMER_NO','CURRENCY','SHORT_TITLE','PRODUCT','COMPANY_NAME','ARRANGEMENT_ID','MATURITY_DATE') + ->get(); return $data; } @@ -134,4 +145,4 @@ class ViewAccount extends Model return $data; } -} \ No newline at end of file +} diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index a77a7ac..11fd747 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -36,18 +36,23 @@ public function index(Request $request) { + if (is_null($this->user) || !$this->user->can('konfirmasibank.create')) { + abort(403, 'Sorry !! You are Unauthorized to view any master data !'); + } // dd($request); $data = []; // Tanggal awal // Contoh tanggal saat ini $today = Carbon::now(); + // dd( $today->format()); // Menambahkan 1 tahun ke tanggal saat ini - $currentYear = $today->format("Y"); + $currentYear = $today->format("Y-m-d"); // Menambahkan 5 tahun ke tanggal saat ini - $pastYear = $today->subYear(3)->format('Y'); - $signer = Signer::all(); + $pastYear = $today->subYear(3)->format('Y-m-d'); + + $signer = Signer::where('status',1)->get(); $data['currentYear'] = $currentYear; $data['pastYear'] = $pastYear; @@ -69,7 +74,13 @@ $data = []; $Account = new ViewAccount; - $Accounts = $Account->getSearchAccount($request->cif, $request->kodecabang,$request->periode)->get(); + $carbonStartDate = Carbon::createFromFormat('Y-m-d', $request->startDate); + $formattedStartDate = $carbonStartDate->format('d/m/Y'); + $carbonEndDate = Carbon::createFromFormat('Y-m-d', $request->endDate); + $formattedEndDate = $carbonEndDate->format('d/m/Y'); + + $Accounts = $Account->getSearchAccount($request->cif, $request->kodecabang,$formattedStartDate,$formattedEndDate)->get(); + foreach ($Accounts as $key => $account) { $data[$key]['CUSTOMER_NO'] = $account->CUSTOMER_NO; $data[$key]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER; @@ -97,6 +108,7 @@ abort(403, 'Sorry !! You are Unauthorized to view any master data !'); } + $account = explode("," , $request['acc_no']); $ViewAccount = new ViewAccount; @@ -171,23 +183,9 @@ $ListLimits = $ViewAccount->getLimit($request['cus_no'],$request['periode']); - // foreach ($ListLimits as $key4 => $val) { - // $limitArr[$key4]['CUSTOMER'] = $item->CUSTOMER; - // $limitArr[$key4]['SHORT_NAME'] = $item->SHORT_NAME; - // $limitArr[$key4]['STREET'] = $item->STREET; - // $limitArr[$key4]['ADDRESS'] = $item->ADDRESS; - // $limitArr[$key4]['COMPANY_NAME'] = $item->COMPANY_NAME; - // $limitArr[$key4]['CURRENCY'] = $item->CURRENCY; - // $limitArr[$key4]['PRODUCT_LINE'] = $item->PRODUCT_LINE; - // $limitArr[$key4]['PRODUCT'] = $item->PRODUCT; - // $limitArr[$key4]['WORKING_BALANCE'] = $item->WORKING_BALANCE; - // $limitArr[$key4]['BATCH_DATE'] = $item->OPENING_DATE; - // } - - $fasilitas = Fasilitas::where('nomor_cif',$request['cus_no'] )->where('status',1)->get(); - $signer = Signer::where('id', $request['signer'])->get(); + $signer = Signer::where('id', $request['signer'])->where('status',1)->get(); $currentDate = Carbon::now(); $tanggalIndonesia = $currentDate->locale('id')->isoFormat('dddd, D MMMM YYYY'); @@ -299,8 +297,7 @@ } $data = []; - - $fasilitas = Fasilitas::paginate(10)->appends($request->query()['cus_no_fasilitas'],$request->query()['company_name'],$request->query()['batch_date'], $request->query()['status']); + $fasilitas = Fasilitas::where('status',1)->paginate(10)->appends($request->query()['cus_no_fasilitas'],$request->query()['company_name'],$request->query()['startDateFasilitas'],$request->query()['startDateFasilitas']); $Category = Category::all(); $Company = Company::all(); // dd($fasilitas); @@ -549,4 +546,4 @@ } - } \ No newline at end of file + } diff --git a/Resources/views/exportPdf.blade.php b/Resources/views/exportPdf.blade.php index 08d11d1..6062f8b 100644 --- a/Resources/views/exportPdf.blade.php +++ b/Resources/views/exportPdf.blade.php @@ -60,20 +60,20 @@

Nomor   : 577/SUBDIT.OPS/VIII/2023

-

Tanggal : {{ $data['localDate'] }}


+

Tanggal : {{ strtoupper($data['localDate']) }}


Kepada Yth

{{$data['DataPinjaman'][0]['SHORT_NAME']}}

-

{{$data['DataPinjaman'][0]['STREET']}}, {{$data['DataPinjaman'][0]['ADDRESS']}}

+

{{$data['DataPinjaman'][0]['STREET']}}, {{str_replace(']','',$data['DataPinjaman'][0]['ADDRESS'])}}

-

Sesuai dengan surat saudara Nomor 150/KB-SENTRA1/II/2023 tanggal {{ $data['localDate'] }} dengan ini kami smpaikan data – data nasabah sesuai permintaan saudara sebagai berikut :

+

Sesuai dengan surat saudara Nomor 150/KB-SENTRA1/II/2023 tanggal {{ strtoupper($data['localDate']) }} dengan ini kami sampaikan data – data nasabah sesuai permintaan saudara sebagai berikut :

Nama Nasabah : {{$data['DataPinjaman'][0]['SHORT_NAME']}}

Nomor CIF        : {{$data['DataAccounts'][0]['CUSTOMER_NO']}}


SIMPAMAN NASABAH YANG BERSANGKUTAN PADA BANK

-

POSISI {{ $data['localDate'] }}

+

POSISI {{ strtoupper($data['localDate']) }}

@@ -84,7 +84,7 @@ - + @@ -106,15 +106,15 @@ @endforeach @else - + @endif
Mata Uang Saldo Jangka WaktuSuku BungSuku Bunga Tgl Jatuh Tempo
Tidak Ada AccountTidak Ada Data Yang Ditampilkan

-

PINJAMAN YANG DI BERIKAN OLEH BANK KEPADA NASABAH

-

POSISI {{ $data['localDate'] }}

+

PINJAMAN YANG DIBERIKAN OLEH BANK KEPADA NASABAH

+

POSISI {{ strtoupper($data['localDate']) }}

@@ -125,7 +125,7 @@ - + @@ -147,14 +147,14 @@ @endforeach @else - + @endif
Mata Uang Saldo Jangka WaktuSuku BungSuku Bunga Tgl Jatuh Tempo
Tidak Ada PinjamanTidak Ada Data Pinjaman Yang Ditampilkan

-

FASILITAS LAIN YANG DI TERIMA OLEH NASABAH

-

POSISI {{ $data['localDate'] }}

+

FASILITAS LAIN YANG DITERIMA OLEH NASABAH

+

POSISI {{ strtoupper($data['localDate']) }}

@@ -165,7 +165,7 @@ - + @@ -190,6 +190,10 @@ @endforeach + @else + + + @endif @if(count($data['DataFasilitas'])>0) @@ -209,13 +213,15 @@ @endforeach @else - + @endif
Mata Uang Saldo Jangka WaktuSuku BungSuku Bunga Tgl Jatuh Tempo
{{ $limit->EXPIRY_DATE}}
Tidak Ada Fasilitas Dari Core
Tidak Ada FasilitasTidak Ada Fasilitas Tambahan


+

Demikian data ini kami sampaikan agar dapat digunakan sebagaimana mestinya



+
diff --git a/Resources/views/pages/index.blade.php b/Resources/views/pages/index.blade.php index 0e0c574..6c2a7fd 100644 --- a/Resources/views/pages/index.blade.php +++ b/Resources/views/pages/index.blade.php @@ -43,8 +43,14 @@
-
- +
+ +
+
+ +
+
+
@@ -77,7 +83,8 @@
@csrf - + +
-{{ $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']->appends(['cus_no_fasilitas' =>''.$data['queryParam']['cus_no_fasilitas'] .'','company_name' =>''.$data['queryParam']['company_name'].'' ,'startDateFasilitas' =>''.$data['queryParam']['startDateFasilitas'].'','endDateFasilitas' =>''.$data['queryParam']['endDateFasilitas'].'','status'=>1])->links('pagination::bootstrap-5') }} {{-- {!! $data['fasilitas']->links('pagination::bootstrap-5') !!} --}} {{-- {!! $data['fasilitas']->links() !!} --}}