diff --git a/Entities/ViewAccount.php b/Entities/ViewAccount.php index 6e25b3c..465c6cd 100644 --- a/Entities/ViewAccount.php +++ b/Entities/ViewAccount.php @@ -39,7 +39,7 @@ class ViewAccount extends Model ]; public function getSearchAccount($cif ,$arrAccount, $kodecabang, $startDate){ - + // dd($cif ,$arrAccount, $kodecabang, $startDate); $uppercaseKodeCabang = Str::upper($kodecabang); $data = []; @@ -52,9 +52,9 @@ class ViewAccount extends Model ->where('CUSTOMER_NO',$cif) ->where('COMPANY_NAME', 'like', "%" .$uppercaseKodeCabang."%") ->where('INACTIV_MARKER', NULL) - ->where('BATCH_DATE', $startDate) + ->where('BATCH_DATE',$startDate) ->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','600','660','101']); - // ->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','SHORT_NAME','BATCH_DATE','SHORT_TITLE','CURRENCY','COMPANY_NAME','OPENING_DATE','INACTIV_MARKER'); + //->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','SHORT_NAME','BATCH_DATE','SHORT_TITLE','CURRENCY','COMPANY_NAME','OPENING_DATE','INACTIV_MARKER'); }else{ $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNT") ->select('*') @@ -85,7 +85,7 @@ class ViewAccount extends Model public function getAAaccount($cust, $acc){ $data = []; - $data = DB::connection("db2")->table("STG_DB.VW_AA_ACCOUNT")->select('*') + $data = DB::connection("db2")->table("STG_DB.VW_AA_ACCOUNT")->select('MATURITY_DATE','PRODUCT','TERM') // ->where('CUSTOMER', $cif) ->where('CUSTOMER', $cust) ->where('LINKED_APPL_ID', $acc); @@ -94,12 +94,13 @@ class ViewAccount extends Model public function getPinjaman($cus_no,$arrAccount, $dateCore){ + $data = []; $data = DB::connection("db2")->table("STG_DB.VW_AA_ARR") ->select('*') ->where('CUSTOMER',$cus_no) - ->where('CATEGORY' , 3) - ->where('BATCH_DATE', $dateCore); + ->where('CATEGORY' , 3); + // ->where('BATCH_DATE', $dateCore); return $data; diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index a23dbd9..8cece3e 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -13,6 +13,8 @@ use Modules\Konfirmasibank\Entities\Signer; use Modules\Konfirmasibank\Entities\Category; use Modules\Konfirmasibank\Entities\Company; + use Modules\Konfirmasibank\Entities\Account; + use Modules\Konfirmasibank\Entities\Arrangement; use Modules\Konfirmasibank\Entities\TermAmount; use Dompdf\Dompdf; use Dompdf\Options; @@ -74,33 +76,33 @@ $data = []; $Account = new ViewAccount; $arrAccount = []; - $startDate = Carbon::parse($request->startDate); - $dateCore = $startDate->subDays(2)->format('d/m/Y'); - // dd($dateCore); + $startDate = Carbon::parse($request->startDate)->format('m/d/Y'); + // $dateCore = $startDate->subDays(2)->format('m/d/Y'); + //dd($dateCore); - $Accounts = $Account->getSearchAccount($request->cif,$arrAccount,$request->kodecabang, $dateCore)->get(); + $Accounts = $Account->getSearchAccount($request->cif,$arrAccount,$request->kodecabang, $startDate)->get(); + // $product = ''; + // foreach ($Accounts as $key => $account) { + // $Arrangement = $Account->getAAaccount($request->cif , $account->ACCOUNT_NUMBER)->first(); - $product = ''; - foreach ($Accounts as $key => $account) { - $Arrangement = $Account->getAAaccount($request->cif , $account->ACCOUNT_NUMBER)->first(); + // $data[$key]['CUSTOMER_NO'] = $account->CUSTOMER_NO; + // $data[$key]['INACTIV_MARKER'] = $account->INACTIV_MARKER; + // $data[$key]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER; + // $data[$key]['COMPANY_NAME'] = $account->COMPANY_NAME; + // $data[$key]['SHORT_TITLE'] = $account->SHORT_TITLE; + // $data[$key]['WORKING_BALANCE'] = $account->WORKING_BALANCE; + // $data[$key]['SHORT_NAME'] = $account->SHORT_NAME; + // $data[$key]['CURRENCY'] = $account->CURRENCY; + // $data[$key]['BATCH_DATE'] = $account->BATCH_DATE; + // $data[$key]['OPENING_DATE'] = ''; + // $data[$key]['MATURITY_DATE'] = ''; + // $data[$key]['PRODUCT'] = ''; - $data[$key]['CUSTOMER_NO'] = $account->CUSTOMER_NO; - $data[$key]['INACTIV_MARKER'] = $account->INACTIV_MARKER; - $data[$key]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER; - $data[$key]['COMPANY_NAME'] = $account->COMPANY_NAME; - $data[$key]['SHORT_TITLE'] = $account->SHORT_TITLE; - $data[$key]['WORKING_BALANCE'] = $account->WORKING_BALANCE; - $data[$key]['SHORT_NAME'] = $account->SHORT_NAME; - $data[$key]['CURRENCY'] = $account->CURRENCY; - $data[$key]['OPENING_DATE'] = Carbon::parse($account->OPENING_DATE)->format('d-m-Y'); - $data[$key]['MATURITY_DATE'] = $Arrangement->MATURITY_DATE ?? 'NIHIL'; - $data[$key]['PRODUCT'] = $Arrangement->PRODUCT ?? 'NIHIL'; + // } - } - - return json_encode($data ); + return json_encode($Accounts ); } /* @@ -114,7 +116,7 @@ $arrAccount = explode("," , $request['acc_no']); $startDate = Carbon::parse($request['startDate']); - $dateCore = $startDate->subDays(2)->format('d/m/Y'); + //$dateCore = $startDate->subDays(2)->format('d/m/Y'); $ViewAccount = new ViewAccount; $data = []; @@ -123,7 +125,7 @@ $DataLimit = []; $DataAA = []; - $listAccount = $ViewAccount->getAccount($request['cus_no'],$arrAccount,$request['kode_cabang'], $dateCore)->get(); + $listAccount = $ViewAccount->getAccount($request['cus_no'],$arrAccount,$request['kode_cabang'], $request['startDate'])->get(); $GetCustomer = $ViewAccount->getCustomer($request['cus_no'])->first(); @@ -134,7 +136,7 @@ $AAID= ''; foreach ($listAccount as $key1 => $account) { //$Arrangement = $ViewAccount->getAAaccount($account->CUSTOMER_NO,$account->ACCOUNT_NUMBER); - $Arrangement = $ViewAccount->getAAaccount($request['cus_no'] , $account->ACCOUNT_NUMBER)->first(); + // $Arrangement = $ViewAccount->getAAaccount($request['cus_no'] , $account->ACCOUNT_NUMBER)->first(); $DataAccounts[$key1]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER; $DataAccounts[$key1]['CUSTOMER_NO'] = $account->CUSTOMER_NO; @@ -150,8 +152,8 @@ } - - $ListPinjaman =$ViewAccount->getPinjaman($request['cus_no'],$arrAccount , $dateCore )->get(); + $ListPinjaman =$ViewAccount->getPinjaman($request['cus_no'],$arrAccount , $startDate )->get(); + // dd($ListPinjaman); $ListLimits = $ViewAccount->getLimit($request['cus_no'],$request['periode']); $fasilitas = Fasilitas::where('nomor_cif',$request['cus_no'] )->where('status',1)->get(); @@ -526,3 +528,4 @@ } + diff --git a/Resources/views/exportPdf.blade.php b/Resources/views/exportPdf.blade.php index 1760941..e79fbf2 100644 --- a/Resources/views/exportPdf.blade.php +++ b/Resources/views/exportPdf.blade.php @@ -163,6 +163,15 @@