Merge branch 'lapfix' of https://gitlab.com/online-sistem1/kaunter into lapfix

app/Http/Controllers/GadaianController.php

@@ -6,6 +6,7 @@ namespace App\Http\Controllers;
 use App\Events\StatusLiked;
 use App\Events\NotifikasiPembayaran;
 use App\Events\Dashboard\GadaiNotify;
+use App\Events\SerahanPenilai;
 
 
 use Illuminate\Http\Request;
@@ -282,6 +283,8 @@ class GadaianController extends Controller
             }
         }
 
+        event(new SerahanPenilai($auth_user['cawangan'],"LULUS"));
+
         return redirect()->route('home');
     }
 

app/Http/Controllers/PenebusanController.php

@@ -5,6 +5,8 @@ namespace App\Http\Controllers;
 //Events
 use App\Events\Dashboard\TebusNotify;
 use App\Events\Dashboard\KeuntunganNotify;
+use App\Events\Dashboard\GadaiNotify;
+use App\Events\SerahanPenilai;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
@@ -66,9 +68,9 @@ class PenebusanController extends Controller
 
         if($updatetebus)
         {
-            return response('success');
+            event(new TebusNotify('lulus',Auth::user()->cawangan));
 
-            event(new TebusNotify('lulus',$auth_user['cawangan']));
+            return response('success');
         }else{
             return response('fail');
         }
@@ -117,6 +119,8 @@ class PenebusanController extends Controller
             'bakiakhir' => $bakiakhir
         ]);
 
+        event(new KeuntunganNotify('lulus',Auth::user()->cawangan));
+
         return response()->json($updateTunai,200);
     }
 
@@ -376,6 +380,8 @@ class PenebusanController extends Controller
             ])->json();
         }
 
+        event(new TebusNotify('lulus',Auth::user()->cawangan));
+        event(new GadaiNotify('lulus',Auth::user()->cawangan));
         $this->AliranTunaiController->alirantunaiTebus($request);
 
     }
@@ -513,6 +519,8 @@ class PenebusanController extends Controller
             ])->json();
         }
 
+        event(new TebusNotify('lulus',Auth::user()->cawangan));
+        event(new GadaiNotify('lulus',Auth::user()->cawangan));
         $this->AliranTunaiController->alirantunaiTebusAutoTawarruq($request);
 
 
@@ -658,6 +666,9 @@ class PenebusanController extends Controller
    
         }
 
+        event(new TebusNotify('lulus',Auth::user()->cawangan));
+        event(new GadaiNotify('lulus',Auth::user()->cawangan));
+
         $this->AliranTunaiController->alirantunaiTebus($request);
 
 
@@ -666,7 +677,7 @@ class PenebusanController extends Controller
     }
 
 
-    //Wakil Function - Jangan kacau saya nak makan kacang ni!!
+    //Wakil Function
 
     public function getfirstWakil()
     {