Merge branch 'apiaku' into 'master'

change marhun and kelulusan

See merge request online-sistem1/api_arrahn!15

app/Http/Controllers/KelulusanController.php

@@ -127,7 +127,7 @@ class KelulusanController extends Controller
 
    //KEPOHONAN EDIT DAN HAPUS
 
-   public function kepohonanubahdanhapus(REQUEST $request,$kodcaw,$norujukan)
+   public function kepohonancreate(REQUEST $request,$kodcaw,$norujukan)
    {
       $harini = Carbon::now();
       $harini = new Carbon;
@@ -137,16 +137,86 @@ class KelulusanController extends Controller
       $mohonid=Mohonid::on($cawangan['mysql'])
       ->create([ 
                'tarikh'=> $harini->toDateString(),
-               'onlineid'=> $onlineid,
                'mohon' => $request->mohon,
-               'norujukan' => $request->norujukan,
+               'norujukan' => $norujukan,
-               'id' => $request->dategadai,
+               'benar' => '0',
-               'katalaluan' => $request->bilgadai,
+               'teller' => $request->teller
-               'benar' => $request->jumpinjam,
-               'teler' => $request->jenistebus
       ]);
 
-      return response()->json($mohonid);
+      return response()->json($mohonid,201);
+   }
+
+   public function updatekepohonankhazanah($kodcaw,$norujukan,Request $request)
+   {
+      $harini = Carbon::now();
+      $harini = new Carbon;
+
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+      $kelulusan=Mohonid::on($cawangan['mysql'])
+               ->where('tarikh','=',$harini->toDateString())
+               ->where('norujukan','=',$norujukan)
+               ->update(array(
+                     'benar' => '1',
+                     'id' => $request->khazanah
+                  
+                     ));
+
+      return response()->json($kelulusan,202);
+   }
+
+   public function kepohonangetteller(Request $request,$kodcaw)
+   {
+      $harini = Carbon::now();
+      $harini = new Carbon;
+
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+      $kelulusan=Mohonid::on($cawangan['mysql'])
+               ->where('tarikh','=',$harini->toDateString())
+               ->where('norujukan','=',$request->norujukan)
+               ->orderBy('recno','desc')
+               ->first();
+
+      return response()->json($kelulusan,200);
+   }
+
+   public function listkepohonan($kodcaw)
+   {
+      $harini = Carbon::now();
+      $harini = new Carbon;
+
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+      $kelulusan=Mohonid::on($cawangan['mysql'])
+      ->where('tarikh','=',$harini->toDateString())
+      ->where('benar','=', 0)
+      ->orderBy('recno','desc')
+      ->get();
+
+      return response()->json($kelulusan,200);
+   }
+
+   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','=','')
+               ->get();
+
+         if(sizeof($kelulusan) != 0){
+             array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]);
+         }
+     }      
+
+      return response()->json($arraykelulusan,200);
    }
 
 }

app/Http/Controllers/MarhunController.php

@@ -99,7 +99,6 @@ class MarhunController extends Controller
                 'harga' => $request->harga,
                 'n_marhun' => $request->n_marhun
             ]);
-        
 
         return response('Edit Successfully', 200);
     }

routes/web.php

@@ -203,7 +203,12 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('SenaraiDahLulus/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@listdahlulus']);
     $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']);
+    $router->get('GetLulus/{kodcaw}/',['uses'=>'KelulusanController@kepohonangetteller']);
+    $router->put('UpdateKelulusan/kepohonan/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@updatekepohonankhazanah']);
+    $router->get('GetLulusAll/{kodcaw}/',['uses'=>'KelulusanController@listkepohonan']);
+    $router->get('ListOperasi/',['uses'=>'KelulusanController@listoperasi']);
+    
 
 
     //API REQUEST TELLER