From 8a3598fa245c36a8b0b9c6c4ece23640413cfc0c Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Tue, 17 Jun 2025 02:20:54 +0800
Subject: [PATCH 1/6] loading waiting for approval when refresh

---
 app/Http/Controllers/CustomersController.php |  6 ++-
 resources/views/customers/v2/info.blade.php  |  4 +-
 resources/views/errors/alert.blade.php       | 43 ++++++++++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 resources/views/errors/alert.blade.php

diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php
index c5b978d..3669c77 100644
--- a/app/Http/Controllers/CustomersController.php
+++ b/app/Http/Controllers/CustomersController.php
@@ -65,12 +65,16 @@ class CustomersController extends Controller
 
         $customer_page = ($cawangan_info['version'] == 'v1') ? 'customers.v1.info' : 'customers.v2.info';
 
+        $getApprovalError = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/ansuran/getApproval',[
+            'kodcaw' => $auth_user['cawangan'],
+            'teller' => $auth_user['name'],
+        ])->json();
 
         if($request->tebus_auto_tawarruq_berjaya === 'true'){
             $request->session()->flash('activate_tab', 'SAG_baru');
         }
 
-        return view($customer_page,compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi','pekerjaan'));
+        return view($customer_page,compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi','pekerjaan','ugama','getApprovalError'));
     }
 
     public function search(Request $request){
diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php
index f9baeeb..79ac4c6 100644
--- a/resources/views/customers/v2/info.blade.php
+++ b/resources/views/customers/v2/info.blade.php
@@ -9,6 +9,7 @@
 @section('content')
 @include('modal.historytebus')
 @include('modal.wakil')
+@include('errors.alert', ['errorapproval' => $getApprovalError ?? null])
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-12 col-lg-12">
@@ -264,7 +265,7 @@
                         <button class="btn btn-primary" onclick="ubahfunc(this)" id="button-edit-gadaian">Ubah</button>
                         <button class="btn btn-primary" onclick="hapusfunc()">Hapus</button>
                         <button class="btn btn-primary" onclick="histfunc()">Rekod Pembiayaan</button>
-                        {{-- <button class="btn btn-primary" onclick="removeansuran(this)" id="button-remove-ansuran">Hapus Ansuran</button> --}}
+                        <button class="btn btn-primary" onclick="removeansuran(this)" id="button-remove-ansuran">Hapus Ansuran</button>
                     </div>
 
                 </div>
@@ -2905,6 +2906,7 @@
                         title: 'Telah Disahkan',
                         text: `Komen : ${data.komen}`
                     }).then(function(){
+                        console.log("delete ansuran",tarikh,kodcaw,norujukan,tg_id);
                         deleteFuncAnsuran(tarikh,kodcaw,norujukan,tg_id);
                         return true;
                     });
diff --git a/resources/views/errors/alert.blade.php b/resources/views/errors/alert.blade.php
new file mode 100644
index 0000000..f4661b9
--- /dev/null
+++ b/resources/views/errors/alert.blade.php
@@ -0,0 +1,43 @@
+@if($errorapproval)
+    <script>
+        Swal.fire({
+            title: 'Tunggu Pengesahan Daripada Khazanah.',
+            icon: 'info',
+            width: 600,
+            padding: '3em',
+            background: '#fffff',
+            showCancelButton: false,
+            showConfirmButton: false,
+            allowOutsideClick: false,
+            allowEscapeKey: false,
+            allowEnterKey: false
+        })
+
+        getPusherResponse();
+
+        async function getPusherResponse(){
+            let api_url = "<?php echo $api_url ?>";
+            const jsonData = {
+                norujukan: "{{ $errorapproval['norujukan'] }}",
+                kodcaw: "{{ Auth::user()->cawangan }}",
+            };
+
+            const queryString = new URLSearchParams(jsonData).toString();
+
+            let ansuranlatest = await fetch(api_url + '/admin/ansuran/getLatest?' + queryString)
+                                .then(response => response.json())
+                                .then(response => {return response});
+            
+            console.log("Ansuran Latest:", ansuranlatest);
+        
+            console.log("{{ $errorapproval['norujukan'] }}","{{ $errorapproval['siri'] }}",ansuranlatest['created_at'],ansuranlatest['id']);
+            try{
+                let pusherresponse = await PusherResponse("{{ $errorapproval['norujukan'] }}","{{ $errorapproval['siri'] }}",ansuranlatest['created_at'],ansuranlatest['id']);
+
+            }catch(error){
+                console.error("Error:", error);
+            }
+        }
+
+    </script>
+@endif
\ No newline at end of file

From 00c4b9d55e2475d39cbfbef95ddebc26844f41b2 Mon Sep 17 00:00:00 2001
From: Hafifie PKB <muhdhafifie97@gmail.com>
Date: Mon, 30 Jun 2025 13:40:53 +0800
Subject: [PATCH 2/6] hapus ansuran extended for audit trail and box comment

---
 app/Http/Controllers/GadaianController.php    |  6 +-
 .../Controllers/HapusAnsuranController.php    | 63 +++++++++++++++++++
 app/Http/Controllers/KhazanahController.php   | 12 ++--
 app/Http/Controllers/OperasiController.php    | 63 +++++++++++++------
 resources/views/customers/v2/index.blade.php  |  8 +++
 resources/views/customers/v2/info.blade.php   | 46 +++++++++++---
 resources/views/khazanah/kelulusan.blade.php  | 27 +++++---
 resources/views/operasi/kelulusan.blade.php   | 14 ++++-
 8 files changed, 191 insertions(+), 48 deletions(-)
 create mode 100644 app/Http/Controllers/HapusAnsuranController.php

diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index 1baecd6..eb6e6b8 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -857,7 +857,11 @@ class GadaianController extends Controller
             'nilaimarhun' => $nilaimarhun,
             'berat' => $berat,
             'margin' => $percentpinj,
-            'teller' => $auth_user['name']
+            'teller' => $auth_user['name'],
+            'komen' => $request->komen,
+            'status' => $request->status,
+            'ansuran' => $request->ansuran,
+            'tagoperasi' => ($request->tagoperasi) ? $request->tagoperasi : 0,
         ])->json();
 
         event(new StatusLiked($auth_user['cawangan'],$auth_user['name']));
diff --git a/app/Http/Controllers/HapusAnsuranController.php b/app/Http/Controllers/HapusAnsuranController.php
new file mode 100644
index 0000000..7c481f7
--- /dev/null
+++ b/app/Http/Controllers/HapusAnsuranController.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Services\CustomerService;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Auth;
+use Carbon\Carbon;
+use PDO;
+
+class HapusAnsuranController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function createApproval(Request $request)
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+
+        $norujukan = $request->norujukan;
+        $komen = $request->komen;
+        $marg = $request->margin;
+        $ber = $request->berat;
+        $nm = $request->nilaimarhun;
+        $status = $request->status;
+        $jumpinjam = $request->jumpinjam;
+        $teller = $request->teller;
+        $ansuran = $request->ansuran;
+
+        // Get the approval data
+        $approvalData = Http::withOptions(['verify' => config('app.api_verify')])
+            ->get($api_url . '/api/hapusansuran/create', [
+                'cawangan' => $auth_user['cawangan'],
+                "norujukan" => $norujukan,
+                "komen" => $komen,
+                "margin" => $marg,
+                "berat" => $ber,
+                "nilaimarhun" => $nm,
+                "status" => $status,
+                "jumpinjam" => $jumpinjam,
+                "teller" => $teller,
+                "ansuran" => $ansuran,
+            ])
+        ->json();
+
+        if (isset($approvalData['status']) && $approvalData['status'] === 'success') {
+            Session::flash('success', 'Kelulusan berjaya dibuat.');
+            return redirect()->route('operasi.kelulusan');
+        } else {
+            Session::flash('error', 'Gagal membuat kelulusan. Sila cuba lagi.');
+            return redirect()->back();  
+        }
+
+    }
+
+
+}
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 533ede1..a0f1b3a 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -575,15 +575,9 @@ class KhazanahController extends Controller
     {
         $auth_user = Auth::user();
 
-        $api_url = config('api.url');
-
         $norujukan = $request->norujukan;
         $pelulus = $request->pelulus;
 
-        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-
-        $getlulus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/GetLulus/'. $auth_user['cawangan'],['norujukan' => $norujukan])->json();
-
         if($request->khazanah != null)
         {
             if($request->batal != null)
@@ -592,7 +586,8 @@ class KhazanahController extends Controller
                 $updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusan/kepohonan/' . $auth_user['cawangan'] . '/' . $norujukan,[
                     "pembatalan" => $request->batal,
                     "komen" => $request->komenubahhapus,
-                    "khazanah" => $request->khazanah
+                    "khazanah" => $request->khazanah,
+                    "recno" => isset($request->recno) ? $request->recno : null,
                 ])->json();
 
                 if($updatelulus)
@@ -602,7 +597,8 @@ class KhazanahController extends Controller
 
             }else{
                 $updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusan/kepohonan/' . $auth_user['cawangan'] . '/' . $norujukan,[
-                    "khazanah" => $request->khazanah
+                    "khazanah" => $request->khazanah,
+                    "recno" => isset($request->recno) ? $request->recno : null,
                 ])->json();
 
                 if($updatelulus)
diff --git a/app/Http/Controllers/OperasiController.php b/app/Http/Controllers/OperasiController.php
index 11a2e51..1b8872f 100644
--- a/app/Http/Controllers/OperasiController.php
+++ b/app/Http/Controllers/OperasiController.php
@@ -16,6 +16,7 @@ use Illuminate\Support\Facades\Hash;
 
 
 use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
 
 class OperasiController extends Controller
 {
@@ -40,6 +41,11 @@ class OperasiController extends Controller
             {
                 array_push($arraykelulusan,["cawangan" => $lulus['cawangan'], "cawangankod" => $lulus['cawangankod'],"namateller" => $kel['teller'], 'siri' => $kel['siri'] , "norujukan" => $kel['norujukan'], 'pinjaman' => $kel['jumpinj'],'komen' => $kel['komen'], 'nilaimarhun' => ($kel['nilaimarhun'] ?? '-'), 'berat' => ($kel['berat'] ?? '-'),'margin' => ($kel['margin'] ?? '-'), 'status' => ($kel['status'] ?? '-'), 'pelulus' => $kel['pelulus']]);
             }
+
+            foreach($lulus['kelulusanMohonid'] as $index=>$mohon)
+            {
+                array_push($arraykelulusan,["mohonid" => true,"ansuran" => $mohon['ansuran'],"cawangan" => $lulus['cawangan'], "cawangankod" => $lulus['cawangankod'],"namateller" => $mohon['teller'], 'recno' => $mohon['recno'] , "norujukan" => $mohon['norujukan'], 'pinjaman' => $mohon['pinjaman'],'komen' => $mohon['katalaluan'], 'nilaimarhun' => ($mohon['nilaimarhun'] ?? '-'), 'berat' => ($mohon['berat'] ?? '-'),'margin' => ($mohon['margin'] ?? '-'), 'status' => ($mohon['mohon'] ?? '-')]);
+            }
         }
 
 
@@ -80,16 +86,27 @@ class OperasiController extends Controller
 
         if($request->pembatalan == null)
         {
-            $updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusanKomen/' . $request->kodcaw . '/' . $norujukan,[
-                "komen" => $request->komenkelulusan,
-                'siri' => $request->siri
-            ])->json();
+            if(!$request->taglulus){
+                $updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusanKomen/' . $request->kodcaw . '/' . $norujukan,[
+                    "komen" => $request->komenkelulusan,
+                    'siri' => $request->siri
+                ])->json();
+
+                $updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
+                    'sahkan' => 1,
+                    'namaoperasi' => $request->namaoperasi,
+                    'siri' => $request->siri
+                ])->json();
+            }else{
+                $updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateHapusAnsuran',[
+                    'siri' => $request->siri,
+                    "kodcaw" => $request->kodcaw,
+                    "norujukan" => $request->norujukan,
+                    'namaoperasi' => $request->namaoperasi,
+                    'sahkan' => 1,
+                ])->json();
+            }
 
-            $updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
-                'sahkan' => 1,
-                'namaoperasi' => $request->namaoperasi,
-                'siri' => $request->siri
-            ])->json();
 
             if($updatelulus)
             {
@@ -98,16 +115,26 @@ class OperasiController extends Controller
         }
         else
         {
-            $updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusanKomen/' . $request->kodcaw . '/' . $norujukan,[
-                "komen" => $request->komenkelulusan,
-                'siri' => $request->siri
-            ])->json();
+            if(!$request->taglulus){
+                $updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusanKomen/' . $request->kodcaw . '/' . $norujukan,[
+                    "komen" => $request->komenkelulusan,
+                    'siri' => $request->siri
+                ])->json();
 
-            $updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
-                'sahkan' => 2,
-                'namaoperasi' => $request->namaoperasi,
-                'siri' => $request->siri
-            ])->json();
+                $updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
+                    'sahkan' => 2,
+                    'namaoperasi' => $request->namaoperasi,
+                    'siri' => $request->siri
+                ])->json();
+            }else{
+                $updatelulus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url') . '/api/UpdateHapusAnsuran',[
+                    'siri' => $request->siri,
+                    "kodcaw" => $request->kodcaw,
+                    "norujukan" => $request->norujukan,
+                    'namaoperasi' => $request->namaoperasi,
+                    'sahkan' => 2,
+                ])->json();
+            }
 
             if($updatelulus)
             {
diff --git a/resources/views/customers/v2/index.blade.php b/resources/views/customers/v2/index.blade.php
index 10d2fcb..9494037 100644
--- a/resources/views/customers/v2/index.blade.php
+++ b/resources/views/customers/v2/index.blade.php
@@ -119,6 +119,10 @@
                                                 </div>
                                             </div>
                                             <div class="col-md-4">Agama</div>
+                                            @php
+                                                $ugama = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/ugama')->json();
+                                                $ugama = [];
+                                            @endphp
                                             <div class="col-md-8">
                                                 <select class="form-control" name="agama" id="agama">
                                                     <option selected value="01">Islam</option>
@@ -150,6 +154,10 @@
                                             <div class="col-md-4">Umur</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="age" id="age" readonly></div>
                                             <div class="col-md-4">Bangsa</div>
+                                            @php
+                                                $bangsa = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/bangsa')->json();
+                                                $bangsa = [];
+                                            @endphp
                                             <div class="col-md-8">
                                                 <select class="form-control" name="bangsa" id="bangsa">
                                                     <option value="M">Melayu</option>
diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php
index 79ac4c6..ac08642 100644
--- a/resources/views/customers/v2/info.blade.php
+++ b/resources/views/customers/v2/info.blade.php
@@ -2778,7 +2778,7 @@
 
 
         try{
-            let response = await getKelulusanKhazanahOperasi('Hapus Ansuran',ansid);
+            let response = await getKelulusanKhazanahOperasi('Hapus Ansuran',ansid,ansuranlatest);
             let pusherresponse = await PusherResponse(ansid,response,ansuranlatest['created_at'],ansuranlatest['id']);
 
         }catch(error){
@@ -2798,8 +2798,8 @@
             .then(response => response[0][0]);
     }
 
-    async function getKelulusanKhazanahOperasi(textstatus = 'none',norujukan){
-
+    async function getKelulusanKhazanahOperasi(textstatus = 'none',norujukan,ansuranlatest = null){
+        
         const swalWithBootstrapButtons = Swal.mixin({
             customClass: {
                 confirmButton: 'btn btn-success',
@@ -2827,8 +2827,29 @@
                 let marg = gadai.percentpinj;
                 let status = textstatus;
                 let jumpinjam = gadai.pinjaman;
+                let ansuran = ansuranlatest ? ansuranlatest['bakihargajualan'] - gadai.bakihargajualan : 0;
                 let teller = "{{ Auth::user()->name }}";
 
+                
+                let comment = Swal.fire({
+                    title: 'Sila Masukkan Komen',
+                    input: 'text',
+                    inputPlaceholder: 'Komen',
+                    showCancelButton: true,
+                    confirmButtonText: 'Hantar',
+                    cancelButtonText: 'Batal',
+                    inputValidator: (value) => {
+                        if (!value) {
+                            return 'Sila masukkan komen!';
+                        }
+                    }
+                });
+                let komen = await comment.then((result) => {
+                    if (result.isConfirmed) {
+                        return result.value;
+                    }
+                });
+
                 Swal.fire({
                     title: 'Tunggu Pengesahan Daripada Khazanah-Operasi.',
                     icon: 'info',
@@ -2846,18 +2867,21 @@
 
                 let requestdata = {
                     "_token": "{{ csrf_token() }}",
+                    "mohon" : "Hapus Ansuran",
                     "norujukan" : norujukan,
-                    "komen" : '',
+                    "komen" : komen,
                     "margin" : marg,
                     "berat" : ber,
                     "nilaimarhun" : nm,
                     "status" : status,
                     "jumpinjam" : jumpinjam,
-                    "teller" : teller
+                    "teller" : teller,
+                    "ansuran" : ansuran,
+                    "tagoperasi" : 1
                 };
 
 
-                siricreated =  await fetch("{{ route('operasi.createkelulusan') }}",{
+                siricreated =  await fetch("{{ route('teller.createkelulusan') }}",{
                                 method: 'POST',
                                 headers: {
                                     "Content-Type": "application/json",
@@ -2866,8 +2890,8 @@
                                 })
                                 .then(response => response.json())
                                 .then(response => {return response});
-
-                    return siricreated;
+                
+                return siricreated;
 
             }else if (result.dismiss === Swal.DismissReason.cancel){
                 console.log('gagal');
@@ -2892,12 +2916,14 @@
             encrypted: true
         });
 
+    
+        let recno = (siricreated && typeof siricreated === 'object' && 'id' in siricreated) ? siricreated['id'] : siricreated;
         let teller = "{{ Auth::user()->name }}";
         let kodcaw = "{{ Auth::user()->cawangan }}";
         var channel = pusher.subscribe('notice-kelulusan');
         channel.bind('my-kelulusan', function(data) {
-
-            if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
+            console.log(data,siricreated,teller,norujukan);
+            if(data.norujukan == norujukan && data.siri == recno && data.teller == teller)
             {
                 if(data.kelulusan == 'lulus')
                 {
diff --git a/resources/views/khazanah/kelulusan.blade.php b/resources/views/khazanah/kelulusan.blade.php
index 695213b..5a009a9 100644
--- a/resources/views/khazanah/kelulusan.blade.php
+++ b/resources/views/khazanah/kelulusan.blade.php
@@ -112,11 +112,12 @@
                                 <th>No Rujukan</th>
                                 <th>Teller</th>
                                 <th>Status</th>
-                                <th>Nilai Pembiayaan (RM)</th>
-                                <th>Nilai Marhun (RM)</th>
-                                <th>Berat</th>
-                                <th>Margin</th>
-                                <th>Tindakan</th>
+                                <th width="10%">Nilai Pembiayaan (RM)</th>
+                                <th width="10%">Ansuran (RM)</th>
+                                <th width="10%">Nilai Marhun (RM)</th>
+                                <th width="10%">Berat</th>
+                                <th width="10%">Margin</th>
+                                <th width="10%">Tindakan</th>
                             </tr>
                         </thead>
                         <tbody>
@@ -133,6 +134,7 @@
                                 <td>{{ $k['teller'] }}</td>
                                 <td>{{ $k['status'] }}</td>
                                 <td>{{ Helper::formatNumber($k['jumpinj']) }}</td>
+                                <td></td>
                                 <td>{{ Helper::formatNumber($k['nilaimarhun']) }}</td>
                                 <td>{{ $k['berat'] }}</td>
                                 <td>{{ $k['margin'] }}</td>
@@ -141,11 +143,12 @@
                             </tr>
                             @endforeach
                             @foreach($kelulusanmohonid as $index=>$km)
-                            <tr>
+                            <tr data-recno="{{ $km['recno'] }}" data-tagoperasi = "{{ $km['tagoperasi'] }}">
                                 <td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-norujukan="{{ $km['norujukan'] }}">{{ $km['norujukan'] }} </a></td>
                                 <td>{{ $km['teller'] }}</td>
                                 <td>{{ $km['mohon'] }}</td>
                                 <td>{{ Helper::formatNumber($km['pinjaman']) }}</td>
+                                <td>{{ Helper::formatNumber($km['ansuran']) }}</td>
                                 <td>{{ Helper::formatNumber($km['nilaimarhun']) }}</td>
                                 <td>{{ $km['berat'] }}</td>
                                 <td>{{ $km['margin'] }}</td>
@@ -514,6 +517,8 @@
         let norujukan = $(e).data('norujukan');
         let teller = $(e).closest('tr').children('td:eq(1)').text();
         let namakhazanah = "{{ $auth_user = Auth::user()->name }}";
+        let recno = $(e).closest('tr').data('recno');
+        let tagoperasi = $(e).closest('tr').data('tagoperasi');
 
         teller = String(teller);
 
@@ -524,7 +529,9 @@
                 "_token": "{{ csrf_token() }}",
                 "norujukan" : norujukan,
                 "khazanah" : namakhazanah,
-                'teller' : teller
+                'teller' : teller,
+                "recno" : recno,
+                "tagoperasi" : tagoperasi,
             },
             success:function(data){
 
@@ -593,6 +600,8 @@
         let norujukan = $(e).data('norujukan');
         let namakhazanah = "{{ $auth_user = Auth::user()->name }}";
         let teller = $(e).closest('tr').children('td:eq(1)').text();
+        let recno = $(e).closest('tr').data('recno');
+        let tagoperasi = $(e).closest('tr').data('tagoperasi');
 
         teller = String(teller);
 
@@ -605,7 +614,9 @@
                 "khazanah" : namakhazanah,
                 "komenubahhapus" : komenkelulusan,
                 "batal" : 'batal',
-                'teller' : teller
+                'teller' : teller,
+                "recno" : recno,
+                "tagoperasi" : tagoperasi
 
             },
             success:function(data){
diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php
index defa3ff..399628d 100644
--- a/resources/views/operasi/kelulusan.blade.php
+++ b/resources/views/operasi/kelulusan.blade.php
@@ -81,7 +81,7 @@
   </div>
 
 
-<div class="container">
+<div class="container col-12">
     <div class="row justify-content-center">
         <div class="col-md-12">
             <div class="card">
@@ -113,6 +113,7 @@
                                 <th>Komen</th>
                                 <th>Status</th>
                                 <th>Nilai Pembiayaan</th>
+                                <th>Ansuran</th>
                                 <th>Nilai Marhun</th>
                                 <th>Berat</th>
                                 <th>Margin</th>
@@ -128,11 +129,16 @@
                                 <th>{{ $k['komen'] }}</th>
                                 <td>{{ $k['status'] }}</td>
                                 <td>{{ number_format($k['pinjaman'],2) }}</td>
+                                @if(isset($k['ansuran']) && $k['ansuran'] != 0)
+                                <td>{{ number_format($k['ansuran'],2) }}</td>
+                                @else
+                                <td></td>
+                                @endif
                                 <td>{{ $k['nilaimarhun'] }}</td>
                                 <td>{{ $k['berat'] }}</td>
                                 <td>{{ $k['margin'] }}</td>
-                                <td><button class="btn btn-primary mr-2" onclick="updatelulus(this)" data-kodcaw="{{ $k['cawangankod'] }}" data-pelulus="{{ $k['pelulus'] }}"  data-norujukan="{{ $k['norujukan'] }}" data-siri="{{ $k['siri'] }}"><i class="fas fa-thumbs-up"></i></button>
-                                    <button class="btn btn-danger" onclick="updatebatal(this)" data-kodcaw="{{ $k['cawangankod'] }}" data-norujukan="{{ $k['norujukan'] }}" data-pelulus="{{ $k['pelulus'] }}" data-siri="{{ $k['siri'] }}" ><i class="fas fa-thumbs-down"></i></button></td>
+                                <td><button class="btn btn-primary mr-2" onclick="updatelulus(this)" data-taglulus="{{ isset($k['mohonid']) ? true : false }}" data-kodcaw="{{ $k['cawangankod'] }}"  data-norujukan="{{ $k['norujukan'] }}" data-siri="{{ isset($k['siri']) ? $k['siri'] : $k['recno'] }}"><i class="fas fa-thumbs-up"></i></button>
+                                    <button class="btn btn-danger" onclick="updatebatal(this)" data-taglulus="{{ isset($k['mohonid']) ? true : false }}" data-kodcaw="{{ $k['cawangankod'] }}" data-norujukan="{{ $k['norujukan'] }}" data-siri="{{ isset($k['siri']) ? $k['siri'] : $k['recno'] }}" ><i class="fas fa-thumbs-down"></i></button></td>
                             </tr>
                             @endforeach
                         </tbody>
@@ -346,6 +352,7 @@
         let siri = $(e).data('siri');
         let namaoperasi = "{{ Auth::user()->name }}";
         let teller = $(e).closest('tr').children('td:eq(2)').text();
+        let taglulus = $(e).data('taglulus');
 
         teller = String(teller);
 
@@ -354,6 +361,7 @@
             url: "{{ route('operasi.updatekelulusan') }}",
             data: {
                 "_token": "{{ csrf_token() }}",
+                "taglulus" : taglulus,
                 "norujukan" : norujukan,
                 "kodcaw" : cawangankod,
                 "komenkelulusan" : komenkelulusan,

From 11d4e975a1c8f4422f5729a36f8530d4b37ac475 Mon Sep 17 00:00:00 2001
From: Hafifie PKB <muhdhafifie97@gmail.com>
Date: Sun, 6 Jul 2025 12:01:48 +0800
Subject: [PATCH 3/6] change alerts

---
 app/Http/Controllers/CustomersController.php |  4 +-
 app/Http/Controllers/KhazanahController.php  | 12 ++++-
 resources/views/customers/v2/info.blade.php  |  2 +
 resources/views/errors/alert.blade.php       | 49 +++++++++++++-------
 4 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php
index 3669c77..b0643a6 100644
--- a/app/Http/Controllers/CustomersController.php
+++ b/app/Http/Controllers/CustomersController.php
@@ -65,7 +65,7 @@ class CustomersController extends Controller
 
         $customer_page = ($cawangan_info['version'] == 'v1') ? 'customers.v1.info' : 'customers.v2.info';
 
-        $getApprovalError = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/ansuran/getApproval',[
+        $getApprovalError = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getApproval',[
             'kodcaw' => $auth_user['cawangan'],
             'teller' => $auth_user['name'],
         ])->json();
@@ -74,7 +74,7 @@ class CustomersController extends Controller
             $request->session()->flash('activate_tab', 'SAG_baru');
         }
 
-        return view($customer_page,compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi','pekerjaan','ugama','getApprovalError'));
+        return view($customer_page,compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi','pekerjaan','getApprovalError'));
     }
 
     public function search(Request $request){
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index a0f1b3a..a9325d3 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -592,7 +592,11 @@ class KhazanahController extends Controller
 
                 if($updatelulus)
                 {
-                    event(new NotifikasiUbahHapus($norujukan,"batal",$request->komenubahhapus,$request->teller));
+                    if(isset($request->tagoperasi) && $request->tagoperasi == 1){
+                        event(new NotifikasiKelulusan($norujukan,"batal",$request->recno,$request->komenubahhapus,$request->teller));
+                    }else{
+                        event(new NotifikasiUbahHapus($norujukan,"batal",$request->komenubahhapus,$request->teller));
+                    }
                 }
 
             }else{
@@ -603,7 +607,11 @@ class KhazanahController extends Controller
 
                 if($updatelulus)
                 {
-                    event(new NotifikasiUbahHapus($norujukan,"lulus","tiada",$request->teller));
+                    if(isset($request->tagoperasi) && $request->tagoperasi == 1){
+                        event(new NotifikasiKelulusan($norujukan,"lulus",$request->recno,$request->komenubahhapus,$request->teller));
+                    }else{
+                        event(new NotifikasiUbahHapus($norujukan,"lulus","tiada",$request->teller));
+                    }
                 }
             }
         }
diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php
index ac08642..4ca5d46 100644
--- a/resources/views/customers/v2/info.blade.php
+++ b/resources/views/customers/v2/info.blade.php
@@ -2838,6 +2838,8 @@
                     showCancelButton: true,
                     confirmButtonText: 'Hantar',
                     cancelButtonText: 'Batal',
+                    allowOutsideClick: false,
+                    allowEscapeKey: false,
                     inputValidator: (value) => {
                         if (!value) {
                             return 'Sila masukkan komen!';
diff --git a/resources/views/errors/alert.blade.php b/resources/views/errors/alert.blade.php
index f4661b9..b82784d 100644
--- a/resources/views/errors/alert.blade.php
+++ b/resources/views/errors/alert.blade.php
@@ -1,17 +1,35 @@
 @if($errorapproval)
     <script>
-        Swal.fire({
-            title: 'Tunggu Pengesahan Daripada Khazanah.',
-            icon: 'info',
-            width: 600,
-            padding: '3em',
-            background: '#fffff',
-            showCancelButton: false,
-            showConfirmButton: false,
-            allowOutsideClick: false,
-            allowEscapeKey: false,
-            allowEnterKey: false
-        })
+
+        let jenis = "{{ $errorapproval['mohon'] }}";
+
+        if(jenis == 'Hapus Ansuran'){
+            Swal.fire({
+                title: 'Tunggu Pengesahan Daripada Khazanah-Operasi.',
+                icon: 'info',
+                width: 600,
+                padding: '3em',
+                background: '#fffff',
+                showCancelButton: false,
+                showConfirmButton: false,
+                allowOutsideClick: false,
+                allowEscapeKey: false,
+                allowEnterKey: false
+            });
+        }else{
+            Swal.fire({
+                title: 'Tunggu Pengesahan Daripada Khazanah.',
+                icon: 'info',
+                width: 600,
+                padding: '3em',
+                background: '#fffff',
+                showCancelButton: false,
+                showConfirmButton: false,
+                allowOutsideClick: false,
+                allowEscapeKey: false,
+                allowEnterKey: false
+            })
+        }
 
         getPusherResponse();
 
@@ -27,12 +45,9 @@
             let ansuranlatest = await fetch(api_url + '/admin/ansuran/getLatest?' + queryString)
                                 .then(response => response.json())
                                 .then(response => {return response});
-            
-            console.log("Ansuran Latest:", ansuranlatest);
-        
-            console.log("{{ $errorapproval['norujukan'] }}","{{ $errorapproval['siri'] }}",ansuranlatest['created_at'],ansuranlatest['id']);
+                    
             try{
-                let pusherresponse = await PusherResponse("{{ $errorapproval['norujukan'] }}","{{ $errorapproval['siri'] }}",ansuranlatest['created_at'],ansuranlatest['id']);
+                let pusherresponse = await PusherResponse("{{ $errorapproval['norujukan'] }}","{{ $errorapproval['recno'] }}",ansuranlatest['created_at'],ansuranlatest['id']);
 
             }catch(error){
                 console.error("Error:", error);

From c1eba92acab380aba2cb1612638625852ae02a90 Mon Sep 17 00:00:00 2001
From: Hafifie PKB <muhdhafifie97@gmail.com>
Date: Thu, 10 Jul 2025 12:11:04 +0800
Subject: [PATCH 4/6] added fixed khazanah boleh lulus terus

---
 app/Events/NotifikasiKelulusan.php          | 5 +++--
 app/Http/Controllers/KhazanahController.php | 2 +-
 resources/views/customers/v2/info.blade.php | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Events/NotifikasiKelulusan.php b/app/Events/NotifikasiKelulusan.php
index 3bee030..0c53719 100644
--- a/app/Events/NotifikasiKelulusan.php
+++ b/app/Events/NotifikasiKelulusan.php
@@ -11,15 +11,16 @@ class NotifikasiKelulusan implements ShouldBroadcast
 {
   use Dispatchable, InteractsWithSockets, SerializesModels;
 
-  public $norujukan,$kelulusan,$siri,$komen,$teller;
+  public $norujukan,$kelulusan,$siri,$komen,$teller,$tagoperasi;
 
-  public function __construct($norujukan,$kelulusan,$siri,$komen,$teller)
+  public function __construct($norujukan,$kelulusan,$siri,$komen,$teller,$tagoperasi = null)
   {
       $this->norujukan = $norujukan;
       $this->kelulusan = $kelulusan;
       $this->siri = $siri;
       $this->komen = $komen;
       $this->teller = $teller;
+      $this->tagoperasi = $tagoperasi;
   }
 
   public function broadcastOn()
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index a9325d3..916c9bc 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -608,7 +608,7 @@ class KhazanahController extends Controller
                 if($updatelulus)
                 {
                     if(isset($request->tagoperasi) && $request->tagoperasi == 1){
-                        event(new NotifikasiKelulusan($norujukan,"lulus",$request->recno,$request->komenubahhapus,$request->teller));
+                        event(new NotifikasiKelulusan($norujukan,"lulus",$request->recno,$request->komenubahhapus,$request->teller,1));
                     }else{
                         event(new NotifikasiUbahHapus($norujukan,"lulus","tiada",$request->teller));
                     }
diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php
index 4ca5d46..c3aed6d 100644
--- a/resources/views/customers/v2/info.blade.php
+++ b/resources/views/customers/v2/info.blade.php
@@ -2925,7 +2925,7 @@
         var channel = pusher.subscribe('notice-kelulusan');
         channel.bind('my-kelulusan', function(data) {
             console.log(data,siricreated,teller,norujukan);
-            if(data.norujukan == norujukan && data.siri == recno && data.teller == teller)
+            if(data.norujukan == norujukan && data.siri == recno && data.teller == teller && data.tagoperasi == null)
             {
                 if(data.kelulusan == 'lulus')
                 {

From 3ad9cfab7d133710737e7ee57cee6dc4b6c43c25 Mon Sep 17 00:00:00 2001
From: Hafifie PKB <muhdhafifie97@gmail.com>
Date: Sun, 17 Aug 2025 16:18:47 +0800
Subject: [PATCH 5/6] added notification in kelulusan

---
 resources/views/layouts/app_operasi.blade.php | 94 ++++++++++++-------
 1 file changed, 62 insertions(+), 32 deletions(-)

diff --git a/resources/views/layouts/app_operasi.blade.php b/resources/views/layouts/app_operasi.blade.php
index ddda734..32b86c2 100644
--- a/resources/views/layouts/app_operasi.blade.php
+++ b/resources/views/layouts/app_operasi.blade.php
@@ -126,37 +126,7 @@
                             var audio = new Audio("{{ asset('sound/3.wav') }}");
                             audio.muted = true;
 
-                            // Enable pusher logging - don't include this in production
-                            Pusher.logToConsole = false;
-
-                            var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
-                                cluster: 'ap1',
-                                encrypted: true
-                            });
-
-                            var channel = pusher.subscribe('operasi-notify');
-                            channel.bind('operasi-event', function(data) {
-                                let message = JSON.stringify(data);
-                                
-                                $('#bell').css("color", "red");
-                                $('#linkz').text(data.namateller + " Pohon Kelulusan");
-                                $("#linkz").attr("href", "{{ url('kelulusan') }}");
-
-				if(window.location.pathname === '/operasi/kelulusan')
-				{
-					location.reload();
-				}else{
-					audio.play();
-					audio.muted = false;
-					var countlagu = 1;
-					audio.onended = function() {
-						if(countlagu <= 3){
-							countlagu++;
-							this.play();
-						}
-					}
-				}
-                                const Toast = Swal.mixin({
+                            const Toast = Swal.mixin({
                                 toast: true,
                                 position: 'top-end',
                                 showConfirmButton: false,
@@ -166,7 +136,67 @@
                                     toast.addEventListener('mouseenter', Swal.stopTimer)
                                     toast.addEventListener('mouseleave', Swal.resumeTimer)
                                 }
-                                })
+                            });
+
+                            // Enable pusher logging - don't include this in production
+                            Pusher.logToConsole = false;
+
+                            var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                cluster: 'ap1',
+                                encrypted: true
+                            });
+
+                            var kelulusanhapus = pusher.subscribe('notice-kelulusan');
+                            kelulusanhapus.bind('my-kelulusan', function(data) {
+                                if(data.tagoperasi == 1){
+                                    let message = JSON.stringify(data);
+                                    
+                                    $('#bell').css("color", "red");
+                                    $('#linkz').text(data.namateller + " Pohon Kelulusan Dihapuskan");
+                                    $("#linkz").attr("href", "{{ url('kelulusan') }}");
+                                    if(window.location.pathname === '/operasi/kelulusan')
+                                        location.reload();
+                                    else{
+                                        audio.play();
+                                        audio.muted = false;
+                                        var countlagu = 1;
+                                        audio.onended = function() {
+                                            if(countlagu <= 3){
+                                                countlagu++;
+                                                this.play();
+                                            }
+                                        }
+                                    }
+                                    Toast.fire({
+                                        icon: 'info',
+                                        title: 'Kelulusan Dipohon Sekarang!'
+                                    });
+                                }
+                            });
+
+
+                            var channel = pusher.subscribe('operasi-notify');
+                            channel.bind('operasi-event', function(data) {
+                                let message = JSON.stringify(data);
+                                
+                                $('#bell').css("color", "red");
+                                $('#linkz').text(data.namateller + " Pohon Kelulusan");
+                                $("#linkz").attr("href", "{{ url('kelulusan') }}");
+
+                                if(window.location.pathname === '/operasi/kelulusan')
+                                {
+                                    location.reload();
+                                }else{
+                                    audio.play();
+                                    audio.muted = false;
+                                    var countlagu = 1;
+                                    audio.onended = function() {
+                                        if(countlagu <= 3){
+                                            countlagu++;
+                                            this.play();
+                                        }
+                                    }
+                                }
 
                                 Toast.fire({
                                 icon: 'error',

From e25cb855fbc3fdcf206c43c8bdc2698781d83a0c Mon Sep 17 00:00:00 2001
From: Hafifie PKB <muhdhafifie97@gmail.com>
Date: Sun, 17 Aug 2025 16:27:55 +0800
Subject: [PATCH 6/6] deleted endpoints in agama and bangsa for version2

---
 resources/views/customers/v2/index.blade.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/resources/views/customers/v2/index.blade.php b/resources/views/customers/v2/index.blade.php
index 9494037..10d2fcb 100644
--- a/resources/views/customers/v2/index.blade.php
+++ b/resources/views/customers/v2/index.blade.php
@@ -119,10 +119,6 @@
                                                 </div>
                                             </div>
                                             <div class="col-md-4">Agama</div>
-                                            @php
-                                                $ugama = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/ugama')->json();
-                                                $ugama = [];
-                                            @endphp
                                             <div class="col-md-8">
                                                 <select class="form-control" name="agama" id="agama">
                                                     <option selected value="01">Islam</option>
@@ -154,10 +150,6 @@
                                             <div class="col-md-4">Umur</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="age" id="age" readonly></div>
                                             <div class="col-md-4">Bangsa</div>
-                                            @php
-                                                $bangsa = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/bangsa')->json();
-                                                $bangsa = [];
-                                            @endphp
                                             <div class="col-md-8">
                                                 <select class="form-control" name="bangsa" id="bangsa">
                                                     <option value="M">Melayu</option>