diff --git a/app/Events/SerahanPenilai.php b/app/Events/SerahanPenilai.php new file mode 100644 index 0000000..ad64d01 --- /dev/null +++ b/app/Events/SerahanPenilai.php @@ -0,0 +1,31 @@ +kodcaw = $kodcaw; + $this->message = $message; + } + + public function broadcastOn() + { + return ['serahanpenilai-notify']; + } + + public function broadcastAs() + { + return 'trigger-serahanpenilai'; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index a917b00..d27fd92 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/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'); } diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index ad9c60d..43cd81a 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/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() { diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php index 6b9d504..d51bf03 100644 --- a/resources/views/homepage/penilai/home.blade.php +++ b/resources/views/homepage/penilai/home.blade.php @@ -218,7 +218,7 @@
@csrf - +
@@ -281,7 +281,6 @@ var channel = pusher.subscribe('gadai-notify'); channel.bind('trigger-gadai', function(data) { - console.log('push'); fetchGadaianEverytime(); }); diff --git a/resources/views/khazanah/gadaian.blade.php b/resources/views/khazanah/gadaian.blade.php index 67d39cf..37bd4e5 100644 --- a/resources/views/khazanah/gadaian.blade.php +++ b/resources/views/khazanah/gadaian.blade.php @@ -118,7 +118,7 @@ @php $marhun = Http::get($api_url . '/api/marhun/' . $gadaian['norujukan'] )->json(); @endphp - {{$gadaian['norujukan']}} {{ number_format($gadaian['pinjaman'],2) }} @@ -194,6 +194,13 @@