update maturityDate

Entities/Account.php

@@ -67,22 +67,42 @@ class Account extends Model
           public function getAccount($cif, $arrAccount, $startDate)
     {
         //$uppercaseKodeCabang = Str::upper($kodecabang);
+           $dateString = $startDate->format('m/d/Y');
 
            $data = DB::connection("db2")->table("STG_DB.ACCOUNT AS AC")
-           ->selectRaw('AC.CUSTOMER_NO,AC.CATEGORY, 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,AC.CATEGORY,AC.ACCOUNT_NUMBER,AC.CURRENCY, AC.SHORT_TITLE,AC.OPENING_DATE,AC.WORKING_BALANCE, AC.CATEGORY,CT.SHORT_NAME,CP.COMPANY_NAME,AC.BATCH_DATE')
           ->join('STG_DB.CATEGORY AS CT', 'AC.CATEGORY', '=', 'CT.ID')
           ->join('STG_DB.COMPANY AS CP', 'AC.CO_CODE', '=', 'CP.ID')
           ->where('CUSTOMER_NO', $cif)
           ->where('LIMIT_REF', null)
-          ->where('AC.BATCH_DATE', $startDate)
+          ->where('AC.BATCH_DATE', $dateString)
           ->whereIn('AC.ACCOUNT_NUMBER', $arrAccount)
           ->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','600','660','101'])
-          ->groupBy('CUSTOMER_NO', 'ACCOUNT_NUMBER', 'SHORT_TITLE', 'SHORT_NAME', 'COMPANY_NAME', 'CATEGORY', 'LIMIT_REF')
+         // ->groupBy('CUSTOMER_NO', 'ACCOUNT_NUMBER', 'SHORT_TITLE', 'SHORT_NAME', 'COMPANY_NAME', 'CATEGORY', 'LIMIT_REF')
-          ->orderBy('SHORT_NAME', 'ASC')
+          ->orderBy('CATEGORY', 'ASC')
           ->limit(100);
         return $data;
     }
 
+    // public function getAccount($cif, $arrAccount, $startDate)
+    // {
+    //     //$uppercaseKodeCabang = Str::upper($kodecabang);
+
+    //     $data = DB::connection("db2")->table("STG_DB.ACCOUNT AS AC")
+    //        ->selectRaw('AC.CUSTOMER_NO,AC.CATEGORY, MAX(INACTIV_MARKER) as INACTIV_MARKER,AC.ACCOUNT_NUMBER,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.COMPANY AS CP', 'AC.CO_CODE', '=', 'CP.ID')
+    //       ->where('CUSTOMER_NO', $cif)
+    //       ->where('LIMIT_REF', null)
+    //       ->where('AC.BATCH_DATE', $startDate)
+    //       ->whereIn('AC.ACCOUNT_NUMBER', $arrAccount)
+    //       ->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','600','660','101'])
+    //       ->groupBy('CUSTOMER_NO', 'ACCOUNT_NUMBER', 'SHORT_TITLE', 'SHORT_NAME', 'COMPANY_NAME', 'CATEGORY', 'LIMIT_REF')
+    //      // ->orderBy('BATCH_DATE', 'DESC')
+    //       ->limit(100);
+    //     return $data;
+    // }
+
        public function getAA($cust, $acc, $dataCore)
     {
         //$uppercaseKodeCabang = Str::upper($kodecabang);
@@ -116,7 +136,7 @@ class Account extends Model
         $Year = date("Y", $timestamp);
 
         $data = DB::connection("db2")->table("STG_DB.VW_AA_DETAIL")
-           ->selectRaw('CUSTOMER,LINKED_APPL_ID,PRODUCT_LINE,MATURITY_DATE,RENEWAL_DATE,START_DATE,ARR_STATUS,BATCH_DATE,FIXED_RATE,BASE_DATE')
+           ->selectRaw('ARRANGEMENT_ID,CUSTOMER,LINKED_APPL_ID,PRODUCT_LINE,MATURITY_DATE,RENEWAL_DATE,START_DATE,ARR_STATUS,BATCH_DATE,FIXED_RATE,BASE_DATE')
           ->where('CUSTOMER', $cust)
           //->whereYear('BATCH_DATE', $Year)
           ->where('LINKED_APPL_ID', $acc)
@@ -133,6 +153,7 @@ class Account extends Model
         return $data;
     }
 
+
     public function getAAaccount($cust, $acc)
     {
         $data = [];
@@ -185,12 +206,14 @@ class Account extends Model
 
     public function getFixedRate($arrangementId, $startDate)
     {
+       // DD($startDate->format('Y'));
         $data = [];
         $data = DB::connection("db2")->table("STG_DB.AA_ARR_INTEREST")
         ->select('FIXED_RATE')
-        ->where('BATCH_DATE', $startDate)
+       // ->whereYear('BATCH_DATE',$startDate->format('Y'))
         ->where(DB::raw("LEFT(ID, 12)"), $arrangementId)
-        ->orderBy('ID', 'DESC');
+        //->orderBy('BATCH_DATE', 'A')
+        ->limit(1);
 
         return $data;
     }

Http/Controllers/KonfirmasiBankController.php

@@ -347,7 +347,9 @@ class KonfirmasiBankController extends Controller
     {
         $arrAccount = explode(",", $request['accNo']);
         $startDate = Carbon::parse($request['startDate2']);
+       // dd($tanggal1 );
         $dateCore = $startDate->subDays(2);
+       // dd( $dateCore);
         $Account = new Account();
         $data = [];
         $DataAccounts   = [];
@@ -358,20 +360,23 @@ class KonfirmasiBankController extends Controller
         $DataAnjak      = [];
         $GetCustomer        = $Account->getCustomer($request['cusNo'])->first();
         $listAccount        = $Account->getAccount($request['cusNo'], $arrAccount, $dateCore)->get();
-       // dd( $listAccount);
 
        // try {
            foreach ($listAccount as $key1 => $account) {
                 $dataAADepo = $Account->getArr($request['cusNo'], $account->ACCOUNT_NUMBER, $dateCore)->first();
-                //dd($dataAADepo);
+
                 if ($account->CATEGORY == '6603' || $account->CATEGORY == '6602') {
+                    //  dd($days);
                     if ($dataAADepo != null) {
                         $tenor = '';
-                        $tanggal_1 = date_create($dataAADepo->START_DATE);
+                        $tanggal_1 = date_create($dataAADepo->RENEWAL_DATE);
                         $tanggal_2 = date_create($dataAADepo->BASE_DATE);
                         $tenor  = date_diff($tanggal_1, $tanggal_2);
+                        $batchDate = $dateCore->format('Y-m-d');
+                        $maturityDate = Carbon::createFromFormat('Y-m-d', $batchDate);
                         $tenorFix = $tenor->days >= 30 ? intval($tenor->days / 30) : '1';
 
+
                         $DataAccounts[$key1]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER;
                         $DataAccounts[$key1]['OPENING_DATE'] = $account->OPENING_DATE;
                         $DataAccounts[$key1]['BATCH_DATE'] = $account->BATCH_DATE;
@@ -381,7 +386,7 @@ class KonfirmasiBankController extends Controller
                         $DataAccounts[$key1]['PRODUCT'] = $account->SHORT_TITLE;
                         $DataAccounts[$key1]['COMPANY_NAME'] = $account->COMPANY_NAME;
                         $DataAccounts[$key1]['WORKING_BALANCE'] = $account->WORKING_BALANCE != null ? number_format($account->WORKING_BALANCE, 2, ',', '.') : 'NIHIL';
-                        $DataAccounts[$key1]['MATURITY_DATE'] =  date('d-m-Y', strtotime($dataAADepo->RENEWAL_DATE)) ;
+                        $DataAccounts[$key1]['MATURITY_DATE'] = $maturityDate->addDays($tenor->days)->format('d-m-Y');
                         $DataAccounts[$key1]['ARRANGEMENT_ID'] = '';
                         $DataAccounts[$key1]['FIXED_RATE'] =   $dataAADepo->FIXED_RATE . '  %';
                         $DataAccounts[$key1]['TERM'] =  $tenorFix . '    BLN';
@@ -412,8 +417,6 @@ class KonfirmasiBankController extends Controller
 
             }
 
-          //dd( $dataAADepo);
-
             $Arrangement        =  $Account->getPinjaman($request['cusNo'], $dateCore)->get();
 
             foreach ($Arrangement as $key2 => $pinjaman) {