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

Merge branch 'pipiv2' of https://gitlab.com/online-sistem1/kaunter into pipiv2

Browse Source
This commit is contained in:
fifi97
2021-05-09 20:31:26 +08:00
parent de9d1434c0 de39b6a2ee
commit bd232b3201
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+28 -8
View File
@@ -1434,7 +1434,7 @@ class AliranTunaiController extends Controller
$ansuran = Http::get(config('api.url'). '/api/ansuran/laporan/'. $auth_user['cawangan'],['tarikh' => $current->toDateString()])->json(); $ansuran = Http::get(config('api.url'). '/api/ansuran/laporan/'. $auth_user['cawangan'],['tarikh' => $current->toDateString()])->json();
$requestkodlaluan = Http::get(config('api.url').'/api/get/pengguna/'.$auth_user['cawangan'],["namateller" => Auth::user()->name ])->json(); $requestkodlaluan = Http::get(config('api.url').'/api/get/pengguna/'.$auth_user['cawangan'],["namateller" => Auth::user()->name ])->json();
$advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => $requestkodlaluan[0]['kodlaluan']])->json(); $advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => Auth::user()->name ])->json();
$totalserahan = 0; $totalserahan = 0;
$totalpendahuluan = 0; $totalpendahuluan = 0;
@@ -1452,15 +1452,26 @@ class AliranTunaiController extends Controller
} }
$totalgadai = 0; $totalgadai = 0;
$totalgadaibarcodescanned = 0;
foreach($gadai as $index1=>$gad) foreach($gadai as $index1=>$gad)
{ {
$totalgadai += $gad['pinjaman']; if($gad['semakbarcode'] === 'LULUS')
$totalgadai += $gad['pinjaman'];
} }
$totaltebus = 0; $totaltebus = 0;
$totalgadaibarcodescanned = 0;
foreach($tebus as $index1=>$teb) foreach($tebus as $index1=>$teb)
{ {
$totaltebus += $teb['bakipjm']; if($teb['tagterima'] === 1){
if($teb['jenistebus'] === 'S')
{
$totaltebus += $teb['pinjaman'] + $teb['bakiupah'];
}else{
$totaltebus += $teb['bakipjm'];
}
}
} }
$totalansuran = 0; $totalansuran = 0;
@@ -1472,7 +1483,7 @@ class AliranTunaiController extends Controller
$totalupahlama = 0; $totalupahlama = 0;
foreach($advansur as $index1=>$upahlama) foreach($advansur as $index1=>$upahlama)
{ {
$totalupahlama += $upahlama['upahDiBayar']; $totalupahlama += $upahlama['upahDibayar'];
} }
$penebusan = floatval($totaltebus) + floatval($totalansuran) + floatval($totalupahlama); $penebusan = floatval($totaltebus) + floatval($totalansuran) + floatval($totalupahlama);
@@ -1497,7 +1508,7 @@ class AliranTunaiController extends Controller
if(number_format($gadaian,2) != number_format($keluar,2)) if(number_format($gadaian,2) != number_format($keluar,2))
$errorgadaian = true; $errorgadaian = true;
if($errorpendahuluan === false && $errorserahan === false && $errorgadaian === false && $errorpenebusan === false && $errorbaki === false) if($errorbaki === false)
{ {
return response('sama'); return response('sama');
}else{ }else{
@@ -1511,12 +1522,21 @@ class AliranTunaiController extends Controller
$auth_user = Auth::user(); $auth_user = Auth::user();
$alirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => $auth_user['name']])->json();
$keluar = $alirantunai['keluar'];
$baki = $alirantunai['baki'];
$masuk = $alirantunai['masuk'];
$bakiawal = $alirantunai['bakiawal'];
$pendahuluan = $alirantunai['tambah'];
$serahan = $alirantunai['kurang'];
$updateTunai = Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ $updateTunai = Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
'kodlaluan' => $auth_user['name'], 'kodlaluan' => $auth_user['name'],
'keluar'=> $request->gadaian, 'keluar'=> $keluar,
'masuk'=> $request->penebusan, 'masuk'=> $masuk,
'bakiakhir'=> $request->bakiakhir 'bakiakhir'=> $request->bakiakhir
]); ]);
if($updateTunai->status() == 200) if($updateTunai->status() == 200)
{ {