diff --git a/Entities/Account.php b/Entities/Account.php index f356cec..e060956 100644 --- a/Entities/Account.php +++ b/Entities/Account.php @@ -138,7 +138,6 @@ class Account extends Model $data = DB::connection("db2")->table("MIS.VW_AA_DEPO")->select('*') ->whereIn('NO_REK', $acc) ->where('PERIOD', $date) - ->where('JUMLAH_NOMINAL' <> 0) ->limit(100); return $data; } diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index 1493660..82e569d 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -418,7 +418,7 @@ class KonfirmasiBankController extends Controller } // $Arrangement = $Account->getPinjaman($request['cusNo'], $dateCoreAccount)->get(); // DD($Arrangement); - try { + // try { foreach ($listAccount as $key1 => $account) { @@ -444,16 +444,21 @@ class KonfirmasiBankController extends Controller } - $DataDepo = []; try { - $Deposito = $Account->getDepo($request['cusNo'], $arrAccount, $dateCoreDepo)->get(); + $Deposito = $Account->getDepo($request['cusNo'], $arrAccount, $dateCoreDepo)->get(); } catch (Exception $e) { return redirect()->route('konfirmasibank.timeout'); } - + $periode = ''; foreach ($Deposito as $keyDep => $depo) { - + if (substr($depo->KODE_SUB_PRODUK, -1) == 'Y') { + $periode = 'TAHUN'; + } elseif (substr($depo->KODE_SUB_PRODUK, -1) == 'M') { + $periode = 'BULAN'; + } else { + $periode = 'HARI'; + } $DataDepo[$keyDep]['ACCOUNT_NUMBER'] = $depo->NO_REK; $DataDepo[$keyDep]['BATCH_DATE'] = $depo->PERIOD; $DataDepo[$keyDep]['SHORT_NAME'] = 'DEPOSITO'; @@ -462,7 +467,7 @@ class KonfirmasiBankController extends Controller $DataDepo[$keyDep]['MATURITY_DATE'] = Carbon::parse($depo->JATUH_TEMPO)->format('d-m-Y'); $DataDepo[$keyDep]['ARRANGEMENT_ID'] = ''; $DataDepo[$keyDep]['FIXED_RATE'] = number_format($depo->SUKU_BUNGA, 2, ',', '.') ?? ''; - $DataDepo[$keyDep]['TERM'] = $depo->KODE_SUB_PRODUK ; //substr($depo->KODE_SUB_PRODUK, 0, -1); + $DataDepo[$keyDep]['TERM'] = substr($depo->KODE_SUB_PRODUK, 0, -1) .' '. $periode ; } // dd($Deposito); @@ -606,11 +611,11 @@ class KonfirmasiBankController extends Controller return $pdf->stream($filename); - } catch (Exception $e) { - return redirect()->route('konfirmasibank.timeout'); - } + // } catch (Exception $e) { + // return redirect()->route('konfirmasibank.timeout'); + // } - return false; + // return false; } @@ -855,4 +860,4 @@ class KonfirmasiBankController extends Controller } -} \ No newline at end of file +}