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

fixing deletependser and mohon

Browse Source
This commit is contained in:
hafifierahman
2021-10-02 09:54:31 +08:00
parent 2e41e124e4
commit 0ed748a0cc
13 changed files with 421 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+4 -3
View File
@@ -727,11 +727,12 @@ class GadaianController extends Controller
$berat = ($gadai_info[0][0]['berat']) ? $gadai_info[0][0]['berat'] : '-';
$percentpinj = ($gadai_info[0][0]['percentpinj']) ? $gadai_info[0][0]['percentpinj'] : '-';
$message = $pinjaman . '|' . $nilaimarhun . '|' . $berat . '|' . $percentpinj . '|';
$createlulus = Http::post(config('api.url') . '/api/CreateLulus/' . $auth_user['cawangan'] . '/' . $norujukan, [
'mohon' => $request->mohon,
'message' => $message,
'pinjaman' => $pinjaman,
'nilaimarhun' => $nilaimarhun,
'berat' => $berat,
'margin' => $percentpinj,
'teller' => $auth_user['name']
])->json();
app/Http/Controllers/KhazanahController.php
+140 -37
View File
@@ -469,33 +469,7 @@ class KhazanahController extends Controller
$kelulusan = Http::get(config('api.url') . '/api/SenaraiKelulusan/' . $auth_user['cawangan'])->json();
$kelulusanmohonid = Http::get(config('api.url') . '/api/GetLulusAll/' . $auth_user['cawangan'])->json();
foreach($kelulusan as $index=>$k)
{
$komen = explode("|",$k['komen']);
$results=array_search("",$komen,true);
if($results !== false) {
unset($komen[$results]);
}
array_push($arraykelulusan,['norujukan' => $k['norujukan'],'siri' => $k['siri'], 'namateller' => $k['teller'], 'pinjaman' => $k['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $k['pelulus']]);
}
foreach($kelulusanmohonid as $index=>$km)
{
$komen = explode("|",$km['katalaluan']);
$results=array_search("",$komen,true);
if($results !== false) {
unset($komen[$results]);
}
array_push($arraykelulusanmohonid,['norujukan' => $km['norujukan'], 'teller' => $km['teller'], 'mohon' => $km['mohon'], 'pinjaman' => ($komen[0] ?? '-'), 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'), 'margin' => ($komen[3] ?? '-')]);
}
return view('khazanah.kelulusan',compact('cawangan_info','api_url','arraykelulusan','arraykelulusanmohonid'));
return view('khazanah.kelulusan',compact('cawangan_info','api_url','kelulusan','kelulusanmohonid'));
}
@@ -586,6 +560,7 @@ class KhazanahController extends Controller
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/kepohonan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pembatalan" => $request->batal,
"komen" => $request->komenubahhapus,
"khazanah" => $request->khazanah
])->json();
@@ -705,6 +680,10 @@ class KhazanahController extends Controller
'bilgadai' => 1,
'jumpinjam' => $request->jumpinjam,
'jenistebus' => "G",
'margin' => $request->margin,
'berat' => $request->berat,
'nilaimarhun' => $request->nilaimarhun,
'status' => $request->status,
'teller' => $request->teller,
'pelulus' => "khazanah"
])->json();
@@ -2271,14 +2250,14 @@ class KhazanahController extends Controller
$auth_user = Auth::user();
$gldetail = Http::post(config('api.url').'/api/gldetailkaunter/'. $auth_user['cawangan'],[
'amaun' => $request->amaun,
'jenisgldetail' => $request->jenisgldetail,
'keterangan' => $request->keterangan,
'kodcaw' => $request->kodcaw,
'teller' => $request->teller,
'dtacct' => $request->dtacct,
'ktacct' => $request->ktacct
])->json();
'amaun' => $request->amaun,
'jenisgldetail' => $request->jenisgldetail,
'keterangan' => $request->keterangan,
'kodcaw' => $request->kodcaw,
'teller' => $request->teller,
'dtacct' => $request->dtacct,
'ktacct' => $request->ktacct
])->json();
$amaun=$request->amaun;
@@ -2300,10 +2279,10 @@ class KhazanahController extends Controller
])->json();
}
return $this->denominasipendahuluanserahan($request);
return $this->denominasipendahuluanserahan($request,$gldetail);
}
public function denominasipendahuluanserahan($request)
public function denominasipendahuluanserahan($request,$gldetail)
{
$auth_user = Auth::user();
@@ -2419,12 +2398,136 @@ class KhazanahController extends Controller
]);
}
$denopendser = Http::post(config('api.url').'/api/requestdenopendser/'.$auth_user['cawangan'],[
'kodlaluan' => $auth_user['name'],
'amaun' => floatval($request->amaun),
'bd1' => 0,
'bd5' => 0,
'bd10' => 0,
'bd20' => 0,
'bd50' => 0,
'bd100' => 0,
'txtring1' => intval($request->ambilanring1),
'txtring5' => intval($request->ambilanring5),
'txtring10' => intval($request->ambilanring10),
'txtring20' => intval($request->ambilanring20),
'txtring50' => intval($request->ambilanring50),
'txtring100' => intval($request->ambilanring100),
'txtring1000' => 0,
'txtsen1' => intval($request->ambilansen1),
'txtsen5' => intval($request->ambilansen5),
'txtsen10' => intval($request->ambilansen10),
'txtsen20' => intval($request->ambilansen20),
'txtsen50' => intval($request->ambilansen50),
'jenis' => $request->jenisgldetail,
'recno' => intval($gldetail['id'])
]);
if($denominasiupdate)
return "LULUS";
else
return "GAGAL";
}
public function deletependahuluanserahan(Request $request)
{
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$denopendser = Http::get( config('api.url') .'/api/getdenopendser/'. $auth_user['cawangan'],['recno' => $request->recno])->json();
if(sizeof($denopendser) > 0)
$denopendser = $denopendser[0];
$denominasilist = Http::get( config('api.url') .'/api/DenominasiController/'. $auth_user['cawangan'])->json();
//bundle initialize
$rekodb1 = $denominasilist[0]['bd1']; $rekodb5 = $denominasilist[0]['bd5']; $rekodb10 = $denominasilist[0]['bd10']; $rekodb20 = $denominasilist[0]['bd20'];
$rekodb50 = $denominasilist[0]['bd50']; $rekodb100 = $denominasilist[0]['bd100'];
//wang Syilling Initialize
$rekodsen1 = $denominasilist[0]['txtsen1']; $rekodsen5 = $denominasilist[0]['txtsen5']; $rekodsen10 = $denominasilist[0]['txtsen10'];
$rekodsen20 = $denominasilist[0]['txtsen20']; $rekodsen50 = $denominasilist[0]['txtsen50'];
//Wang Ringgit Initialize
$rekodring1 = $denominasilist[0]['txtring1']; $rekodring5 = $denominasilist[0]['txtring5']; $rekodring10 = $denominasilist[0]['txtring10'];
$rekodring20 = $denominasilist[0]['txtring20']; $rekodring50 = $denominasilist[0]['txtring50']; $rekodring100 = $denominasilist[0]['txtring100'];
if($request->jenisserahan === 'pendahuluan')
{
//Tolok Rekod
$rekodsen1 -= intval($denopendser['txtsen1']);
$rekodsen5 -= intval($denopendser['txtsen5']);
$rekodsen10 -= intval($denopendser['txtsen10']);
$rekodsen20 -= intval($denopendser['txtsen20']);
$rekodsen50 -= intval($denopendser['txtsen50']);
$rekodring1 -= intval($denopendser['txtring1']);
$rekodring5 -= intval($denopendser['txtring5']);
$rekodring10 -= intval($denopendser['txtring10']);
$rekodring20 -= intval($denopendser['txtring20']);
$rekodring50 -= intval($denopendser['txtring50']);
$rekodring100 -= intval($denopendser['txtring100']);
}else{
//Tolok Rekod
$rekodsen1 += intval($denopendser['txtsen1']);
$rekodsen5 += intval($denopendser['txtsen5']);
$rekodsen10 += intval($denopendser['txtsen10']);
$rekodsen20 += intval($denopendser['txtsen20']);
$rekodsen50 += intval($denopendser['txtsen50']);
$rekodring1 += intval($denopendser['txtring1']);
$rekodring5 += intval($denopendser['txtring5']);
$rekodring10 += intval($denopendser['txtring10']);
$rekodring20 += intval($denopendser['txtring20']);
$rekodring50 += intval($denopendser['txtring50']);
$rekodring100 += intval($denopendser['txtring100']);
}
$denominasicreate = Http::put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[
'bd1' => $rekodb1,
'bd5'=> $rekodb5,
'bd10'=> $rekodb10,
'bd20'=> $rekodb20,
'bd50'=> $rekodb50,
'bd100'=> $rekodb100,
'txtring1'=> $rekodring1,
'txtring5'=> $rekodring5,
'txtsen1'=> $rekodsen1,
'txtsen5'=> $rekodsen5,
'txtsen10'=> $rekodsen10,
'txtsen20'=> $rekodsen20,
'txtsen50'=> $rekodsen50,
'txtring10'=> $rekodring10,
'txtring20'=> $rekodring20,
'txtring50'=> $rekodring50,
'txtring100'=> $rekodring100,
'txtring1000'=> "0",
'jumlahbundle'=> "0",
'txtjumlah'=> "0",
'jumlahkeping' => "0"
]);
$deletependser = Http::post(config('api.url') . '/api/DeletePendSer/'. $auth_user['cawangan'],[
'recno' => $request->recno
])->json();
$updateVault = Http::put( config('api.url').'/api/UpdateVault/PendahuluanSerahan/'.$auth_user['cawangan']);
$upVault = $updateVault->getStatusCode();
$upDeno = $denominasicreate->getStatusCode();
if($upVault == 200 && $upDeno == 200)
{
return 'berjaya';
}else{
return 'gagal';
}
}
app/Http/Controllers/OperasiController.php
+15 -8
View File
@@ -37,14 +37,7 @@ class OperasiController extends Controller
{
foreach($lulus['kelulusanall'] as $index=>$kel)
{
$komen = explode("|",$kel['komen']);
$results=array_search("",$komen,true);
if($results !== false) {
unset($komen[$results]);
}
array_push($arraykelulusan,["cawangan" => $lulus['cawangan'], "cawangankod" => $lulus['cawangankod'],"namateller" => $kel['teller'], 'siri' => $kel['siri'] , "norujukan" => $kel['norujukan'], 'pinjaman' => $kel['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $kel['pelulus']]);
array_push($arraykelulusan,["cawangan" => $lulus['cawangan'], "cawangankod" => $lulus['cawangankod'],"namateller" => $kel['teller'], 'siri' => $kel['siri'] , "norujukan" => $kel['norujukan'], 'pinjaman' => $kel['jumpinj'], 'nilaimarhun' => ($kel['nilaimarhun'] ?? '-'), 'berat' => ($kel['berat'] ?? '-'),'margin' => ($kel['margin'] ?? '-'), 'status' => ($kel['status'] ?? '-'), 'pelulus' => $kel['pelulus']]);
}
}
@@ -86,6 +79,11 @@ class OperasiController extends Controller
if($request->pembatalan == null)
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusanKomen/' . $request->kodcaw . '/' . $norujukan,[
"komen" => $request->komenkelulusan,
'siri' => $request->siri
])->json();
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 1,
'namaoperasi' => $request->namaoperasi,
@@ -99,6 +97,11 @@ class OperasiController extends Controller
}
else
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusanKomen/' . $request->kodcaw . '/' . $norujukan,[
"komen" => $request->komenkelulusan,
'siri' => $request->siri
])->json();
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 2,
'namaoperasi' => $request->namaoperasi,
@@ -143,6 +146,10 @@ class OperasiController extends Controller
'dategadai' => $current->toDateString(),
'bilgadai' => 1,
'siri' => $siri,
'margin' => $request->margin,
'berat' => $request->berat,
'nilaimarhun' => $request->nilaimarhun,
'status' => $request->status,
'jumpinjam' => $request->jumpinjam,
'jenistebus' => "G",
'teller' => $request->teller,