diff --git a/Entities/Account.php b/Entities/Account.php index ac38c9a..40e0d4a 100644 --- a/Entities/Account.php +++ b/Entities/Account.php @@ -43,17 +43,18 @@ class Account extends Model if($arrAccount == null) { $data = DB::connection("db2")->table("STG_DB.ACCOUNT AS AC") - ->selectRaw('AC.CUSTOMER_NO,AC.ACCOUNT_NUMBER,AC.BATCH_DATE,AC.WORKING_BALANCE,CP.COMPANY_NAME,AC.CURRENCY,CT.SHORT_NAME') + ->selectRaw('AC.CUSTOMER_NO,AC.ACCOUNT_NUMBER,AC.BATCH_DATE,AC.OPEN_ACTUAL_BAL,CP.COMPANY_NAME,AC.CURRENCY,CT.SHORT_NAME') ->join('STG_DB.CATEGORY AS CT', 'AC.CATEGORY', '=', 'CT.ID') ->join('STG_DB.COMPANY AS CP', 'AC.CO_CODE', '=', 'CP.ID') ->where('CUSTOMER_NO', $cif) ->where('COMPANY_NAME', 'like', "%" .$uppercaseKodeCabang."%") - // ->where('ARR_A', null) + //->where('LIMIT_REF', null) + // ->where('INACTIV_MARKER', null) ->where('AC.BATCH_DATE', $startDate) // ->whereIn(DB::raw("LEFT(CATEGORY, 3)"), ['100','600','660','101']) ->whereIn(DB::raw("LEFT(CATEGORY, 2)"), ['10','60','66','30','31','32','33']) // ->orWhere(DB::raw("LEFT(CATEGORY, 2)"),'32') - ->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','AC.BATCH_DATE','WORKING_BALANCE','COMPANY_NAME','CURRENCY','SHORT_NAME') + ->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','AC.BATCH_DATE','OPEN_ACTUAL_BAL','COMPANY_NAME','CURRENCY','SHORT_NAME') ->limit(100); } else { $data = DB::connection("db2")->table("STG_DB.ACCOUNT") @@ -89,11 +90,11 @@ class Account extends Model // $dateString = $startDate->format('m/d/Y'); $data = DB::connection("db2")->table("STG_DB.ACCOUNT AS AC") - ->selectRaw('AC.CUSTOMER_NO,AC.CATEGORY,AC.ACCOUNT_NUMBER,AC.CURRENCY, AC.SHORT_TITLE,AC.OPENING_DATE,AC.WORKING_BALANCE, AC.CATEGORY,CT.SHORT_NAME,CP.COMPANY_NAME,AC.BATCH_DATE') + ->selectRaw('AC.CUSTOMER_NO,AC.CATEGORY,AC.ACCOUNT_NUMBER,AC.CURRENCY, AC.SHORT_TITLE,AC.OPENING_DATE,AC.OPEN_ACTUAL_BAL, AC.CATEGORY,CT.SHORT_NAME,CP.COMPANY_NAME,AC.BATCH_DATE') ->join('STG_DB.CATEGORY AS CT', 'AC.CATEGORY', '=', 'CT.ID') ->join('STG_DB.COMPANY AS CP', 'AC.CO_CODE', '=', 'CP.ID') ->where('CUSTOMER_NO', $cif) - ->where('LIMIT_REF', null) + //->where('LIMIT_REF', null) ->where('AC.BATCH_DATE', $startDate) ->whereIn('AC.ACCOUNT_NUMBER', $arrAccount) ->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','101','600']) @@ -164,13 +165,22 @@ class Account extends Model { $data = []; - $data = DB::connection("db2")->table("STG_DB.VW_AA_ARR") - ->select('LINKED_APPL_ID', 'ARRANGEMENT_ID', 'CUSTOMER', 'BATCH_DATE', 'START_DATE', 'PRODUCT_LINE', 'PRODUCT', 'ARR_STATUS', 'CURRENCY', 'TERM', 'MATURITY_DATE', 'RENEWAL_DATE', 'FIXED_RATE') - ->where('CUSTOMER', $cus_no) - ->where('ARR_STATUS', 'CURRENT') - ->where('BATCH_DATE', $dateCore) - ->where('ARR_STATUS', '<>', 'CLOSE') - ->where('PRODUCT_LINE', 'like', "%" .'LENDING' ."%") + // $data = DB::connection("db2")->table("STG_DB.VW_AA_ARR") + // ->select('LINKED_APPL_ID', 'ARRANGEMENT_ID', 'CUSTOMER', 'BATCH_DATE', 'START_DATE', 'PRODUCT_LINE', 'PRODUCT', 'ARR_STATUS', 'CURRENCY', 'TERM', 'MATURITY_DATE', 'RENEWAL_DATE', 'FIXED_RATE') + // ->where('CUSTOMER', $cus_no) + // ->where('ARR_STATUS', 'CURRENT') + // ->where('BATCH_DATE', $dateCore) + // ->where('ARR_STATUS', '<>', 'CLOSE') + // ->where('PRODUCT_LINE', 'like', "%" .'LENDING' ."%") + // ->limit(100); + + $data = DB::connection("db2")->table("MIS.VW_LOAN") + ->select('*') + ->where('SK_NASABAH', $cus_no) + //->where('ARR_STATUS', 'CURRENT') + ->where('PERIODE', $dateCore) + // ->where('ARR_STATUS', '<>', 'CLOSE') + // ->where('PRODUCT_LINE', 'like', "%" .'LENDING' ."%") ->limit(100); return $data; diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index 141fd13..248c54a 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -137,7 +137,7 @@ class KonfirmasiBankController extends Controller $data[$key]['COMPANY_NAME'] = $value->COMPANY_NAME; $data[$key]['SHORT_NAME'] = $value->SHORT_NAME; $data[$key]['CURRENCY'] = $value->CURRENCY; - $data[$key]['WORKING_BALANCE'] = number_format($value->WORKING_BALANCE, 2, ',', '.') ; + $data[$key]['WORKING_BALANCE'] = number_format($value->OPEN_ACTUAL_BAL, 2, ',', '.') ; } @@ -376,7 +376,6 @@ class KonfirmasiBankController extends Controller public function export(Request $request) { $arrAccount = explode(",", $request['accNo']); - // $startDate = Carbon::parse($request['startDate2']); // dd($tanggal1 ); $dateCoreAccount = Carbon::parse($request['startDate2']); $dateCoreDepo = Carbon::parse($request['startDate2']); @@ -390,35 +389,35 @@ class KonfirmasiBankController extends Controller $rekEscrow = []; $DataAnjak = []; $GetCustomer = $Account->getCustomer($request['cusNo'])->first(); - $listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCoreAccount->format('m/d/Y'))->get(); - + $listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCoreAccount)->get(); if ($listAccount->isEmpty()) { $dateCoreDepo = $dateCoreDepo->addDays(1)->format('m/d/Y'); $dateCoreAccount = $dateCoreAccount->subDays(1)->format('m/d/Y'); $listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCoreAccount)->get(); if($listAccount->isEmpty()){ - $dateCoreDepo = $dateCoreDepo->addDays(2)->format('m/d/Y'); - $dateCoreAccount = $dateCoreAccount->subDays(2)->format('m/d/Y'); + $dateCoreDepo = carbon::parse($dateCoreDepo)->addDays(2)->format('m/d/Y'); + $dateCoreAccount = carbon::parse($dateCoreAccount)->subDays(2)->format('m/d/Y'); $listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCoreAccount)->get(); if ($listAccount->isEmpty()) { - $dateCoreDepo = $dateCoreDepo->addDays(3)->format('m/d/Y'); - $dateCoreAccount = $dateCoreAccount->subDays(3)->format('m/d/Y'); + $dateCoreDepo = carbon::parse($dateCoreDepo)->addDays(3)->format('m/d/Y'); + $dateCoreAccount = carbon::parse($dateCoreAccount)->subDays(3)->format('m/d/Y'); $listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCoreAccount)->get(); if ($listAccount->isEmpty()) { - $dateCoreDepo = $dateCoreDepo->addDays(4)->format('m/d/Y'); - $dateCoreAccount = $dateCoreAccount->subDays(4)->format('m/d/Y'); + $dateCoreDepo = carbon::parse($dateCoreDepo)->addDays(4)->format('m/d/Y'); + $dateCoreAccount = carbon::parse($dateCoreAccount)->subDays(4)->format('m/d/Y'); $listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCoreAccount)->get(); if ($listAccount->isEmpty()) { - $dateCoreDepo = $dateCoreDepo->addDays(5)->format('m/d/Y'); - $dateCoreAccount = $dateCoreAccount->subDays(5)->format('m/d/Y'); + $dateCoreDepo = carbon::parse($dateCoreDepo)->addDays(5)->format('m/d/Y'); + $dateCoreAccount = carbon::parse($dateCoreAccount)->subDays(5)->format('m/d/Y'); $listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCoreAccount)->get(); } } } } } - + // $Arrangement = $Account->getPinjaman($request['cusNo'], $dateCoreAccount)->get(); + // DD($Arrangement); try { foreach ($listAccount as $key1 => $account) { @@ -431,7 +430,7 @@ class KonfirmasiBankController extends Controller $DataAccounts[$key1]['CURRENCY'] = $account->CURRENCY; $DataAccounts[$key1]['PRODUCT'] = $account->SHORT_TITLE; $DataAccounts[$key1]['COMPANY_NAME'] = $account->COMPANY_NAME; - $DataAccounts[$key1]['WORKING_BALANCE'] = $account->WORKING_BALANCE != null ? number_format($account->WORKING_BALANCE, 2, ',', '.') : 'NIHIL'; + $DataAccounts[$key1]['WORKING_BALANCE'] = $account->OPEN_ACTUAL_BAL != null ? number_format($account->OPEN_ACTUAL_BAL, 2, ',', '.') : 'NIHIL'; $DataAccounts[$key1]['MATURITY_DATE'] = '' ; $DataAccounts[$key1]['ARRANGEMENT_ID'] = ''; $DataAccounts[$key1]['FIXED_RATE'] = ''; @@ -445,6 +444,7 @@ class KonfirmasiBankController extends Controller } + $DataDepo = []; try { $Deposito = $Account->getDepo($request['cusNo'], $arrAccount, $dateCoreDepo)->get(); @@ -467,6 +467,9 @@ class KonfirmasiBankController extends Controller // dd($Deposito); + + + try { $Arrangement = $Account->getPinjaman($request['cusNo'], $dateCoreAccount)->get(); @@ -475,17 +478,16 @@ class KonfirmasiBankController extends Controller } foreach ($Arrangement as $key2 => $pinjaman) { - $limtiCheck = $Account->getLimitCheck($pinjaman->LINKED_APPL_ID, $startDate)->first(); - $DataPinjaman[$key2]['ARRANGEMENT_ID'] = $pinjaman->ARRANGEMENT_ID; - $DataPinjaman[$key2]['START_DATE'] = $pinjaman->START_DATE; - $DataPinjaman[$key2]['CURRENCY'] = $pinjaman->CURRENCY; - $DataPinjaman[$key2]['PRODUCT'] = $pinjaman->PRODUCT; - $DataPinjaman[$key2]['WORKING_BALANCE'] = number_format($limtiCheck->AVAIL_AMT, 2, ',', '.') ?? ''; - $DataPinjaman[$key2]['TERM'] = $this->convertDateToMonth($pinjaman->TERM) ?? ''; - $DataPinjaman[$key2]['FIXED_RATE'] = number_format($pinjaman->FIXED_RATE, 2, ',', '.') ?? ''; - $DataPinjaman[$key2]['MATURITY_DATE'] = date('d-m-Y', strtotime($pinjaman->MATURITY_DATE)) ?? ''; - $DataPinjaman[$key2]['ACCOUNT_NUMBER'] = $pinjaman->LINKED_APPL_ID; - + $tanggalMulai = Carbon::parse($pinjaman->TGL_MULAI); + $tanggalJatuhTempo = Carbon::parse($pinjaman->JATUH_TEMPO); + $selisihHari = $tanggalMulai->diffInMonths($tanggalJatuhTempo); + $DataPinjaman[$key2]['CURRENCY'] = $pinjaman->KODE_MATA_UANG; + $DataPinjaman[$key2]['PRODUCT'] = $pinjaman->NAMA_PRODUK; + $DataPinjaman[$key2]['WORKING_BALANCE'] = $pinjaman->NOMINAL != null ? number_format(abs($pinjaman->NOMINAL), 2, ',', '.') : ''; + $DataPinjaman[$key2]['TERM'] = $selisihHari; + $DataPinjaman[$key2]['FIXED_RATE'] = number_format($pinjaman->INTEREST_RATE, 2, ',', '.') ?? ''; + $DataPinjaman[$key2]['MATURITY_DATE'] = date('d-m-Y', strtotime($pinjaman->JATUH_TEMPO)) ?? ''; + $DataPinjaman[$key2]['ACCOUNT_NUMBER'] = $pinjaman->NO_REK; }