diff --git a/Entities/Account.php b/Entities/Account.php index 9bf4830..0d2daa3 100644 --- a/Entities/Account.php +++ b/Entities/Account.php @@ -211,7 +211,8 @@ class Account extends Model public function getAccountRK($cusNo,$date){ $data = []; $data = DB::connection("db2")->table("STG_DB.ACCOUNT AS AC") - ->select('AC.ACCOUNT_NUMBER','AC.CUSTOMER_NO','CT.SHORT_NAME','AC.WORKING_BALANCE','AC.CURRENCY','AC.SHORT_TITLE','AC.OPENING_DATE','AC.BATCH_DATE','AC.CATEGORY') + ->select('AC.ACCOUNT_NUMBER','AC.CUSTOMER_NO','CT.SHORT_NAME','AC.WORKING_BALANCE','AC.CURRENCY','AC.SHORT_TITLE','AC.OPENING_DATE','AC.BATCH_DATE','AC.CATEGORY','LT.EXPIRY_DATE') + ->join('STG_DB.LIMIT AS LT', 'AC.ACCOUNT_NUMBER', '=', 'LT.ACCOUNT') ->join('STG_DB.CATEGORY AS CT', 'AC.CATEGORY', '=', 'CT.ID') ->where('AC.CUSTOMER_NO',$cusNo) ->where('AC.BATCH_DATE',$date) diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index f69a544..c7e9097 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -412,7 +412,7 @@ $DataRK[$rk]['CURRENCY'] = $valRk->CURRENCY; $DataRK[$rk]['PRODUCT'] = $valRk->SHORT_TITLE; $DataRK[$rk]['WORKING_BALANCE'] = $valRk->WORKING_BALANCE != null ? number_format($valRk->WORKING_BALANCE, 2, ',', '.') : 'NIHIL'; - $DataRK[$rk]['MATURITY_DATE'] = '' ; + $DataRK[$rk]['MATURITY_DATE'] = date('d-m-Y', strtotime($valRk->EXPIRY_DATE)) ?? ''; ; $DataRK[$rk]['ARRANGEMENT_ID'] = ''; $DataRK[$rk]['FIXED_RATE'] = ''; $DataRK[$rk]['TERM'] = ''; diff --git a/Resources/views/exportPdf.blade.php b/Resources/views/exportPdf.blade.php index 0f1116d..d7b7821 100644 --- a/Resources/views/exportPdf.blade.php +++ b/Resources/views/exportPdf.blade.php @@ -97,9 +97,6 @@ -
- testtt -