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

fix latest

Browse Source
This commit is contained in:
hafifierahman
2022-01-03 10:59:01 +08:00
parent 3da5630115
commit ba47124d94
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+14 -7
View File
@@ -2728,18 +2728,25 @@ class GadaiController extends Controller
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->sum('pinjaman');
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$tarikhtawarruq]])
->sum('pinjaman');
// if($kodcaw === '011232')
// {
// $rekod_pinjamandiberi -= 282;
// }
$totalemas = 0;
$totalpinjaman = 0;
if($kodcaw === 'GC')
{
$totalemas = floatval($rekod_emaspalsu) - 10000;
$totalpinjaman = floatval($rekod_pinjamandiberi) + 10000;
$array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
}else{
$totalemas = $rekod_emaspalsu;
$totalpinjaman = $rekod_pinjamandiberi;
}
$array_rekodemas = ['pinjamankoop' => $totalpinjaman,'emaspalsu' => $totalemas];
return response()->json($array_rekodemas);
}
@@ -2981,7 +2988,7 @@ class GadaiController extends Controller
->where('trans.trans_type','=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
->whereYear('tarikh_bayaran','=',$current->year)
// ->whereYear('tarikh_bayaran','=',$current->year)
->where('trans.kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');