change alerts

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){

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));
+                    }
                 }
             }
         }

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!';

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);