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

aliran tunai and fix ansurans tebus

Browse Source
This commit is contained in:
hafifierahman
2021-01-19 09:50:36 +08:00
parent 1ed798f664
commit a1227e5c4e
13 changed files with 248 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+25 -2
View File
@@ -18,10 +18,33 @@ class AliranTunaiController extends Controller
public function index(){
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$alirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'] . '/' . 'SAMSIANA')->json();
$alirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'] . '/' . $auth_user['name'])->json();
// dd($alirantunai);
if(sizeof($alirantunai) == 0)
{
$alirantunai = Http::post(config('api.url') . '/api/tunai/daftarTunai/' . $auth_user['cawangan'], [
'kodcaw' => $auth_user['cawangan'],
'teller' => $auth_user['name'],
'bakiawal' => 0.00,
'masuk' => 0.00,
'yuran' => 0.00,
'keluar' => 0.00,
'baki' => 0.00,
'tambah' => 0.00,
'kurang' => 0.00
])->json();
}
$GT = Http::get(config('api.url') . '/api/countGT/' . $auth_user['cawangan'])->json();
if(sizeof($GT) > 0);
{
$GT = $GT[0];
}
$api_url = config('api.url');
return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url'));
return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT'));
}
}
app/Http/Controllers/GadaianController.php
+7 -4
View File
@@ -300,6 +300,9 @@ class GadaianController extends Controller
$totaltransaction = 0;
$transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
if(sizeof($transaction) != 0)
$transaction = $transaction[0];
@@ -319,10 +322,10 @@ class GadaianController extends Controller
public function resitbelumansurans($id)
{
$totaltransaction = 0;
// $totaltransaction = 0;
if(sizeof($transaction) != 0)
$transaction = $transaction[0];
// if(sizeof($transaction) != 0)
// $transaction = $transaction[0];
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
@@ -334,7 +337,7 @@ class GadaianController extends Controller
if(sizeof($customers_info) != 0)
$customers_info = $customers_info[0];
return view('print.resitansuransebelum',compact('transaction','gadai','customers_info'));
return view('print.resitansuransebelum',compact('gadai','customers_info'));
}
public function resittebus($id)
app/Http/Controllers/KhazanahController.php
+67 -45
View File
@@ -83,6 +83,9 @@ class KhazanahController extends Controller
$getVault = $getVault[0]['bakiawal'];
//Dashboardall
$dashboard=Http::get( config('api.url').'/api/Dashboard_all/'.$auth_user['cawangan'])->json();
//Marhun Terkumpul
$marhun = Http::get(config('api.url'). '/api/marhunterkumpul/laporan/'. $auth_user['cawangan'] .'/'. $harini->toDateString())->json();
@@ -94,7 +97,7 @@ class KhazanahController extends Controller
}
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('khazanah.dashboard',compact('cawangan_info','api_url','totalmarhun','ringkasanharian','ringkasanterkumpul','getVault','keseluruhanupahharian','keseluruhanupahterkumpul'));
return view('khazanah.dashboard',compact('cawangan_info','api_url','dashboard','totalmarhun','ringkasanharian','ringkasanterkumpul','getVault','keseluruhanupahharian','keseluruhanupahterkumpul'));
}
public function alirantunai()
@@ -103,10 +106,15 @@ class KhazanahController extends Controller
$api_url = config('api.url');
$tunai = Http::get( config('api.url') .'/api/TunaiController/'. $auth_user['cawangan'])->json();
$tunai = $tunai[0];
if(sizeof($tunai) > 0)
$tunai = $tunai[0];
$addtunai = Http::get( config('api.url') .'/api/getAddTunai/'. $auth_user['cawangan'])->json();
// if(sizeof($addtunai) > 0)
// $addtunai = $addtunai[0];
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
@@ -161,8 +169,7 @@ class KhazanahController extends Controller
$gadai = Http::get( config('api.url') .'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'])->json();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$reqTeller = Http::get( config('api.url') .'/api/requestTeller/get/'. $auth_user['cawangan'].'/SAMSIANA')->json();
$reqTeller = Http::get( config('api.url') .'/api/requestTeller/get/'. $auth_user['cawangan'])->json();
foreach($reqTeller as $index=>$req)
@@ -177,12 +184,17 @@ class KhazanahController extends Controller
$array_reqteller = $array_reqteller[0]['teller'];
// dd($array_reqteller);
$listUser=User::where('cawangan',$auth_user['cawangan'] )->get();
$denominasi=Http::get(config('api.url').'/api/DenominasiController/'.$auth_user['cawangan'])->json();
if(sizeof($denominasi) == 0)
{
$denominasi=Http::post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'])->json();
}
// dd($denominasi);
return view('khazanah.pendahuluanserah',compact('cawangan_info','api_url','listUser','denominasi','array_reqteller'));
}
@@ -195,7 +207,7 @@ class KhazanahController extends Controller
$auth_user = Auth::user();
$api_url = config('api.url');
$reqTeller = Http::get( config('api.url') .'/api/requestTeller/get/'. $auth_user['cawangan'].'/SAMSIANA')->json();
$reqTeller = Http::get( config('api.url') .'/api/requestTeller/get/'. $auth_user['cawangan'])->json();
$gadai = Http::get( config('api.url') .'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'])->json();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
@@ -407,6 +419,7 @@ class KhazanahController extends Controller
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$tunai=Http::get(config('api.url').'/api/TunaiController/'.$auth_user['cawangan'])->json();
return view('khazanah.pendahuluan',compact('cawangan_info','api_url','auth_user','tunai'));
@@ -472,6 +485,7 @@ class KhazanahController extends Controller
public function denominasicalculationpendahuluan($request)
{
$auth_user = Auth::user();
$denominasilist = Http::get( config('api.url') .'/api/DenominasiController/'. $auth_user['cawangan'])->json();
@@ -536,7 +550,7 @@ class KhazanahController extends Controller
]);
$updaterequest=Http::put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'] . '/' . "SAMSIANA",[
$updaterequest=Http::put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'] . '/' . $request->teller,[
'no'=>$request->no
@@ -548,6 +562,8 @@ class KhazanahController extends Controller
public function denominasicalculationserahan($request)
{
$auth_user = Auth::user();
$denominasilist = Http::get( config('api.url') .'/api/DenominasiController/'. $auth_user['cawangan'])->json();
@@ -612,7 +628,7 @@ class KhazanahController extends Controller
]);
$updaterequest=Http::put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'] . '/' . "SAMSIANA",[
$updaterequest=Http::put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'] . '/' . $request->teller,[
'no'=>$request->no
@@ -625,19 +641,27 @@ class KhazanahController extends Controller
public function kemaskiniPendahuluan(Request $request) //Daftar Pendahuluan kepada Kaunter
{
return $this->denominasicalculationpendahuluan($request);
// return $this->denominasicalculationpendahuluan($request);
$auth_user = Auth::user();
$api_url = config('api.url');
$peti_besi_terkini=Http::get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
$baki_akhir=$peti_besi_terkini[0]["bakiakhir"];
if(sizeof($peti_besi_terkini) == 0)
{
$peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json();
$baki_awal=$peti_besi_terkini["bakiawal"];
}
else
{
$baki_awal=$peti_besi_terkini[0]["bakiawal"];
}
$amount = $request->amt;
// dd($baki_akhir);
if($amount>$baki_akhir)
if($amount>$baki_awal)
{
dd($amount);
//WI ERROR MESSAGE SKIT
@@ -645,6 +669,8 @@ class KhazanahController extends Controller
else
{
$tarikh=$request->tarikh;
$kodlaluan=$request->teller;
$tambah=$request->amt;
@@ -652,44 +678,36 @@ class KhazanahController extends Controller
$nota=$request->nota;
$kodcaw=$auth_user['cawangan'];
$addTunai=Http::post(config('api.url').'/api/add/addTunai/'.$auth_user['cawangan'],[
'kodcaw'=>$kodcaw,
'KodLaluan'=>$kodlaluan,
'kodlaluan'=>$kodlaluan,
'tambah'=>$tambah,
'kurang'=>$kurang,
'nota'=>$nota
]);
$getTunai=Http::get(config('api.url').'/api/TunaiController/'.$auth_user['cawangan'])->json();
$getTunai=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $kodlaluan)->json();
if(sizeof($getTunai) == 0)
{
dd($getTunai);
dd($getTunai);
}
else
{
$bakiawal=0;$masuk=0;$yuran=0;$keluar=0;$baki=0;$tmbh=0;$kurang=0;
$bakiawal=0;$masuk=0;$yuran=0;$keluar=0;$baki=0;$tmbh=0;$kurang=0;
$daftarTunai=Http::post(config('api.url').'/api/tunai/daftarTunai/'.$auth_user['cawangan'],[
'teller'=>$request->teller
]);
// $daftarTunai=Http::post(config('api.url').'/api/tunai/daftarTunai/'.$auth_user['cawangan'],[
// 'teller'=>$request->teller
// ]);
$BakiAkhirT=0;$BakiAwalT=0;$tambahT=0;
$getTunai2=Http::get(config('api.url').'/api/TunaiController/'.$auth_user['cawangan'])->json();
$getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $kodlaluan)->json();
$bakiAwal=$getTunai2['bakiawal'];
$keluar=$getTunai2['keluar'];
$baki=$getTunai2['baki'];
$tam=$getTunai2['tambah'];
$bakiAwal=$getTunai2[0]['bakiawal'];
$keluar=$getTunai2[0]['keluar'];
if($bakiAwal==0)
{
$BakiAwalT=0;
@@ -700,7 +718,7 @@ class KhazanahController extends Controller
}
if($keluar==0)
{
$tambahT=$tambah;
$tambahT=$tambah + $tam;
}
else
$tambahT=$keluar;
@@ -714,8 +732,6 @@ class KhazanahController extends Controller
'kurang'=>$kurang,
'bakiakhir'=>$BakiAkhirT
]);
$latestVault=Http::get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
$masukV=$latestVault[0]['masuk'];
@@ -723,8 +739,7 @@ class KhazanahController extends Controller
$pendahuluanV=$latestVault[0]['pendahuluan'];
$serahanV=$latestVault[0]['serahan'];
$BakiAwalV=$latestVault[0]['bakiawal'];
// dd($latestVault);
// return;
$keluarV=$keluarV+$tambahT;
@@ -733,12 +748,16 @@ class KhazanahController extends Controller
$bakiTerkini=$GetLatestBakiTunai;
$bakiAwalV=$BakiAwalV;
$bakiAkhirV=$bakiAwalV-$keluarV+$masukV+$pendahuluanV-$serahanV;
$bakiEOD=$bakiAkhirV+$GetLatestBakiTunai;
$createTempVault=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan']);
// $bakiEOD=$bakiAkhirV+$GetLatestBakiTunai; //try test
$bakiEOD = $bakiAkhirV;
// dd($bakiEOD);
// $createTempVault=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan']);
// dd($bakiAkhirV);
//get temporary latest vault/ petibesi
$getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
$updateVault=Http::put( config('api.url').'/api/UpdateVault/'.$auth_user['cawangan'],[
@@ -766,7 +785,7 @@ class KhazanahController extends Controller
public function KemaskiniSerahan(Request $request)
{
return $this->denominasicalculationserahan($request);
$auth_user = Auth::user();
$api_url = config('api.url');
@@ -869,6 +888,8 @@ class KhazanahController extends Controller
else
$serahan_V=$serahanV;
}
$GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json();
@@ -894,6 +915,7 @@ class KhazanahController extends Controller
//--FINAL RESULT...KENA RIDERECT KE PAGE SEBELUMNYA..
dd($updateVault);
return $this->denominasicalculationserahan($request);
}