KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

change alerts

Browse Source
This commit is contained in:
Hafifie PKB
2025-07-06 12:01:48 +08:00
parent 00c4b9d55e
commit 11d4e975a1
4 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CustomersController.php
+2 -2
View File
@@ -65,7 +65,7 @@ class CustomersController extends Controller
$customer_page = ($cawangan_info['version'] == 'v1') ? 'customers.v1.info' : 'customers.v2.info'; $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'], 'kodcaw' => $auth_user['cawangan'],
'teller' => $auth_user['name'], 'teller' => $auth_user['name'],
])->json(); ])->json();
@@ -74,7 +74,7 @@ class CustomersController extends Controller
$request->session()->flash('activate_tab', 'SAG_baru'); $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){ public function search(Request $request){
app/Http/Controllers/KhazanahController.php
+10 -2
View File
@@ -592,7 +592,11 @@ class KhazanahController extends Controller
if($updatelulus) 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{ }else{
@@ -603,7 +607,11 @@ class KhazanahController extends Controller
if($updatelulus) 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
+2
View File
@@ -2838,6 +2838,8 @@
showCancelButton: true, showCancelButton: true,
confirmButtonText: 'Hantar', confirmButtonText: 'Hantar',
cancelButtonText: 'Batal', cancelButtonText: 'Batal',
allowOutsideClick: false,
allowEscapeKey: false,
inputValidator: (value) => { inputValidator: (value) => {
if (!value) { if (!value) {
return 'Sila masukkan komen!'; return 'Sila masukkan komen!';
resources/views/errors/alert.blade.php
+32 -17
View File
@@ -1,17 +1,35 @@
@if($errorapproval) @if($errorapproval)
<script> <script>
Swal.fire({
title: 'Tunggu Pengesahan Daripada Khazanah.', let jenis = "{{ $errorapproval['mohon'] }}";
icon: 'info',
width: 600, if(jenis == 'Hapus Ansuran'){
padding: '3em', Swal.fire({
background: '#fffff', title: 'Tunggu Pengesahan Daripada Khazanah-Operasi.',
showCancelButton: false, icon: 'info',
showConfirmButton: false, width: 600,
allowOutsideClick: false, padding: '3em',
allowEscapeKey: false, background: '#fffff',
allowEnterKey: false 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(); getPusherResponse();
@@ -27,12 +45,9 @@
let ansuranlatest = await fetch(api_url + '/admin/ansuran/getLatest?' + queryString) let ansuranlatest = await fetch(api_url + '/admin/ansuran/getLatest?' + queryString)
.then(response => response.json()) .then(response => response.json())
.then(response => {return response}); .then(response => {return response});
console.log("Ansuran Latest:", ansuranlatest);
console.log("{{ $errorapproval['norujukan'] }}","{{ $errorapproval['siri'] }}",ansuranlatest['created_at'],ansuranlatest['id']);
try{ 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){ }catch(error){
console.error("Error:", error); console.error("Error:", error);