fix skit2
This commit is contained in:
@@ -1396,6 +1396,35 @@ class GadaiController extends Controller
|
|||||||
'baki' => $bakiakhir
|
'baki' => $bakiakhir
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
}else{
|
||||||
|
|
||||||
|
$bakiakhir = $baki;
|
||||||
|
|
||||||
|
if($tebus['jenistebus'] == 'P')
|
||||||
|
{
|
||||||
|
|
||||||
|
$bakiakhir = $bakiakhir - $tebus['bakiupah'] + $tebus['addpinjaman'];
|
||||||
|
|
||||||
|
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
|
||||||
|
update(array(
|
||||||
|
'keluar' => $keluar,
|
||||||
|
'masuk' => $masuk,
|
||||||
|
'baki' => $bakiakhir
|
||||||
|
));
|
||||||
|
|
||||||
|
}else{
|
||||||
|
|
||||||
|
$bakiakhir = $bakiakhir - $tebus['bakipjm'];
|
||||||
|
|
||||||
|
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
|
||||||
|
update(array(
|
||||||
|
'keluar' => $keluar,
|
||||||
|
'masuk' => $masuk,
|
||||||
|
'baki' => $bakiakhir
|
||||||
|
));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -1424,6 +1453,18 @@ class GadaiController extends Controller
|
|||||||
'masuk' => $masuk,
|
'masuk' => $masuk,
|
||||||
'baki' => $bakiakhir
|
'baki' => $bakiakhir
|
||||||
));
|
));
|
||||||
|
}else{
|
||||||
|
|
||||||
|
$bakiakhir = $baki;
|
||||||
|
|
||||||
|
$bakiakhir -= $gadai[0]['pinjaman'];
|
||||||
|
|
||||||
|
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
|
||||||
|
update(array(
|
||||||
|
'keluar' => $keluar,
|
||||||
|
'masuk' => $masuk,
|
||||||
|
'baki' => $bakiakhir
|
||||||
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
|
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
|
||||||
@@ -1456,7 +1497,7 @@ class GadaiController extends Controller
|
|||||||
$pendahuluan=$tunai['tambah'];
|
$pendahuluan=$tunai['tambah'];
|
||||||
$serahan=$tunai['kurang'];
|
$serahan=$tunai['kurang'];
|
||||||
$totalmasuk = 0;
|
$totalmasuk = 0;
|
||||||
$bakiakhir = 0;
|
$bakiakhir = $baki;
|
||||||
$totalkeluar = 0;
|
$totalkeluar = 0;
|
||||||
|
|
||||||
if($tebus[0]['tagterima'] == 1)
|
if($tebus[0]['tagterima'] == 1)
|
||||||
@@ -1464,6 +1505,7 @@ class GadaiController extends Controller
|
|||||||
if($tebus[0]['jenistebus'] == 'T')
|
if($tebus[0]['jenistebus'] == 'T')
|
||||||
{
|
{
|
||||||
$totalmasuk = $masuk - $tebus[0]['bakipjm'];
|
$totalmasuk = $masuk - $tebus[0]['bakipjm'];
|
||||||
|
|
||||||
$bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
|
$bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
|
||||||
|
|
||||||
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
|
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
|
||||||
@@ -1486,6 +1528,16 @@ class GadaiController extends Controller
|
|||||||
|
|
||||||
if($tebus[0]['jenistebus'] == 'T')
|
if($tebus[0]['jenistebus'] == 'T')
|
||||||
{
|
{
|
||||||
|
|
||||||
|
$bakiakhir = $bakiakhir - $tebus[0]['bakipjm'];
|
||||||
|
|
||||||
|
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
|
||||||
|
update(array(
|
||||||
|
'keluar' => $keluar,
|
||||||
|
'masuk' => $masuk,
|
||||||
|
'baki' => $bakiakhir
|
||||||
|
));
|
||||||
|
|
||||||
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
|
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
|
||||||
|
|
||||||
Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
|
Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
|
||||||
|
|||||||
Reference in New Issue
Block a user