fix skit2

app/Http/Controllers/AdminPageController.php

@@ -1851,7 +1851,13 @@ class AdminPageController extends Controller
 
     public function GetPermohonanCawangan($kodcaw,Request $request)
     {
-        $listpermohonan = Permohonan::where('kodcaw', $kodcaw)->get();
+        
+        if($kodcaw === 'admin')
+        {
+                $listpermohonan = Permohonan::where('tagterima',0)->orderBy('tarikh_permohonan','desc')->paginate(5);
+        }else{
+                $listpermohonan = Permohonan::where([['kodcaw', $kodcaw],['tagterima',0]])->get();
+        }
 
         return response()->json($listpermohonan);
     }
@@ -1862,8 +1868,27 @@ class AdminPageController extends Controller
         $listpermohonan = Permohonan::where([['kodcaw', $kodcaw],['mohonid',$mohonid]])->first()->toArray();
         $status = Status::where('mohonid',$mohonid)->get()->toArray();
 
-        $permohonanstatus = $listpermohonan + $status;
+        array_push($listpermohonan,(["status" => $status]));
 
-        return response()->json($permohonanstatus);
+        return response()->json($listpermohonan);
+    }
+
+    public function GetDescriptionStatus($mohonid)
+    {
+        $statusarray = [];
+
+        $status = Status::where('mohonid',$mohonid)->get()->toArray();
+
+        foreach($status as $index=>$stat)
+        {
+                $status_lookup = LookupStatus::where('statusid',$stat['statusid'])->first()->toArray();
+                // $status_lookup = $stat['tarikhmasa'];
+                $date = date('d-m-Y',strtotime($stat['tarikhmasa']));
+                $time = date('g:i a',strtotime($stat['tarikhmasa']));
+                array_push($status_lookup,['tarikh' => $date, 'masa' => $time]);
+                array_push($statusarray,$status_lookup);
+        }
+
+        return response()->json($statusarray);
     }
 }

app/Pengesahan.php

@@ -26,7 +26,10 @@ class Pengesahan extends Model
         'noresit',
         'tarikh_bankin',
         'kodcaw',
-        'mohonid'
+        'mohonid',
+        'tagoperasi',
+        'tagakaun',
+        'tagpb'
     ];
 
     /**

app/Permohonan.php

@@ -28,7 +28,8 @@ class Permohonan extends Model
         'tarikh_terima',
         'nama_penerima',
         'outstandingsemasa',
-        'nopermohonan'
+        'nopermohonan',
+        'tagterima'
     ];
 
     /**

routes/web.php

@@ -686,6 +686,9 @@ $router->group(['prefix'=>'admin'], function () use ($router){
     $router->post('permohonan/add/{kodcaw}',['uses'=>'AdminPageController@TambahPermohonan']);
     $router->get('permohonan/get/{kodcaw}',['uses'=>'AdminPageController@GetPermohonanCawangan']);
     $router->get('permohonan/get/{kodcaw}/{mohonid}',['uses'=>'AdminPageController@GetPermohonanById']);
+    $router->get('permohonan/description/{mohonid}',['uses'=>'AdminPageController@GetDescriptionStatus']);
+
+
 });
 
 $router->group(['prefix'=>'kelantanpay'], function () use ($router){