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

Merge branch 'production' of https://bitbucket.org/arrahn-pkb/kaunter into v2.2updatesag

Browse Source
This commit is contained in:
BTMS3
2025-01-27 16:38:28 +08:00
parent a9d27e1013 f74048a828
commit 8b2934863d
7 changed files with 183 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+14 -8
View File
@@ -192,20 +192,23 @@ class KhazanahController extends Controller
return view('khazanah.menu',compact('cawangan_info','api_url','gadai','listserah','countmodal','countserahan')); return view('khazanah.menu',compact('cawangan_info','api_url','gadai','listserah','countmodal','countserahan'));
} }
public function pendahuluanserahandaftar() public function pendahuluanserahandaftar(Request $request)
{ {
$auth_user = Auth::user(); $auth_user = Auth::user();
$api_url = config('api.url'); $api_url = config('api.url');
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$listgldetail = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/listgldetail/'. $auth_user['cawangan'])->json(); // $listgldetail = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/listgldetail/'. $auth_user['cawangan'])->json();
$listgldetail = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/listgldetail/'. $auth_user['cawangan'],['name' => $auth_user['name']])->json();
$denominasi=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/DenominasiController/'.$auth_user['cawangan'])->json(); $denominasi=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/DenominasiController/'.$auth_user['cawangan'])->json();
// dd($denominasi);
if(sizeof($denominasi) == 0) if(sizeof($denominasi) == 0)
{ {
$denominasi=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'])->json(); $denominasi=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'],['name' => $auth_user['name']])->json();
} }
else else
{ {
@@ -215,6 +218,7 @@ class KhazanahController extends Controller
return view('khazanah.pendahuluanserahanmain',compact('cawangan_info','listgldetail','denominasi')); return view('khazanah.pendahuluanserahanmain',compact('cawangan_info','listgldetail','denominasi'));
} }
public function dashboard() public function dashboard()
{ {
$auth_user = Auth::user(); $auth_user = Auth::user();
@@ -738,7 +742,8 @@ class KhazanahController extends Controller
$data_request = $request->except('_token'); $data_request = $request->except('_token');
$updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/panjar/createpanjar/'. $auth_user['cawangan'],$data_request)->json(); $updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/panjar/createpanjar/'. $auth_user['cawangan'],$data_request)->json();
// $updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/panjar/createpanjar/'. $auth_user['cawangan'],['name' => $auth_user['name']],$data_request)->json();
// dd($updatepanjar);
if($updatepanjar['result'] == 'success') if($updatepanjar['result'] == 'success')
{ {
if($request->jenismodal === 'perubatan') if($request->jenismodal === 'perubatan')
@@ -2833,7 +2838,8 @@ class KhazanahController extends Controller
// $kodnegeridandaerah = $request->negeriagh .'|' . $request->daerahagh; // $kodnegeridandaerah = $request->negeriagh .'|' . $request->daerahagh;
$polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json(); // $polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json();
$polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan'],['name' => $auth_user['name']]])->json();
$daftar = 0; $daftar = 0;
if(sizeof($polis) > 0) if(sizeof($polis) > 0)
@@ -2869,7 +2875,7 @@ class KhazanahController extends Controller
}else{ }else{
event(new NotifikasiAGH($auth_user['cawangan'],'Mengalami masalah dalam menjana.','error',$auth_user['name'])); 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 redirect()->route('khazanah.customer_info')->with('aghinformation','Mengalami masalah dalam menjana.|error');
} }
return response($daftarpolis); return response($daftarpolis);
@@ -2940,7 +2946,7 @@ class KhazanahController extends Controller
$customers = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/customers/'.$gad['nokp'])->json(); $customers = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/customers/'.$gad['nokp'])->json();
} }
$polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $norujukan,'kodcaw' => $auth_user['cawangan']])->json(); $polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $norujukan,'kodcaw' => $auth_user['cawangan']])->json();
$log_ulangcetakagh = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/polis/agh',['norujukan' => $norujukan,'kodcaw' => $auth_user['cawangan'],'teller' => $auth_user['name']])->json();
return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url')); return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url'));
} }
app/Http/Controllers/LelongController.php
+4 -1
View File
@@ -69,7 +69,10 @@ class LelongController extends Controller
$cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0]; $cawangan_detail=$cawangan[0];
$lelong=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $norujukan)->json(); // $lelong=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $norujukan)->json();
$lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $norujukan, [
'name' => $auth_user['name']])->json();
$wakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $lelong['nowakil'])->json(); $wakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $lelong['nowakil'])->json();
app/Http/Controllers/PenebusanController.php
+2 -1
View File
@@ -733,7 +733,8 @@ class PenebusanController extends Controller
'hubungan' => $request->hubungan, 'hubungan' => $request->hubungan,
'alamat' => $request->alamat, 'alamat' => $request->alamat,
'telefon' => $request->telefon, 'telefon' => $request->telefon,
'nota' => $request->nota 'nota' => $request->nota,
'teller' => $auth_user['name']
])->json(); ])->json();
resources/views/customers/v2/info.blade.php
+6 -4
View File
@@ -994,7 +994,7 @@
urlroute = urlroute.replace(':id', gadai_detail["norujukan"]); urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
var tuntutan = 'Pelanggan'; var tuntutan = 'Pelanggan';
console.log(gadai_detail['norujukan'],kodcaw,api_url);
$.ajax({ $.ajax({
method:"GET", method:"GET",
async:false, async:false,
@@ -1004,6 +1004,7 @@
"kodcaw" : kodcaw "kodcaw" : kodcaw
}, },
success: function(response){ success: function(response){
console.log(response);
if(response[0].teller == 'DM') if(response[0].teller == 'DM')
{ {
tuntutan = 'WTD'; tuntutan = 'WTD';
@@ -1562,7 +1563,7 @@
let nota = $('#notawakil').val(); let nota = $('#notawakil').val();
let nokp = $('#nokpwakil').val(); let nokp = $('#nokpwakil').val();
let norujukan = $('#norujukanwakil').val(); let norujukan = $('#norujukanwakil').val();
let teller = "{{ Auth::user()->name }}";
$.ajax({ $.ajax({
method:'POST', method:'POST',
@@ -1576,7 +1577,8 @@
"alamat" : alamat, "alamat" : alamat,
"telefon" : telefon, "telefon" : telefon,
"nota" : nota, "nota" : nota,
"icno" : nokp "icno" : nokp,
"teller" : teller
}, },
success:function(data){ success:function(data){
@@ -2590,7 +2592,7 @@
$.ajax({ $.ajax({
method:"put", method:"put",
url: api_url + "/api/customers/update/kaunter/" + nokp, url: api_url + "/api/customers/update/kaunter/" + nokp+ "/" + kodcaw,
data:{ data:{
"namateller" : "{{ Auth::user()->name }}", "namateller" : "{{ Auth::user()->name }}",
"telefon1": telefon1, "telefon1": telefon1,
resources/views/khazanah/pendahuluanserahanmain.blade.php
+43 -42
View File
@@ -236,48 +236,51 @@
let dtacct = $('#dtacct').val(); let dtacct = $('#dtacct').val();
let ktacct = $('#ktacct').val(); let ktacct = $('#ktacct').val();
let boolamaun = false;let boolketerangan = false;let booljenis = false; // Validation for amaun
if(!amaun) if (!amaun) {
{
$("[name='erroramaun']").show(); $("[name='erroramaun']").show();
$("[name='erroramaun']").text("*Isikan amaun dalam input!"); $("[name='erroramaun']").text("*Isikan amaun dalam input!");
$("[name='amaun']").addClass('is-invalid'); $("[name='amaun']").addClass('is-invalid');
boolamaun = true; boolamaun = true;
} else { } else {
$("[name='erroramaun']").hide(); $("[name='erroramaun']").hide();
$("[name='amaun']").removeClass('is-invalid'); $("[name='amaun']").removeClass('is-invalid');
boolamaun = false; boolamaun = false;
} }
if(!keterangan) // Validation for keterangan
{ if (!keterangan) {
$("[name='errorketerangan']").show(); $("[name='errorketerangan']").show();
$("[name='errorketerangan']").text("*Isikan keterangan dalam input!"); $("[name='errorketerangan']").text("*Isikan keterangan dalam input!");
$("[name='keterangan']").addClass('is-invalid'); $("[name='keterangan']").addClass('is-invalid');
boolketerangan = true; boolketerangan = true;
} else { } else {
$("[name='errorketerangan']").hide(); $("[name='errorketerangan']").hide();
$("[name='keterangan']").removeClass('is-invalid'); $("[name='keterangan']").removeClass('is-invalid');
boolketerangan = false; boolketerangan = false;
} }
if(!jenis) // Validation for jenis
{ if (!jenis) {
$(".invalid-feedback").show(); $(".invalid-feedback").show();
booljenis = true; booljenis = true;
} else { } else {
$(".invalid-feedback").hide(); $(".invalid-feedback").hide();
booljenis = false; booljenis = false;
} }
if(boolamaun === false && boolketerangan === false && booljenis === false) // If all validations pass
{ if (boolamaun === false && boolketerangan === false && booljenis === false) {
// Carry all validated values, including auth_user
console.log({
amaun,
keterangan,
jenis,
dtacct,
ktacct,
auth_user
});
$('#amaundiminta').val(amaun); $('#amaundiminta').val(amaun);
$('#denominasiHQModal').modal('show'); $('#denominasiHQModal').modal('show');
$('#pendahuluanserahanModal').modal('hide'); $('#pendahuluanserahanModal').modal('hide');
@@ -285,16 +288,13 @@
return true; return true;
} else { } else {
$("#terima_transaksi").prop('disabled', false); $("#terima_transaksi").prop('disabled', false);
event.preventDefault(); event.preventDefault();
return false; return false;
} }
} }
$('#pendahuluanserahanModal').on('hidden.bs.modal', function (e) { $('#pendahuluanserahanModal').on('hidden.bs.modal', function (e) {
$(this).find("[name='erroramaun']").hide(); $(this).find("[name='erroramaun']").hide();
@@ -333,8 +333,7 @@
$('#amaunkiraan').val(''); $('#amaunkiraan').val('');
} }
function terimapost() function terimapost() {
{
$("#terima_transaksi").prop('disabled', true); $("#terima_transaksi").prop('disabled', true);
let amaun = $('#amaundiminta').val(); let amaun = $('#amaundiminta').val();
@@ -343,23 +342,34 @@
let jenis = $('#radiopendahuluanserahan:checked').val(); let jenis = $('#radiopendahuluanserahan:checked').val();
let dtacct = $('#dtacct').val(); let dtacct = $('#dtacct').val();
let ktacct = $('#ktacct').val(); let ktacct = $('#ktacct').val();
let auth_user = $('#auth_user').val(); //letak user
//denominasi bundle // Denominasi bundle
let bundle1 = $('#bundle1').val();let bundle5 = $('#bundle5').val();let bundle10 = $('#bundle10').val(); let bundle1 = $('#bundle1').val();
let bundle20 = $('#bundle20').val();let bundle50 = $('#bundle50').val();let bundle100 = $('#bundle100').val(); let bundle5 = $('#bundle5').val();
let bundle10 = $('#bundle10').val();
let bundle20 = $('#bundle20').val();
let bundle50 = $('#bundle50').val();
let bundle100 = $('#bundle100').val();
//denominasi keping // Denominasi keping
let sen1 = $('#sen1').val();let sen5 = $('#sen5').val();let sen10 = $('#sen10').val();let sen20 = $('#sen20').val();let sen50 = $('#sen50').val(); let sen1 = $('#sen1').val();
let ringgit1 = $('#ringgit1').val();let ringgit5 = $('#ringgit5').val();let ringgit10 = $('#ringgit10').val();let ringgit20 = $('#ringgit20').val();let ringgit50 = $('#ringgit50').val(); let sen5 = $('#sen5').val();
let sen10 = $('#sen10').val();
let sen20 = $('#sen20').val();
let sen50 = $('#sen50').val();
let ringgit1 = $('#ringgit1').val();
let ringgit5 = $('#ringgit5').val();
let ringgit10 = $('#ringgit10').val();
let ringgit20 = $('#ringgit20').val();
let ringgit50 = $('#ringgit50').val();
let ringgit100 = $('#ringgit100').val(); let ringgit100 = $('#ringgit100').val();
if(Number(amaun) !== Number(kiraan)) if (Number(amaun) !== Number(kiraan)) {
{
Swal.fire({ Swal.fire({
icon: 'error', icon: 'error',
title: 'Sila Periksa Amaun dan Kiraan.' title: 'Sila Periksa Amaun dan Kiraan.'
}); });
return false; return false;
} }
@@ -385,6 +395,7 @@
'teller': teller, 'teller': teller,
'dtacct': dtacct, 'dtacct': dtacct,
'ktacct': ktacct, 'ktacct': ktacct,
'auth_user': auth_user, // mskkan auth_user
'ambilansen1': sen1, 'ambilansen1': sen1,
'ambilansen5': sen5, 'ambilansen5': sen5,
'ambilansen10': sen10, 'ambilansen10': sen10,
@@ -396,28 +407,19 @@
'ambilanring20': ringgit20, 'ambilanring20': ringgit20,
'ambilanring50': ringgit50, 'ambilanring50': ringgit50,
'ambilanring100': ringgit100 'ambilanring100': ringgit100
// 'bundle1' : bundle1,
// 'bundle5' : bundle5,
// 'bundle10' : bundle10,
// 'bundle20' : bundle20,
// 'bundle50' : bundle50,
// 'bundle100' : bundle100
}, },
success: function (data) { success: function (data) {
if (data == 'LULUS') { if (data == 'LULUS') {
Swal.fire({ Swal.fire({
icon: 'success', icon: 'success',
title: 'Transaksi Berjaya', title: 'Transaksi Berjaya',
allowEscapeKey: false, allowEscapeKey: false,
allowOutsideClick: false allowOutsideClick: false
}).then(function () { }).then(function () {
$('#denominasiHQModal').modal('hide'); $('#denominasiHQModal').modal('hide');
$('#pendahuluanserahanModal').modal('hide'); $('#pendahuluanserahanModal').modal('hide');
location.reload(); location.reload();
}); });
} else if (data == 'GAGAL') { } else if (data == 'GAGAL') {
Swal.fire({ Swal.fire({
icon: 'error', icon: 'error',
@@ -425,14 +427,13 @@
allowEscapeKey: false, allowEscapeKey: false,
allowOutsideClick: false allowOutsideClick: false
}).then(function () { }).then(function () {
$('#denominasiHQModal').modal('hide'); $('#denominasiHQModal').modal('hide');
$('#pendahuluanserahanModal').modal('hide'); $('#pendahuluanserahanModal').modal('hide');
$("#terima_transaksi").prop('disabled', false); $("#terima_transaksi").prop('disabled', false);
}); });
} }
},error: function(jqXHR, textStatus, errorThrown) { },
error: function (jqXHR, textStatus, errorThrown) {
console.log(textStatus, errorThrown); console.log(textStatus, errorThrown);
} }
}); });
resources/views/modal/denominasimodalpendahuluanserahan.blade.php
+1
View File
@@ -132,6 +132,7 @@
<input type="hidden" id="jenisjenis"/> <input type="hidden" id="jenisjenis"/>
<input type="hidden" id="kodcawangan"/> <input type="hidden" id="kodcawangan"/>
<input type="hidden" id="tellerla"/> <input type="hidden" id="tellerla"/>
<input type="hidden" id="auth_user" name="auth_user" value="{{ Auth::user()->id }}">
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
resources/views/modal/pendahuluanserahan.blade.php
+5
View File
@@ -41,6 +41,11 @@
</div> </div>
</div> </div>
<!-- <input type="hidden" id="auth_user" name="auth_user" value=""/> -->
<input type="hidden" id="auth_user" name="auth_user" value="{{ Auth::user()->id }}">
</div> </div>
<div class="modal-footer"> <div class="modal-footer">