From 4a74f053b5b09e7dd1d67eeb0a2b30fc751f1b84 Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Wed, 17 Feb 2021 09:16:16 +0800
Subject: [PATCH] fix serahan

---
 app/Http/Controllers/KelulusanController.php | 19 +++++++++++++++++--
 app/Http/Controllers/TunaiController.php     |  2 +-
 routes/web.php                               |  1 +
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php
index 830c5cb..4be6420 100644
--- a/app/Http/Controllers/KelulusanController.php
+++ b/app/Http/Controllers/KelulusanController.php
@@ -41,9 +41,24 @@ class KelulusanController extends Controller
          ->where('masalulus','<>','')
          ->get();
       
-    
-      
+      return response()->json($kelulusan);
+   }
 
+
+   public function listlatestlulus($kodcaw,$norujukan)
+   {
+      $harini = Carbon::now();
+      $harini = new Carbon;
+
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+   
+         $kelulusan=Mohon::on($cawangan['mysql'])
+         ->where('tarikh','=',$harini->toDateString())
+         ->where('norujukan','=',$norujukan)
+         ->orderBy('siri','desc')
+         ->first();
+      
       return response()->json($kelulusan);
    }
 
diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php
index 448e17e..6d7f608 100644
--- a/app/Http/Controllers/TunaiController.php
+++ b/app/Http/Controllers/TunaiController.php
@@ -223,7 +223,7 @@ class TunaiController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
         
-        $requestteller=RequestTeller::on('mysql7')->where([['kodcaw','=',$kodcaw],['update','=',0]])->get();
+        $requestteller=RequestTeller::on('mysql7')->where([['kodcaw','=',$kodcaw],['update','=',0],['tarikh','=',$current->toDateString()]])->get();
         return response()->json($requestteller);
     }
 
diff --git a/routes/web.php b/routes/web.php
index 8a3b78e..dccc226 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -216,6 +216,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('SenaraiKelulusan/{kodcaw}',['uses'=>'KelulusanController@list']);
     $router->get('RekodDahLepas/{kodcaw}',['uses'=>'KelulusanController@rekodlepas']);
     $router->get('SenaraiDahLulus/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@listdahlulus']);
+    $router->get('ListLatestLulus/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@listlatestlulus']);
     $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@update']);
     $router->post('CreateKelulusan/{kodcaw}/{norujukan}/roles/{roles}',['uses'=>'KelulusanController@create']);
     $router->post('CreateLulus/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@kepohonancreate']);