diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index b3376df..80ce6ad 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -457,24 +457,26 @@ $ViewAccount = new ViewAccount; $listAccount = $ViewAccount->getAccount($request['cus_no'],$arrAccount,$request['kode_cabang'], $dateCore)->get(); $data = []; + foreach ($listAccount as $key1 => $account) { //$Arrangement = $ViewAccount->getAAaccount($account->CUSTOMER_NO,$account->ACCOUNT_NUMBER); $Arrangement = $ViewAccount->getAAaccount($request['cus_no'] , $account->ACCOUNT_NUMBER)->first(); - $months = ''; - if($Arrangement != null && $Arrangement->TERM != null){ - $arrTerm = substr($Arrangement->TERM,-1); - if($arrTerm[1] = 'Y'){ - $monthsInYear = 12; - $months = int($arrTerm[0]) * $monthsInYear; - // $term = $days; - }elseif ($arrTerm[1] = 'D') { - $averageDaysInMonth = 30.44; - $months = int($arrTerm[0]) / $averageDaysInMonth; - // return $days; - } - } + // $months = ''; + + // if($Arrangement != null && $Arrangement->TERM != null){ + // $arrTerm = substr($Arrangement->TERM,-1); + // if($arrTerm[1] = 'Y'){ + // $monthsInYear = 12; + // $months = int($arrTerm[0]) * $monthsInYear; + // // $term = $days; + // }elseif ($arrTerm[1] = 'D') { + // $averageDaysInMonth = 30.44; + // $months = int($arrTerm[0]) / $averageDaysInMonth; + // // return $days; + // } + // } $DataAccounts[$key1]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER; $DataAccounts[$key1]['OPENING_DATE'] = $account->OPENING_DATE; @@ -482,15 +484,17 @@ $DataAccounts[$key1]['CUSTOMER_NO'] = $account->CUSTOMER_NO; $DataAccounts[$key1]['SHORT_NAME'] = $account->SHORT_NAME; $DataAccounts[$key1]['CURRENCY'] = $account->CURRENCY; - $DataAccounts[$key1]['PRODUCT'] = $Arrangement->PRODUCT ?? ''; + $DataAccounts[$key1]['PRODUCT'] = count($Arrangement->PRODUCT) > 0 ? $Arrangement->PRODUCT : ''; $DataAccounts[$key1]['COMPANY_NAME'] = $account->COMPANY_NAME; $DataAccounts[$key1]['WORKING_BALANCE'] = $account->WORKING_BALANCE; - $DataAccounts[$key1]['MATURITY_DATE'] = $Arrangement->MATURITY_DATE ?? '' ; - $DataAccounts[$key1]['ARRANGEMENT_ID'] = $Arrangement->ARRANGEMENT_ID ?? ''; - $DataAccounts[$key1]['FIXED_RATE'] = $Arrangement->FIXED_RATE ?? ''; - $DataAccounts[$key1]['TERM'] = $months; + $DataAccounts[$key1]['MATURITY_DATE'] = count($Arrangement->MATURITY_DATE) > 0 ? $Arrangement->MATURITY_DATE : ''; + $DataAccounts[$key1]['ARRANGEMENT_ID'] = count($Arrangement->ARRANGEMENT_ID) > 0 ? $Arrangement->ARRANGEMENT_ID : ''; + $DataAccounts[$key1]['FIXED_RATE'] = count($Arrangement->FIXED_RATE) > 0 ? $Arrangement->PRODUCTFIXED_RATE : ''; + $DataAccounts[$key1]['TERM'] = '-'; } + dd($DataAccounts); + $data['DataAccounts'] = $DataAccounts; //Inisialisasi DOMPDF