Merge branch 'apiaku' into 'master'

hapus gadai dan notifikasi baiki

See merge request online-sistem1/api_arrahn!13

app/Http/Controllers/GadaiController.php

@@ -1095,4 +1095,49 @@ class GadaiController extends Controller
 
         return response()->json($petibesi_cawangan);
     }
+
+
+    public function GadaiHapus($kodcaw,$norujukan,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->get();
+
+        if($gadai[0]['historygadaian'] != "0")
+        {
+            Gadai::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->update(['sttebus' => '']);
+
+            Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+    
+            Tebus::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->delete();
+    
+            return response('Deleted Successfully', 200);
+        }
+        else
+        {
+            Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+
+            return response('Deleted Successfully', 200);
+        }
+       
+    }
+
+    public function TebusHapus($kodcaw,$norujukan)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $tebus = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->get();
+
+        if($tebus[0]['jenistebus'] == 'T')
+        {
+            Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
+
+            Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+    
+            return response('Deleted Successfully', 200);
+        }
+        else
+            return response('Bukan-Tebus');
+       
+    }
 }

app/Http/Controllers/KelulusanController.php

@@ -19,7 +19,6 @@ class KelulusanController extends Controller
 
       $kelulusan=Mohon::on($cawangan['mysql'])
                ->where('TARIKH','=',$harini->toDateString())
-               ->where('pelulus','=','')
                ->where('masalulus','=','')
                ->get();
 
@@ -36,7 +35,6 @@ class KelulusanController extends Controller
       $kelulusan=Mohon::on($cawangan['mysql'])
                ->where('TARIKH','=',$harini->toDateString())
                ->where('NORUJUKAN','=',$norujukan)
-               ->where('pelulus','<>','')
                ->where('masalulus','<>','')
                ->get();
 

app/Http/Controllers/TebusController.php

@@ -236,6 +236,7 @@ class TebusController extends Controller
                 'bakiupah' => $request->bakiupah,
                 'terima' => "*",
                 'kodgl' => "0",
+                'nowakil' => $request->nowakil,
                 'rebate' => $rebet,
                 'marhuntebus' => $request->marhun,
                 'historygadaian' => $request->historygadaian,

routes/web.php

@@ -65,7 +65,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('gadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanGadai']);
 
     $router->get('gadai/customers/{ic}/outstandingsemasa',['uses'=>'GadaiController@outstandingSemasaCustomer']);
-    $router->get('gadai/updatehistory/{kodcaw}/{norujukan}',['uses'=>'GadaiController@updateHistoryGadai']);
+    $router->put('gadai/updatehistory/{kodcaw}/{norujukan}',['uses'=>'GadaiController@updateHistoryGadai']);
 
 
     //Tebus API
@@ -174,14 +174,13 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('tunai/daftarTunai/{kodcaw}',['uses'=> 'TunaiController@DaftarTunai']);
     $router->put('updateTunai/{kodcaw}/{kodlaluan}',['uses'=>'TunaiController@UpdateTunai']);
     $router->get('getLatestBaki/{kodcaw}',['uses'=>'TunaiController@sumBakiTunai']);
-
     $router->post('add/addTunai/{kodcaw}',['uses'=> 'TunaiController@create']);
-
     $router->get('listSerahMarhunController/{kodcaw}',['uses'=>'TebusController@listPenebusanBaru']);
     $router->get('SenaraiPenebusanKhazanah/{kodcaw}',['uses'=>'TebusController@listSerahKhazanah']);
-
     $router->get('GetCurrentTunai/{kodcaw}/{kodlaluan}',['uses' =>'TunaiController@getCurrentTunai']);
     $router->get('getAddTunai/{kodcaw}/',['uses' =>'TunaiController@getAddTunai']);
+    $router->put('gadai/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@GadaiHapus']);
+    $router->put('tebus/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@TebusHapus']);
 
     //API PANJAR KHAZANAH
     $router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']);