From ae7acc13d6f6cfe5ae62b392b36650e8973e56df Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Mon, 12 Jul 2021 10:47:13 +0800
Subject: [PATCH 1/5] fix

---
 app/Events/NotifikasiUbahHapus.php          | 5 +++--
 app/Http/Controllers/KhazanahController.php | 9 +++++++--
 resources/views/penebusan/index.blade.php   | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/Events/NotifikasiUbahHapus.php b/app/Events/NotifikasiUbahHapus.php
index 897c489..0a27135 100644
--- a/app/Events/NotifikasiUbahHapus.php
+++ b/app/Events/NotifikasiUbahHapus.php
@@ -11,13 +11,14 @@ class NotifikasiUbahHapus implements ShouldBroadcast
 {
   use Dispatchable, InteractsWithSockets, SerializesModels;
 
-  public $norujukan,$kelulusan,$komen;
+  public $norujukan,$kelulusan,$komen,$teller;
 
-  public function __construct($norujukan,$kelulusan,$komen)
+  public function __construct($norujukan,$kelulusan,$komen,$teller)
   {
       $this->norujukan = $norujukan;
       $this->kelulusan = $kelulusan;
       $this->komen = $komen;
+      $this->teller = $teller;
   }
 
   public function broadcastOn()
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 8d20f27..a755345 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -559,6 +559,7 @@ class KhazanahController extends Controller
 
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
 
+        $getlulus = Http::get(config('api.url') . '/api/GetLulus/'. $auth_user['cawangan'],['norujukan' => $norujukan])->json();
 
         if($request->khazanah != null)
         {
@@ -572,7 +573,7 @@ class KhazanahController extends Controller
 
                 if($updatelulus)
                 {
-                    event(new NotifikasiUbahHapus($norujukan,"batal",$request->komenubahhapus));
+                    event(new NotifikasiUbahHapus($norujukan,"batal",$request->komenubahhapus,$getlulus['teller']));
                 }
 
             }else{
@@ -582,7 +583,7 @@ class KhazanahController extends Controller
 
                 if($updatelulus)
                 {
-                    event(new NotifikasiUbahHapus($norujukan,"lulus","tiada"));
+                    event(new NotifikasiUbahHapus($norujukan,"lulus","tiada",$getlulus['teller']));
                 }
             }
         }
@@ -598,6 +599,8 @@ class KhazanahController extends Controller
                         'siri' => $request->siri
                     ])->json();
 
+                    $getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
+
                     if($updatelulus)
                     {
                         event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan));
@@ -2664,6 +2667,8 @@ class KhazanahController extends Controller
         $TotalTunaiDebit = $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong'];
         $TotalTunaiKredit = $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong'];
 
+        
+
         array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $TotalTunaiKredit]); 
         array_push($Debit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['Gadai']]);
         array_push($Debit,['glcode' => '1000/017','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq['Gadai']]);
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 71e36e6..65f21a4 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -1282,7 +1282,7 @@
 
                         var channel = pusher.subscribe('notice-kelulusan');
                         channel.bind('my-kelulusan', function(data) {
-                        
+                            console.log(data);
 
                             if(data.norujukan == norujukan && data.siri == siricreated)
                             {

From 3e88adc19829cde940870d1a6aedffc47a04aca8 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Tue, 13 Jul 2021 17:23:09 +0800
Subject: [PATCH 2/5] fix skit2

---
 app/Http/Controllers/KhazanahController.php     | 17 ++++++++---------
 .../khazanah/laporan/datalejer_am.blade.php     |  2 --
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index a755345..bb4af0d 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -2538,7 +2538,7 @@ class KhazanahController extends Controller
         //array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]);
         if($keuntungan > 0) array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]);
         if($bayaranpendahuluan > 0) array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]);
-        if($rebet > 0) array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
+        if($rebet > 0) array_push($hartasemasa,['glcode' => '5000/240','descpt' => 'Rebet 1','amaun' => ($rebet * -1)]);
         if($imbangduga['serahan'] > 0) array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
         if($pinjamandiberi['pinjamankoop'] > 0) array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]);
         if($pinjamandiberi['emaspalsu'] > 0) array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]);
@@ -2558,14 +2558,14 @@ class KhazanahController extends Controller
 
         if($keuntungan > 0) array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]);
         if($keuntungansebenar > 0) array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]);
-        if($rebet > 0) array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
+        if($rebet > 0) array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet 2','amaun' => ($rebet * -1)]);
         if($imbangduga['pendahuluan'] > 0) array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);
-        if($panjar['bds'] > 0) array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]);
-        if($panjar['perubatan'] > 0) array_push($tanggungansemasa,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]);
-        if($panjar['keraian'] > 0) array_push($tanggungansemasa,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => -$panjar['keraian']]);
+        if($panjar['bds'] > 0) array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'Panjar - Baiki dan Selenggara','amaun' => -$panjar['bds']]);
+        if($panjar['perubatan'] > 0) array_push($tanggungansemasa,['glcode' => '3000/018','descpt' => 'Panjar - Belanja AM','amaun' => -$panjar['perubatan']]);
+        if($panjar['keraian'] > 0) array_push($tanggungansemasa,['glcode' => '3000/019','descpt' => 'Panjar - Keraian Dan Promosi','amaun' => -$panjar['keraian']]);
         if($bakilelong['bakilelong'] != 0) array_push($tanggungansemasa,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]);
         if($bakilelong['rugilelong'] != 0) array_push($tanggungansemasa,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]);
-        if($wtd > 0) array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]);
+        if($wtd > 0) array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'Wang Tak Dituntut','amaun' => $wtd]);
         if($cajlelong > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]);
         if($untungrugiterkumpul > 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]);
         if($cajperkhidmatan > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]);
@@ -2575,7 +2575,7 @@ class KhazanahController extends Controller
         if($rugilelongxtra != 0) array_push($tanggungansemasa,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]);
         if($utgterkumpulxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]);
         if($jualan1stop > 0) array_push($tanggungansemasa,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]);
-  	if($hapuskira > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]);
+        if($hapuskira > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]);
         
         $totaltanggungansemasa = 0;
         foreach($tanggungansemasa as $index => $ts)
@@ -2584,7 +2584,7 @@ class KhazanahController extends Controller
         }
 
         $untungrugifield = [];
-        array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan', 'amaun' => $untungrugi]);
+        array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan Sebenar', 'amaun' => $untungrugi]);
 
 
         $totaluntungrugi = 0;
@@ -2666,7 +2666,6 @@ class KhazanahController extends Controller
 
         $TotalTunaiDebit = $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong'];
         $TotalTunaiKredit = $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong'];
-
         
 
         array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $TotalTunaiKredit]); 
diff --git a/resources/views/khazanah/laporan/datalejer_am.blade.php b/resources/views/khazanah/laporan/datalejer_am.blade.php
index 932e121..0d8e183 100644
--- a/resources/views/khazanah/laporan/datalejer_am.blade.php
+++ b/resources/views/khazanah/laporan/datalejer_am.blade.php
@@ -26,8 +26,6 @@
                       @csrf
                     <div class="row">
                       
-
-
                     <div class="col-sm-2">Mula</div>
                      <div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1"    autocomplete="off"  aria-describedby="basic-addon1"></div>
                       </div>

From c8c93c38ad1cf1657f663e8e763f76c1cd692328 Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Wed, 14 Jul 2021 10:19:16 +0800
Subject: [PATCH 3/5] fix kelulusan

---
 app/Events/NotifikasiKelulusan.php           |  5 +++--
 app/Http/Controllers/KhazanahController.php  | 16 ++++++++++++----
 app/Http/Controllers/OperasiController.php   | 10 ++++++++--
 resources/views/gadaian/index.blade.php      |  7 ++-----
 resources/views/khazanah/kelulusan.blade.php | 11 ++++++++---
 resources/views/operasi/kelulusan.blade.php  |  8 ++++++--
 6 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/app/Events/NotifikasiKelulusan.php b/app/Events/NotifikasiKelulusan.php
index 9b8b081..3bee030 100644
--- a/app/Events/NotifikasiKelulusan.php
+++ b/app/Events/NotifikasiKelulusan.php
@@ -11,14 +11,15 @@ class NotifikasiKelulusan implements ShouldBroadcast
 {
   use Dispatchable, InteractsWithSockets, SerializesModels;
 
-  public $norujukan,$kelulusan,$siri,$komen;
+  public $norujukan,$kelulusan,$siri,$komen,$teller;
 
-  public function __construct($norujukan,$kelulusan,$siri,$komen)
+  public function __construct($norujukan,$kelulusan,$siri,$komen,$teller)
   {
       $this->norujukan = $norujukan;
       $this->kelulusan = $kelulusan;
       $this->siri = $siri;
       $this->komen = $komen;
+      $this->teller = $teller;
   }
 
   public function broadcastOn()
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index bb4af0d..1682a8d 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -596,6 +596,7 @@ class KhazanahController extends Controller
 
                     $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
                         "pengesahan" => "khazanah",
+                        "namakhazanah" => $request->namakhazanah,
                         'siri' => $request->siri
                     ])->json();
 
@@ -603,19 +604,22 @@ class KhazanahController extends Controller
 
                     if($updatelulus)
                     {
-                        event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan));
+                        event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan,$getlulus['teller']));
                     }
 
                 }else{
                     $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
                         "pengesahan" => "khazanah",
                         'siri' => $request->siri,
+                        "namakhazanah" => $request->namakhazanah,
                         "pembatalan" => "batal"
                     ])->json();
 
+                    $getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
+
                     if($updatelulus)
                     {
-                        event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan));
+                        event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$getlulus['teller']));
                     }
 
                 }
@@ -632,6 +636,7 @@ class KhazanahController extends Controller
                     $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
                         "pengesahan" => "operasi",
                         'siri' => $request->siri,
+                        'namaoperasi' => $request->namaoperasi
                     ])->json();
 
                 }else{
@@ -639,10 +644,13 @@ class KhazanahController extends Controller
                     $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
                         "pengesahan" => "operasi",
                         'siri' => $request->siri,
-                        "pembatalan" => "batal"
+                        "pembatalan" => "batal",
+                        'namaoperasi' => $request->namaoperasi
                     ])->json();
 
-                    event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan));
+                    $getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
+
+                    event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$getlulus['teller']));
 
                 }
 
diff --git a/app/Http/Controllers/OperasiController.php b/app/Http/Controllers/OperasiController.php
index 73f1d57..3bacf97 100644
--- a/app/Http/Controllers/OperasiController.php
+++ b/app/Http/Controllers/OperasiController.php
@@ -88,24 +88,30 @@ class OperasiController extends Controller
         {
             $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
                 'sahkan' => 1,
+                'namaoperasi' => $request->namaoperasi,
                 'siri' => $request->siri
             ])->json();
 
+            $getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
+
             if($updatelulus)
             {
-                event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan));
+                event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan,$getlulus['teller']));
             }
         }
         else 
         {
             $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
                 'sahkan' => 2,
+                'namaoperasi' => $request->namaoperasi,
                 'siri' => $request->siri
             ])->json();
 
+            $getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
+
             if($updatelulus)
             {
-                event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan));
+                event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$getlulus['teller']));
             }
         }
      
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index 19e27b9..614d2dc 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -851,9 +851,8 @@
 
                                         var channel = pusher.subscribe('notice-kelulusan');
                                         channel.bind('my-kelulusan', function(data) {
-                                        
 
-                                            if(data.norujukan == norujukan && data.siri == siricreated)
+                                            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                                             {
                                                 if(data.kelulusan == 'lulus')
                                                 {
@@ -969,9 +968,7 @@
                                         channel.bind('my-kelulusan', function(data) {
                                         // let message = JSON.stringify(data);
 
-                                            // console.log(message);
-
-                                            if(data.norujukan == norujukan && data.siri == siricreated)
+                                            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                                             {
                                                 if(data.kelulusan == 'lulus')
                                                 {
diff --git a/resources/views/khazanah/kelulusan.blade.php b/resources/views/khazanah/kelulusan.blade.php
index 0e2068e..47009fb 100644
--- a/resources/views/khazanah/kelulusan.blade.php
+++ b/resources/views/khazanah/kelulusan.blade.php
@@ -264,7 +264,7 @@
     async function updatelulus(e)
     {
         let api = "{{ config('api.url') }}";
-        let kodcaw = " {{ Auth::user()->cawangan }}";
+        let kodcaw = "{{ Auth::user()->cawangan }}";
 
         const { value: katalaluan } = await Swal.fire({
             title: 'Masukkan Katalaluan Semula',
@@ -320,6 +320,7 @@
         let norujukan = $(e).data('norujukan');
         let pelulus = $(e).data('pelulus');
         let siri = $(e).data('siri');
+        let namakhazanah = "{{ Auth::user()->name }}";
 
         $.ajax({
             method:'put',
@@ -329,7 +330,8 @@
                 "norujukan" : norujukan,
                 "pelulus" : pelulus,
                 "siri" : siri,
-                'komen' : komen
+                'komen' : komen,
+                'namakhazanah' : namakhazanah
             },
             success:function(data){
                 Swal.fire({
@@ -397,6 +399,7 @@
         let norujukan = $(e).data('norujukan');
         let pelulus = $(e).data('pelulus');
         let siri = $(e).data('siri');
+        let namakhazanah = "{{ Auth::user()->name }}";
 
         $.ajax({
             method:'put',
@@ -407,7 +410,9 @@
                 "pelulus" : pelulus,
                 "siri" : siri,
                 "komenkelulusan" : komenkelulusan,
-                "pembatalan" : "batal"
+                "pembatalan" : "batal",
+                'namakhazanah' : namakhazanah
+
             },
             success:function(data){
                 Swal.fire({
diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php
index 3b3e707..3434cd3 100644
--- a/resources/views/operasi/kelulusan.blade.php
+++ b/resources/views/operasi/kelulusan.blade.php
@@ -313,6 +313,7 @@
         let norujukan = $(e).data('norujukan');
         let cawangankod = $(e).data('kodcaw');
         let siri = $(e).data('siri');
+        let namaoperasi = "{{ Auth::user()->name }}";
 
         $.ajax({
             method:'put',
@@ -322,7 +323,8 @@
                 "norujukan" : norujukan,
                 "kodcaw" : cawangankod,
                 "komenkelulusan" : komenkelulusan,
-                "siri" : siri
+                "siri" : siri,
+                'namaoperasi' : namaoperasi
             },
             success:function(data){
                 console.log(data);
@@ -391,6 +393,7 @@
         let norujukan = $(e).data('norujukan');
         let siri = $(e).data('siri');
         let cawangankod = $(e).data('kodcaw');
+        let namaoperasi = "{{ Auth::user()->name }}";
 
         $.ajax({
             method:'put',
@@ -401,7 +404,8 @@
                 "siri" : siri,
                 "kodcaw" : cawangankod,
                 "komenkelulusan" : komenkelulusan,
-                "pembatalan" : "batal"
+                "pembatalan" : "batal",
+                'namaoperasi' : namaoperasi
             },
             success:function(data){
                 Swal.fire({

From 68b2cd63cc2169b2e2f5d6e0a3f52aa94675f97b Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 14 Jul 2021 16:43:49 +0800
Subject: [PATCH 4/5] fix sedikit2

---
 app/Http/Controllers/KhazanahController.php  | 58 ++++++++++++++---
 app/Http/Controllers/OperasiController.php   |  8 +--
 resources/views/khazanah/info.blade.php      | 39 +++++++-----
 resources/views/khazanah/kelulusan.blade.php |  6 +-
 resources/views/modal/agh.blade.php          | 65 ++++++++++++++++++++
 resources/views/operasi/kelulusan.blade.php  |  6 ++
 resources/views/penebusan/index.blade.php    |  8 ++-
 routes/web.php                               |  1 +
 8 files changed, 161 insertions(+), 30 deletions(-)

diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 1682a8d..42fbb9d 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -600,11 +600,10 @@ class KhazanahController extends Controller
                         'siri' => $request->siri
                     ])->json();
 
-                    $getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
 
                     if($updatelulus)
                     {
-                        event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan,$getlulus['teller']));
+                        event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan,$request->teller));
                     }
 
                 }else{
@@ -615,11 +614,10 @@ class KhazanahController extends Controller
                         "pembatalan" => "batal"
                     ])->json();
 
-                    $getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
 
                     if($updatelulus)
                     {
-                        event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$getlulus['teller']));
+                        event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$request->teller));
                     }
 
                 }
@@ -648,9 +646,7 @@ class KhazanahController extends Controller
                         'namaoperasi' => $request->namaoperasi
                     ])->json();
 
-                    $getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
-
-                    event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$getlulus['teller']));
+                    event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$request->teller));
 
                 }
 
@@ -2875,6 +2871,54 @@ class KhazanahController extends Controller
         return response($daftarpolis);
     }
 
+    public function SuratAkuanGadaianUpdate(Request $request)
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+
+        $cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+        $cawangan_detail=$cawangan[0];
+
+        $gadai = Http::get(config('api.url').'/api/gadai/norujukan/'.$request->norujukanhidden)->json();
+        
+        foreach($gadai as $index1=>$gad)
+            $customers = Http::get(config('api.url').'/api/customers/'.$gad[0]['nokp'])->json();
+
+        $kodnegeridandaerah = $request->negeriagh .'|' . $request->daerahagh;
+
+        $polis = Http::get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json();
+
+        $daftar = 0;
+    
+            $daftarpolis = Http::put(config('api.url').'/api/polis/edit/',[
+
+                'kodcaw' =>$auth_user['cawangan'],
+                'norujukan' => $request->norujukanhidden,
+                'komen1' => $request->alasan,
+                'komen2' => $kodnegeridandaerah,
+                'teller' => $auth_user['name']
+    
+            ]);
+
+            $daftar = $daftarpolis->getStatusCode();
+       
+        if($daftar == 200)
+        {
+            $polis = Http::get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json();
+
+            event(new NotifikasiAGH($auth_user['cawangan'],'Surat Akuan Gadaian Hilang berjaya dijana.','success',$auth_user['name']));
+            // return redirect()->route('khazanah.customer_info')->with('aghinformation','Surat Akuan Gadaian Hilang berjaya dijana.|success');
+            return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url'));
+
+        }else{
+
+            event(new NotifikasiAGH($auth_user['cawangan'],'Mengalami masalah dalam menjana.','error',$auth_user['name']));
+            // return redirect()->route('khazanah.customer_info')->with('aghinformation','Mengalami masalah dalam menjana.|error');
+        }
+
+        return response($daftarpolis);
+    }
+
     public function ulangcetakSuratAkuanGadaianHilang($norujukan)
     {
         $auth_user = Auth::user();
diff --git a/app/Http/Controllers/OperasiController.php b/app/Http/Controllers/OperasiController.php
index 3bacf97..cf84319 100644
--- a/app/Http/Controllers/OperasiController.php
+++ b/app/Http/Controllers/OperasiController.php
@@ -92,11 +92,9 @@ class OperasiController extends Controller
                 'siri' => $request->siri
             ])->json();
 
-            $getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
-
             if($updatelulus)
             {
-                event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan,$getlulus['teller']));
+                event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan,$request->teller));
             }
         }
         else 
@@ -107,11 +105,9 @@ class OperasiController extends Controller
                 'siri' => $request->siri
             ])->json();
 
-            $getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
-
             if($updatelulus)
             {
-                event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$getlulus['teller']));
+                event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$request->teller));
             }
         }
      
diff --git a/resources/views/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php
index bae662c..9872b31 100644
--- a/resources/views/khazanah/info.blade.php
+++ b/resources/views/khazanah/info.blade.php
@@ -688,23 +688,33 @@
         }
     }
 
-    function ulangcetakagh()
+    function ulangcetakagh(e)
     {
-        if($("input[name='options']:checked").val() == 'belum_tebus'){
+        var komen2 = $(e).data('komen2');
+
+        if(komen2 !== null)
+        {
+            if($("input[name='options']:checked").val() == 'belum_tebus'){
             let histid = $('input[name="belum"]:checked').val();
-            if(histid == null){
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Amaran',
-                    text: 'Sila pilih salah satu SAG'
-                });
-            }else{
-                let urlroute = '{{ route("agh.ulangcetak", ":id") }}';
-                urlroute = urlroute.replace(':id', histid);
-                window.open(urlroute, '_blank');
-                swal.close();
+                if(histid == null){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran',
+                        text: 'Sila pilih salah satu SAG'
+                    });
+                }else{
+                    let urlroute = '{{ route("agh.ulangcetak", ":id") }}';
+                    urlroute = urlroute.replace(':id', histid);
+                    window.open(urlroute, '_blank');
+                    swal.close();
+                }
             }
+        }else{
+            $('#AGHModalEdit').modal('show');
+            swal.close(); 
         }
+
+        return;
     }
 
     function saghilangfunc()
@@ -724,6 +734,7 @@
                     data:{ "norujukan" : histid,"kodcaw" : kodcaw},
                     success:function(data)
                     {
+
                         var count = Object.keys(data).length;
 
                         if(count > 0)
@@ -735,7 +746,7 @@
                                 showConfirmButton: false,
                                 html:   "<br>" +
                                         '<button type="button" role="button" tabindex="0" class="btn btn-primary mr-1" onclick="swal.close()">' + 'Okay' + '</button>' +
-                                        '<button type="button" role="button" tabindex="0" class="btn btn-primary" onclick="ulangcetakagh()">' + 'Ulang Cetak' + '</button>',
+                                        '<button type="button" role="button" tabindex="0" class="btn btn-primary" onclick="ulangcetakagh(this)" data-komen2="' + data[0].komen2 + '">' + 'Ulang Cetak' + '</button>',
                                 icon: 'error',
                                 title: 'Surat Akuan Gadaian Hilang telah dikeluarkan!'
                             });
diff --git a/resources/views/khazanah/kelulusan.blade.php b/resources/views/khazanah/kelulusan.blade.php
index 47009fb..5c9909c 100644
--- a/resources/views/khazanah/kelulusan.blade.php
+++ b/resources/views/khazanah/kelulusan.blade.php
@@ -311,6 +311,7 @@
             allowOutsideClick: false
         })
 
+        let teller = $(e).closest('tr').children('td:eq(1)').text();
         let nm = $(e).closest('tr').children('td:eq(4)').text();
         let ber = $(e).closest('tr').children('td:eq(5)').text();
         let marg = $(e).closest('tr').children('td:eq(6)').text();
@@ -322,6 +323,8 @@
         let siri = $(e).data('siri');
         let namakhazanah = "{{ Auth::user()->name }}";
 
+        teller = String(teller);
+
         $.ajax({
             method:'put',
             url: "{{ route('khazanah.updatekelulusan') }}",
@@ -331,7 +334,8 @@
                 "pelulus" : pelulus,
                 "siri" : siri,
                 'komen' : komen,
-                'namakhazanah' : namakhazanah
+                'namakhazanah' : namakhazanah,
+                'teller' : teller
             },
             success:function(data){
                 Swal.fire({
diff --git a/resources/views/modal/agh.blade.php b/resources/views/modal/agh.blade.php
index 0f2f7d3..276889f 100644
--- a/resources/views/modal/agh.blade.php
+++ b/resources/views/modal/agh.blade.php
@@ -63,4 +63,69 @@
   </div>
 
 
+    <!-- Modal HistoryBayaran -->
+    <div class="modal fade" id="AGHModalEdit" tabindex="-1" role="dialog" aria-labelledby="ModalCenterTitle" aria-hidden="true">
+      <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title text-center" id="ModalTitle">Surat Akuan Gadaian Hilang</h5>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+          </div>
+          <div class="modal-body">  
+            
+            <div class="container">
+              <form name="frmagh" target="_blank" action="{{ route('agh.update') }}" onsubmit="return checkAGH();" method="POST">
+                @csrf
+                <input type="hidden" name="norujukanhidden" id="norujukanhidden"/>
+              <div class="col-12 row">
+                <div class="col-5"><label class="mt-1">Jenis Alasan :</label></div>
+                <div class="col-7">
+                  <select name="alasan" id="alasan" class="form-control">
+                    <option value="Simpanan">Simpanan</option>
+                    <option value="Bencana alam">Bencana alam</option>
+                    <option value="Kecurian">Kecurian</option>
+                    <option value="Di Ragut">Di Ragut</option>
+                    <option value="Kes Polis">Kes Polis</option>
+                    <option value="Hilang">Hilang</option>
+                  </select>
+                </div>
+              </div>
+  
+              <div class="col-12 row mt-2">
+                <div class="col-5"><label class="mt-1">Negeri :</label></div>
+                <div class="col-7">
+                  <select name="negeriagh" id="negeriagh" class="form-control">
+                    @foreach($negeri as $neg)
+                    <option value="{{ $neg['kodnegeri'] }}">{{ $neg['negeri'] }}</option>
+                    @endforeach
+                  </select>
+                </div>
+              </div>
+  
+  
+              <div class="col-12 row mt-2">
+                <div class="col-5"><label class="mt-1">Daerah :</label></div>
+                <div class="col-7">
+                  <select name="daerahagh" id="daerahagh" class="form-control" disabled>
+                    <option value="No Data">Sila Pilih Negeri *</option>
+                  </select>
+                </div>
+              </div>
+            </div>
+  
+            
+          </div>
+  
+          <div class="modal-footer">
+              <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
+              <button type="submit" class="btn btn-success">Hantar</button>
+          </div>
+        </form>
+        </div>
+      </div>
+    </div>
+
+
 
diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php
index 3434cd3..5fc702c 100644
--- a/resources/views/operasi/kelulusan.blade.php
+++ b/resources/views/operasi/kelulusan.blade.php
@@ -314,7 +314,13 @@
         let cawangankod = $(e).data('kodcaw');
         let siri = $(e).data('siri');
         let namaoperasi = "{{ Auth::user()->name }}";
+        let teller = $(e).closest('tr').children('td:eq(1)').text();
 
+        teller = String(teller);
+
+        console.log(teller);
+
+        return;
         $.ajax({
             method:'put',
             url: "{{ route('operasi.updatekelulusan') }}",
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 65f21a4..0d43793 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -2417,7 +2417,11 @@
     {
         let wakil = $('#wakiltxt').val();
 
-        if(wakil.length == 12)
+        var patternregex = /\s+|[-,\/]/g;
+
+        wakil = wakil.replace(patternregex,"").toUpperCase();
+
+        if(wakil.length <= 12)
         {
             $.ajax({
                 method:'GET',
@@ -2465,7 +2469,7 @@
         {
             Swal.fire({
                 icon: 'error',
-                titleText: 'Kad Pengenalan',
+                titleText: 'Kad Pengenalan dan Passport',
                 text: 'mestilah tidak melebihi dan kurang daripada 12 patah perkataan'
             });
         }
diff --git a/routes/web.php b/routes/web.php
index eb9ecc0..933a1fe 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -250,6 +250,7 @@ Route::get('/komoditi/rekod',['as'=>'rekod.komoditi','uses'=>'KomuditiController
 Route::get('/komoditi/rekod/print',['as'=>'komoditi.rekod.print','uses'=>'KomuditiController@printRekodTransaksi']);
 
 Route::post('/khazanah/suratakuangadaian',['as'=>'agh.create','uses'=>'KhazanahController@SuratAkuanGadaian'])->middleware('auth','khazanah');
+Route::put('/khazanah/suratakuangadaian',['as'=>'agh.update','uses'=>'KhazanahController@SuratAkuanGadaianUpdate'])->middleware('auth','khazanah');
 Route::get('/khazanah/ulangcetakagh/{norujukan}',['as'=>'agh.ulangcetak','uses'=>'KhazanahController@ulangcetakSuratAkuanGadaianHilang'])->middleware('auth','khazanah');
 
 

From f7b26a0c472ca3c97e88ac6b7dbd113d6889404f Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Thu, 15 Jul 2021 04:38:12 +0800
Subject: [PATCH 5/5] fix polis

---
 app/Events/OperasiNotice.php                 |  2 +-
 app/Http/Controllers/KhazanahController.php  |  6 ++--
 resources/views/customers/info.blade.php     | 15 ++++++---
 resources/views/gadaian/edit.blade.php       |  4 +--
 resources/views/khazanah/info.blade.php      | 32 ++++++++++++++++++--
 resources/views/khazanah/kelulusan.blade.php | 19 ++++++++++--
 resources/views/lelongan/index.blade.php     |  4 ++-
 resources/views/modal/agh.blade.php          |  8 ++---
 resources/views/operasi/kelulusan.blade.php  |  6 +++-
 resources/views/penebusan/index.blade.php    | 12 ++++----
 routes/web.php                               |  2 +-
 11 files changed, 81 insertions(+), 29 deletions(-)

diff --git a/app/Events/OperasiNotice.php b/app/Events/OperasiNotice.php
index 519b617..7098b18 100644
--- a/app/Events/OperasiNotice.php
+++ b/app/Events/OperasiNotice.php
@@ -11,7 +11,7 @@ class OperasiNotice implements ShouldBroadcast
 {
   use Dispatchable, InteractsWithSockets, SerializesModels;
 
-  public $cawangan,$namateller;
+  public $cawangan,$namakhazanah;
 
   public function __construct($cawangan,$namakhazanah)
   {
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 42fbb9d..1c17191 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -573,7 +573,7 @@ class KhazanahController extends Controller
 
                 if($updatelulus)
                 {
-                    event(new NotifikasiUbahHapus($norujukan,"batal",$request->komenubahhapus,$getlulus['teller']));
+                    event(new NotifikasiUbahHapus($norujukan,"batal",$request->komenubahhapus,$request->teller));
                 }
 
             }else{
@@ -583,7 +583,7 @@ class KhazanahController extends Controller
 
                 if($updatelulus)
                 {
-                    event(new NotifikasiUbahHapus($norujukan,"lulus","tiada",$getlulus['teller']));
+                    event(new NotifikasiUbahHapus($norujukan,"lulus","tiada",$request->teller));
                 }
             }
         }
@@ -2916,7 +2916,7 @@ class KhazanahController extends Controller
             // return redirect()->route('khazanah.customer_info')->with('aghinformation','Mengalami masalah dalam menjana.|error');
         }
 
-        return response($daftarpolis);
+        return response($daftar);
     }
 
     public function ulangcetakSuratAkuanGadaianHilang($norujukan)
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index ad42b14..c7a01d7 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -561,7 +561,7 @@
                                 channel.bind('my-kelulusan', function(data) {
                                 
 
-                                    if(data.norujukan == norujukan && data.siri == siricreated)
+                                    if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                                     {
                                         if(data.kelulusan == 'lulus')
                                         {
@@ -1203,10 +1203,12 @@
                                         encrypted: true
                                         });
 
+                        let teller = "{{ Auth::user()->name }}";
+
                         var channel = pusher.subscribe('notice-ubahhapus');
                         channel.bind('my-ubahhapus', function(data) {
 
-                            if(data.norujukan == norujukan)
+                            if(data.norujukan == norujukan && data.teller == teller)
                             {
                                 if(data.kelulusan == 'lulus')
                                 {
@@ -1416,10 +1418,12 @@
                                         encrypted: true
                                         });
 
+                    let teller = "{{ Auth::user()->name }}";
+
                     var channel = pusher.subscribe('notice-ubahhapus');
                     channel.bind('my-ubahhapus', function(data) {
 
-                        if(data.norujukan == ubahid)
+                        if(data.norujukan == ubahid && data.teller == teller)
                         {
                             if(data.kelulusan == 'lulus')
                             {
@@ -1565,6 +1569,8 @@
                     }
                 }); 
 
+                let teller = "{{ Auth::user()->name }}";
+
                 var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
                                         cluster: 'ap1',
                                         encrypted: true
@@ -1573,7 +1579,7 @@
                 var channel = pusher.subscribe('notice-ubahhapus');
                 channel.bind('my-ubahhapus', function(data) {
 
-                    if(data.norujukan == id)
+                    if(data.norujukan == id && data.teller == teller)
                     {
                         if(data.kelulusan == 'lulus')
                         {
@@ -1583,7 +1589,6 @@
                                     title: 'Telah Disahkan'
                             }).then(function(){
 
-                                let teller = "{{ Auth::user()->name }}";
 
                                 if($("input[name='options']:checked").val() == 'belum_tebus'){
                                     $.ajax({
diff --git a/resources/views/gadaian/edit.blade.php b/resources/views/gadaian/edit.blade.php
index 53c90eb..822b40e 100644
--- a/resources/views/gadaian/edit.blade.php
+++ b/resources/views/gadaian/edit.blade.php
@@ -939,7 +939,7 @@
                             channel.bind('my-kelulusan', function(data) {
                             
 
-                                if(data.norujukan == norujukan && data.siri == siricreated)
+                                if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                                 {
                                     if(data.kelulusan == 'lulus')
                                     {
@@ -1046,7 +1046,7 @@
 
                                 // console.log(message);
 
-                                if(data.norujukan == norujukan && data.siri == siricreated)
+                                if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                                 {
                                     if(data.kelulusan == 'lulus')
                                     {
diff --git a/resources/views/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php
index 9872b31..bbcde99 100644
--- a/resources/views/khazanah/info.blade.php
+++ b/resources/views/khazanah/info.blade.php
@@ -556,7 +556,7 @@
 
     function checkAGH()
     {
-
+        $('AGHModalEdit').hide();
     }
 
     function checktuntutbaki(e)
@@ -691,6 +691,7 @@
     function ulangcetakagh(e)
     {
         var komen2 = $(e).data('komen2');
+        var noruj = $(e).data('histid');
 
         if(komen2 !== null)
         {
@@ -711,6 +712,7 @@
             }
         }else{
             $('#AGHModalEdit').modal('show');
+            $('#norujukanhiddenedit').val(noruj);
             swal.close(); 
         }
 
@@ -746,7 +748,7 @@
                                 showConfirmButton: false,
                                 html:   "<br>" +
                                         '<button type="button" role="button" tabindex="0" class="btn btn-primary mr-1" onclick="swal.close()">' + 'Okay' + '</button>' +
-                                        '<button type="button" role="button" tabindex="0" class="btn btn-primary" onclick="ulangcetakagh(this)" data-komen2="' + data[0].komen2 + '">' + 'Ulang Cetak' + '</button>',
+                                        '<button type="button" role="button" tabindex="0" class="btn btn-primary" data-histid="' + histid + '" onclick="ulangcetakagh(this)" data-komen2="' + data[0].komen2 + '">' + 'Ulang Cetak' + '</button>',
                                 icon: 'error',
                                 title: 'Surat Akuan Gadaian Hilang telah dikeluarkan!'
                             });
@@ -802,6 +804,24 @@
         
     });
 
+    $('#negeriaghedit').change(function(){
+
+        var daerahselect = document.getElementById("daerahaghedit");
+
+        $('#daerahaghedit').attr('disabled', false);
+        $(daerahagh).empty();
+        $.ajax({
+            method:'get',
+            url: api_url + '/api/daerahkodnegeri/' + this.value,
+            success:function(data){
+                $.each(data, function( index, daerah ){
+                    addOptionEdit(daerah.koddaerah,daerah.namadaerah);
+                });
+            }
+        });
+
+    });
+
     function addOption(textopt,valueopt) {
 
         optionText = textopt;
@@ -810,6 +830,14 @@
         $('#daerahagh').append(`<option value='${optionText}'>${optionValue}</option>`);
     }
 
+    function addOptionEdit(textopt,valueopt) {
+
+        optionText = textopt;
+        optionValue = valueopt;
+
+        $('#daerahaghedit').append(`<option value='${optionText}'>${optionValue}</option>`);
+    }
+
     
 
     function rekodasal(gadaian){
diff --git a/resources/views/khazanah/kelulusan.blade.php b/resources/views/khazanah/kelulusan.blade.php
index 5c9909c..020e583 100644
--- a/resources/views/khazanah/kelulusan.blade.php
+++ b/resources/views/khazanah/kelulusan.blade.php
@@ -400,11 +400,14 @@
             allowOutsideClick: false
         })
 
+        let teller = $(e).closest('tr').children('td:eq(1)').text();
         let norujukan = $(e).data('norujukan');
         let pelulus = $(e).data('pelulus');
         let siri = $(e).data('siri');
         let namakhazanah = "{{ Auth::user()->name }}";
 
+        teller = String(teller);
+
         $.ajax({
             method:'put',
             url: "{{ route('khazanah.updatekelulusan') }}",
@@ -415,7 +418,8 @@
                 "siri" : siri,
                 "komenkelulusan" : komenkelulusan,
                 "pembatalan" : "batal",
-                'namakhazanah' : namakhazanah
+                'namakhazanah' : namakhazanah,
+                'teller' : teller
 
             },
             success:function(data){
@@ -476,15 +480,19 @@
 
 
         let norujukan = $(e).data('norujukan');
+        let teller = $(e).closest('tr').children('td:eq(1)').text();
         let namakhazanah = "{{ $auth_user = Auth::user()->name }}";
 
+        teller = String(teller);
+
         $.ajax({
             method:'put',
             url: "{{ route('khazanah.updatekelulusan') }}",
             data: {
                 "_token": "{{ csrf_token() }}",
                 "norujukan" : norujukan,
-                "khazanah" : namakhazanah
+                "khazanah" : namakhazanah,
+                'teller' : teller
             },
             success:function(data){
                 
@@ -552,6 +560,9 @@
 
         let norujukan = $(e).data('norujukan');
         let namakhazanah = "{{ $auth_user = Auth::user()->name }}";
+        let teller = $(e).closest('tr').children('td:eq(1)').text();
+
+        teller = String(teller);
 
         $.ajax({
             method:'put',
@@ -561,7 +572,9 @@
                 "norujukan" : norujukan,
                 "khazanah" : namakhazanah,
                 "komenubahhapus" : komenkelulusan,
-                "batal" : 'batal'
+                "batal" : 'batal',
+                'teller' : teller
+
             },
             success:function(data){
                 
diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php
index de0ebe8..85af903 100644
--- a/resources/views/lelongan/index.blade.php
+++ b/resources/views/lelongan/index.blade.php
@@ -307,11 +307,13 @@
                                             encrypted: true
                                             });
 
+                        let teller = "{{ Auth::user()->name }}";
+                        
                         var channel = pusher.subscribe('notice-ubahhapus');
                         channel.bind('my-ubahhapus', function(data) {
 
 
-                            if(data.norujukan == norujukan)
+                            if(data.norujukan == norujukan && data.teller == teller)
                             {
                                 if(data.kelulusan == 'lulus')
                                 {
diff --git a/resources/views/modal/agh.blade.php b/resources/views/modal/agh.blade.php
index 276889f..e81f715 100644
--- a/resources/views/modal/agh.blade.php
+++ b/resources/views/modal/agh.blade.php
@@ -78,11 +78,11 @@
             <div class="container">
               <form name="frmagh" target="_blank" action="{{ route('agh.update') }}" onsubmit="return checkAGH();" method="POST">
                 @csrf
-                <input type="hidden" name="norujukanhidden" id="norujukanhidden"/>
+                <input type="hidden" name="norujukanhidden" id="norujukanhiddenedit"/>
               <div class="col-12 row">
                 <div class="col-5"><label class="mt-1">Jenis Alasan :</label></div>
                 <div class="col-7">
-                  <select name="alasan" id="alasan" class="form-control">
+                  <select name="alasan" id="alasanedit" class="form-control">
                     <option value="Simpanan">Simpanan</option>
                     <option value="Bencana alam">Bencana alam</option>
                     <option value="Kecurian">Kecurian</option>
@@ -96,7 +96,7 @@
               <div class="col-12 row mt-2">
                 <div class="col-5"><label class="mt-1">Negeri :</label></div>
                 <div class="col-7">
-                  <select name="negeriagh" id="negeriagh" class="form-control">
+                  <select name="negeriagh" id="negeriaghedit" class="form-control">
                     @foreach($negeri as $neg)
                     <option value="{{ $neg['kodnegeri'] }}">{{ $neg['negeri'] }}</option>
                     @endforeach
@@ -108,7 +108,7 @@
               <div class="col-12 row mt-2">
                 <div class="col-5"><label class="mt-1">Daerah :</label></div>
                 <div class="col-7">
-                  <select name="daerahagh" id="daerahagh" class="form-control" disabled>
+                  <select name="daerahagh" id="daerahaghedit" class="form-control" disabled>
                     <option value="No Data">Sila Pilih Negeri *</option>
                   </select>
                 </div>
diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php
index 5fc702c..4d661a1 100644
--- a/resources/views/operasi/kelulusan.blade.php
+++ b/resources/views/operasi/kelulusan.blade.php
@@ -400,6 +400,9 @@
         let siri = $(e).data('siri');
         let cawangankod = $(e).data('kodcaw');
         let namaoperasi = "{{ Auth::user()->name }}";
+        let teller = $(e).closest('tr').children('td:eq(1)').text();
+
+        teller = String(teller);
 
         $.ajax({
             method:'put',
@@ -411,7 +414,8 @@
                 "kodcaw" : cawangankod,
                 "komenkelulusan" : komenkelulusan,
                 "pembatalan" : "batal",
-                'namaoperasi' : namaoperasi
+                'namaoperasi' : namaoperasi,
+                'teller' : teller
             },
             success:function(data){
                 Swal.fire({
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 0d43793..572acd3 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -1284,7 +1284,7 @@
                         channel.bind('my-kelulusan', function(data) {
                             console.log(data);
 
-                            if(data.norujukan == norujukan && data.siri == siricreated)
+                            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                             {
                                 if(data.kelulusan == 'lulus')
                                 {
@@ -1412,7 +1412,7 @@
                         channel.bind('my-kelulusan', function(data) {
                         
 
-                            if(data.norujukan == norujukan && data.siri == siricreated)
+                            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                             {
                                 if(data.kelulusan == 'lulus')
                                 {
@@ -1558,7 +1558,7 @@
                         channel.bind('my-kelulusan', function(data) {
                         
 
-                            if(data.norujukan == norujukan && data.siri == siricreated)
+                            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                             {
                                 if(data.kelulusan == 'lulus')
                                 {
@@ -1686,7 +1686,7 @@
                         channel.bind('my-kelulusan', function(data) {
                         
 
-                            if(data.norujukan == norujukan && data.siri == siricreated)
+                            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                             {
                                 if(data.kelulusan == 'lulus')
                                 {
@@ -1902,7 +1902,7 @@
                         channel.bind('my-kelulusan', function(data) {
                         
 
-                            if(data.norujukan == norujukan && data.siri == siricreated)
+                            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                             {
                                 if(data.kelulusan == 'lulus')
                                 {
@@ -2030,7 +2030,7 @@
                         channel.bind('my-kelulusan', function(data) {
                         
 
-                            if(data.norujukan == norujukan && data.siri == siricreated)
+                            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
                             {
                                 if(data.kelulusan == 'lulus')
                                 {
diff --git a/routes/web.php b/routes/web.php
index 933a1fe..bbcada0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -250,7 +250,7 @@ Route::get('/komoditi/rekod',['as'=>'rekod.komoditi','uses'=>'KomuditiController
 Route::get('/komoditi/rekod/print',['as'=>'komoditi.rekod.print','uses'=>'KomuditiController@printRekodTransaksi']);
 
 Route::post('/khazanah/suratakuangadaian',['as'=>'agh.create','uses'=>'KhazanahController@SuratAkuanGadaian'])->middleware('auth','khazanah');
-Route::put('/khazanah/suratakuangadaian',['as'=>'agh.update','uses'=>'KhazanahController@SuratAkuanGadaianUpdate'])->middleware('auth','khazanah');
+Route::post('/khazanah/suratakuangadaianedit',['as'=>'agh.update','uses'=>'KhazanahController@SuratAkuanGadaianUpdate'])->middleware('auth','khazanah');
 Route::get('/khazanah/ulangcetakagh/{norujukan}',['as'=>'agh.ulangcetak','uses'=>'KhazanahController@ulangcetakSuratAkuanGadaianHilang'])->middleware('auth','khazanah');