remove -
This commit is contained in:
@ -38,14 +38,11 @@ class Account extends Model
|
|||||||
|
|
||||||
public function getSearchAccount($cif ,$arrAccount, $kodecabang, $startDate){
|
public function getSearchAccount($cif ,$arrAccount, $kodecabang, $startDate){
|
||||||
|
|
||||||
|
|
||||||
// dd($cif ,$arrAccount, $kodecabang, $startDate);
|
|
||||||
$uppercaseKodeCabang = Str::upper($kodecabang);
|
$uppercaseKodeCabang = Str::upper($kodecabang);
|
||||||
$data = [];
|
$data = [];
|
||||||
|
|
||||||
|
|
||||||
if($arrAccount == null){
|
if($arrAccount == null){
|
||||||
|
|
||||||
$data = DB::connection("db2")->table("STG_DB.ACCOUNT AS AC")
|
$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')
|
->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')
|
->join('STG_DB.CATEGORY AS CT', 'AC.CATEGORY', '=', 'CT.ID')
|
||||||
|
@ -98,11 +98,11 @@
|
|||||||
public function getData(Request $request)
|
public function getData(Request $request)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
$data = [];
|
$data = [];
|
||||||
$Account = new Account;
|
$Account = new Account;
|
||||||
$arrAccount = [];
|
$arrAccount = [];
|
||||||
$startDate = Carbon::parse($request->startDate);
|
$startDate = Carbon::parse($request->startDate);
|
||||||
|
|
||||||
$dateCore = $startDate->subDays(2)->format('m/d/Y');
|
$dateCore = $startDate->subDays(2)->format('m/d/Y');
|
||||||
$Accounts = $Account->getSearchAccount($request->cif,$arrAccount,$request->kodecabang, $dateCore)->get();
|
$Accounts = $Account->getSearchAccount($request->cif,$arrAccount,$request->kodecabang, $dateCore)->get();
|
||||||
|
|
||||||
@ -508,7 +508,8 @@
|
|||||||
$DataAnjak[$key4]['LOAN_CCY'] = $val4->LOAN_CCY;
|
$DataAnjak[$key4]['LOAN_CCY'] = $val4->LOAN_CCY;
|
||||||
$DataAnjak[$key4]['CUSTOMER_NO'] = $val4->PAYIN_ACCOUNT;
|
$DataAnjak[$key4]['CUSTOMER_NO'] = $val4->PAYIN_ACCOUNT;
|
||||||
$DataAnjak[$key4]['TENOR'] = $val4->TENOR;
|
$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]['MATURITY_DATE'] = date('d-m-Y', strtotime($val4->MATURITY_DATE)) ?? ''; ;
|
||||||
$DataAnjak[$key4]['ACCOUNT_NUMBER'] = $val4->ACCOUNT_NUMBER;
|
$DataAnjak[$key4]['ACCOUNT_NUMBER'] = $val4->ACCOUNT_NUMBER;
|
||||||
$DataAnjak[$key4]['CURRENT_INTEREST_RATE'] = $val4->CURRENT_INTEREST_RATE;
|
$DataAnjak[$key4]['CURRENT_INTEREST_RATE'] = $val4->CURRENT_INTEREST_RATE;
|
||||||
|
Reference in New Issue
Block a user