Merge branch 'apiaku' into 'master'

kelulusan fix

See merge request online-sistem1/api_arrahn!38

app/Http/Controllers/KelulusanController.php

@@ -75,13 +75,29 @@ class KelulusanController extends Controller
 
       if($pengesahan == 'khazanah')
       {
+         if($request->pembatalan == null)
+         {
+
             $kelulusan=Mohon::on($cawangan['mysql'])
-                     ->where('tarikh','=',$harini->toDateString())
+            ->where('tarikh','=',$harini->toDateString())
-                     ->where('norujukan','=',$norujukan)
+            ->where('norujukan','=',$norujukan)
-                     ->update(array(
+            ->update(array(
-                              'masalulus'=> $harini->toTimeString(),
+                     'masalulus'=> $harini->toTimeString(),
-                              'pelulus'=> 'khazanah'
+                     'pelulus'=> 'khazanah'
             ));
+
+         }else{
+
+            $kelulusan=Mohon::on($cawangan['mysql'])
+            ->where('tarikh','=',$harini->toDateString())
+            ->where('norujukan','=',$norujukan)
+            ->update(array(
+                     'masalulus'=> 'batal',
+                     'pelulus'=> 'khazanah'
+            ));
+
+         }
+           
       }
       else
       {
@@ -121,7 +137,7 @@ class KelulusanController extends Controller
         
                   'tarikh'=> $harini->toDateString(),
                   'norujukan'=> $norujukan,
-                  'siri' => "try",
+                  'siri' => $request->siri,
                   'komen' => $request->komen,
                   'lastdategadai' => $request->dategadai,
                   'bilgad' => $request->bilgadai,

app/Http/Controllers/TunaiController.php

@@ -180,9 +180,9 @@ class TunaiController extends Controller
         return response()->json($addtunai);
     }
 
+
     public function getAddTunaibyKodlaluan($kodcaw,Request $request)
     {
-       
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -191,6 +191,32 @@ class TunaiController extends Controller
         return response()->json($addtunai);
     }
 
+    public function getAddTunaibyKodlaluanLatest($kodcaw,Request $request)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        if($request->jenisnota == 'pendahuluan')
+        {
+            $addtunai=AddTunai::on($cawangan['mysql'])
+            ->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['kodlaluan','=',$request->kodlaluan],['tambah','<>',0]])
+            ->orderBy('recno','desc')
+            ->first();
+
+        }else if($request->jenisnota == 'serahan'){
+
+            $addtunai=AddTunai::on($cawangan['mysql'])
+            ->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['kodlaluan','=',$request->kodlaluan],['kurang','<>',0]])
+            ->orderBy('recno','desc')
+            ->first();
+
+        }
+    
+        return response()->json($addtunai);
+    }
+
     public function getRequestTeller($kodcaw)
     {
        

routes/web.php

@@ -196,6 +196,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('GetCurrentTunai/{kodcaw}',['uses' =>'TunaiController@getCurrentTunai']);
     $router->get('getAddTunai/{kodcaw}/',['uses' =>'TunaiController@getAddTunai']);
     $router->get('getAddTunai/{kodcaw}/kodlaluan/',['uses' =>'TunaiController@getAddTunaibyKodlaluan']);
+    $router->get('getAddTunaiLatest/{kodcaw}',['uses' =>'TunaiController@getAddTunaibyKodlaluanLatest']);
     $router->put('gadai/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@GadaiHapus']);
     $router->put('tebus/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@TebusHapus']);
     $router->put('gadai/edit/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@deletemarhun']); //deletemarhun edit