diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
index 5d0e85f..7098a43 100644
--- a/app/Http/Controllers/AdminPageController.php
+++ b/app/Http/Controllers/AdminPageController.php
@@ -21,11 +21,14 @@ use App\Bajet;
 use App\BajetTahunan;
 use App\Blacklist;
 use App\Pelelong;
+use App\Mohon;
 
 
 use DB;
 use Carbon\Carbon;
-
+use Illuminate\Pagination\Paginator;
+use Illuminate\Support\Collection;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Http\Request;
 
 class AdminPageController extends Controller
@@ -295,9 +298,14 @@ class AdminPageController extends Controller
                 ->get()->toArray();
 
         $totalall = 0;
-        foreach($lelongupahsimpan as $index=>$lelong)
+        $variable = ['lelongupahsimpan','ansuran','tebus_arrahn','advansur','tebus_upah_tawarruq'];
+
+        foreach($variable as $index => $var)
         {
-                $totalall += $lelong['total'] + $tebus_arrahn[$index]['total'] + $advansur[$index]['total'] + $ansuran[$index]['total'] + $tebus_upah_tawarruq[$index]['total'];
+                foreach(${$var} as $indextemp => $temp)
+                {
+                        $totalall += $temp['total'];
+                }
         }
 
 
@@ -895,6 +903,7 @@ class AdminPageController extends Controller
                     ->orderBy('t_jual','asc')
                     ->get()->toArray();
 
+        
 
         $tebus_arrahn = Tebus::on($cawangan['mysql'])
                 ->rightJoin('gadai', 'gadai.norujukan', '=', 'tebus.norujukan')
@@ -952,38 +961,40 @@ class AdminPageController extends Controller
                 ->where('trans.kodcaw','=',$request->kodcaw)
                 ->get()->toArray();
 
-
-        // dd($array_totalup);
+        $variable = ['lelongupahsimpan','ansuran','tebus_arrahn','advansur','tebus_upah_tawarruq'];
 
         foreach($array_totalup as $array_index=>$totalup){
-        //     foreach($lelongupahsimpan as $indexlelong=>$lelong_detail){
-        //         if($totalup['tarikh'] == $lelong_detail['t_jual']){
-        //             $total_lelong = $totalup['keuntungan'];
-        //             $total_lelong += $lelong_detail['totalupahlelong'];
-        //             $array_totalup[$array_index]['keuntungan'] = $total_lelong;
-        //         }
-        //     }
 
-        //     foreach($tebus as $indextebus=>$tebus_detail){
-        //         if($totalup['tarikh'] == $tebus_detail['t_tebus']){
-        //             $total_tebus = $array_totalup[$array_index]['keuntungan'];
-        //             $total_tebus += $tebus_detail['totalupahsimpan'];
-        //             $array_totalup[$array_index]['keuntungan'] = $total_tebus;
-        //             $array_totalup[$array_index]['bajetkeuntungan'] = (sizeof($bajetkeuntungan) > 0) ? $bajetkeuntungan[$array_index] : 0;
-        //         }
-        //     }
-
-        foreach($lelongupahsimpan as $indexloop=>$looptambahan)
-        {
-                if($totalup['tarikh'] == $looptambahan['tarikh']){
-                $total = 0;
-                $total = $looptambahan['total'] + $tebus_arrahn[$indexloop]['total'] + $advansur[$indexloop]['total'] + $ansuran[$indexloop]['total'] + $tebus_upah_tawarruq[$indexloop]['total'];
-                // $total_keuntungan = $array_totalup[$array_index]['keuntungan'];
-                $total_keuntungan = $total;
-                $array_totalup[$array_index]['keuntungan'] = $total_keuntungan;
-                $array_totalup[$array_index]['bajetkeuntungan'] = (sizeof($bajetkeuntungan) > 0) ? $bajetkeuntungan[$array_index] : 0;
+                foreach($variable as $index => $var)
+                {
+                        foreach(${$var} as $indextemp => $temp)
+                        {
+                                if($totalup['tarikh'] == $temp['tarikh'])
+                                {
+                                        $total_tebus = $array_totalup[$array_index]['keuntungan'];
+                                        $total_tebus += $temp['total'];
+                                        $array_totalup[$array_index]['keuntungan'] = $total_tebus;
+                                        $array_totalup[$array_index]['bajetkeuntungan'] = (sizeof($bajetkeuntungan) > 0) ? $bajetkeuntungan[$array_index] : 0;
+                                }
+                        }
                 }
-        }
+
+                // foreach($tebus_upah_tawarruq as $indexloop=>$looptambahan)
+                // {
+                //         if($totalup['tarikh'] == $looptambahan['tarikh']){
+                //         $total = 0;
+                //         $tebusarrahntotal = (count($tebus_arrahn) < $indexloop) ? $tebus_arrahn[$indexloop]['total'] : 0;
+                //         $advansurtotal = (count($advansur) < $indexloop) ? $advansur[$indexloop]['total'] ? $advansur[$indexloop]['total'] : 0 : 0;
+                //         $ansurantotal = (count($ansuran) < $indexloop) ? $ansuran[$indexloop]['total'] : 0;
+                //         $tebustawarruqtotal = (count($lelongupahsimpan) < $indexloop) ? $lelongupahsimpan[$indexloop]['total'] : 0;
+
+                //         $total = $looptambahan['total'] + $tebusarrahntotal + $advansurtotal + $ansurantotal + $tebustawarruqtotal;
+                //         // $total_keuntungan = $array_totalup[$array_index]['keuntungan'];
+                //         $total_keuntungan = $total;
+                //         $array_totalup[$array_index]['keuntungan'] = $total_keuntungan;
+                //         $array_totalup[$array_index]['bajetkeuntungan'] = (sizeof($bajetkeuntungan) > 0) ? $bajetkeuntungan[$array_index] : 0;
+                //         }
+                // }
 
             $goals[0]['value'] = (sizeof($bajetkeuntungan) > 0) ? $bajetkeuntungan[$array_index] : 0;
             array_push($arrayKeuntungan,['x' => $array_totalup[$array_index]['namabulan'],'y' => $array_totalup[$array_index]['keuntungan'],'goals' => (array) $goals]);
@@ -1620,4 +1631,58 @@ class AdminPageController extends Controller
 
         return response()->json($detailslelong, 200);
     }
+
+    public function paginate($items, $perPage = 5, $page = null, $options = [])
+    {
+        $page = $page ?: (Paginator::resolveCurrentPage() ?: 1);
+        $items = $items instanceof Collection ? $items : Collection::make($items);
+        return new LengthAwarePaginator($items->forPage($page, $perPage), $items->count(), $perPage, $page, $options);
+    }
+
+    public function listoperasi()
+    {
+       $harini = Carbon::now();
+       $harini = new Carbon;
+ 
+       $cawangan_all = Cawangan::on('mysql7')->get();
+       $arraykelulusan = [];
+ 
+       foreach($cawangan_all as $index=>$cawangan){
+          $kelulusan=Mohon::on($cawangan['mysql'])
+                ->where('tarikh','=',$harini->toDateString())
+                ->where('masalulus','=','')
+                ->where('pelulus','=','operasi')
+                ->get();
+ 
+          if(sizeof($kelulusan) != 0){
+              array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]);
+          }
+      }
+      
+      $data = $this->paginate($arraykelulusan);
+ 
+       return response()->json($data,200);
+    }
+ 
+    public function listoperasikelulusan()
+    {
+       $harini = Carbon::now();
+       $harini = new Carbon;
+ 
+       $cawangan_all = Cawangan::on('mysql7')->get();
+       $arraykelulusan = [];
+ 
+       foreach($cawangan_all as $index=>$cawangan){
+          $kelulusan=Mohon::on($cawangan['mysql'])
+                ->where('peloperasi','=','operasi')
+                ->where('operasi','!=','')
+                ->get();
+ 
+          if(sizeof($kelulusan) != 0){
+              array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]);
+          }
+      }      
+ 
+       return response()->json($arraykelulusan,200);
+    }
 }
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 7366695..7ec81f7 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -673,8 +673,8 @@ $router->group(['prefix'=>'admin'], function () use ($router){
     $router->post('AddSenaraiHitam',['uses'=>'AdminPageController@AddSenaraiHitam']);
     $router->put('notislelong/update/{kodcaw}',['uses'=>'AdminPageController@UpdateNotisLelong']); 
 
-
-
+    $router->get('ListOperasi/Paginate',['uses'=>'AdminPageController@listoperasi']);
+    $router->get('ListOperasiKelulusan/Paginate',['uses'=>'AdminPageController@listoperasikelulusan']);
 
 });