diff --git a/Entities/Account.php b/Entities/Account.php index eab0147..1380986 100644 --- a/Entities/Account.php +++ b/Entities/Account.php @@ -38,14 +38,11 @@ class Account extends Model public function getSearchAccount($cif ,$arrAccount, $kodecabang, $startDate){ - - // dd($cif ,$arrAccount, $kodecabang, $startDate); $uppercaseKodeCabang = Str::upper($kodecabang); $data = []; if($arrAccount == null){ - $data = DB::connection("db2")->table("STG_DB.ACCOUNT AS AC") ->selectRaw('AC.CUSTOMER_NO, MAX(INACTIV_MARKER) as INACTIV_MARKER,AC.ACCOUNT_NUMBER,MAX(AC.BATCH_DATE) AS BATCH_DATE,MAX(AC.CURRENCY)AS CURRENCY, AC.SHORT_TITLE,MAX(AC.OPENING_DATE) AS OPENING_DATE, MAX(AC.WORKING_BALANCE) AS WORKING_BALANCE, MAX(AC.CATEGORY) AS CATEGORY,CT.SHORT_NAME,CP.COMPANY_NAME') ->join('STG_DB.CATEGORY AS CT', 'AC.CATEGORY', '=', 'CT.ID') diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index 3139fd9..7f17504 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -98,11 +98,11 @@ public function getData(Request $request) { - $data = []; $Account = new Account; $arrAccount = []; $startDate = Carbon::parse($request->startDate); + $dateCore = $startDate->subDays(2)->format('m/d/Y'); $Accounts = $Account->getSearchAccount($request->cif,$arrAccount,$request->kodecabang, $dateCore)->get(); @@ -508,7 +508,8 @@ $DataAnjak[$key4]['LOAN_CCY'] = $val4->LOAN_CCY; $DataAnjak[$key4]['CUSTOMER_NO'] = $val4->PAYIN_ACCOUNT; $DataAnjak[$key4]['TENOR'] = $val4->TENOR; - $DataAnjak[$key4]['OUTSTANDING'] = $val4->OUTSTANDING != null ? number_format($val4->OUTSTANDING, 2, ',', '.') : 'NIHIL'; + // $DataAnjak[$key4]['OUTSTANDING'] = $val4->OUTSTANDING != null ? number_format($val4->OUTSTANDING, 2, ',', '.') : 'NIHIL'; + $DataAnjak[$key4]['OUTSTANDING'] = $val4->OUTSTANDING != null ? number_format(abs($val4->OUTSTANDING), 2, ',', '.') : 'NIHIL'; $DataAnjak[$key4]['MATURITY_DATE'] = date('d-m-Y', strtotime($val4->MATURITY_DATE)) ?? ''; ; $DataAnjak[$key4]['ACCOUNT_NUMBER'] = $val4->ACCOUNT_NUMBER; $DataAnjak[$key4]['CURRENT_INTEREST_RATE'] = $val4->CURRENT_INTEREST_RATE; @@ -829,4 +830,4 @@ - } \ No newline at end of file + }