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

fix keuntungan sebenar

Browse Source
This commit is contained in:
Hafifie PKB
2024-08-10 16:01:17 +08:00
parent 97a4868f50
commit da177c9eb6
3 changed files with 99 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+4 -12
View File
@@ -2938,18 +2938,11 @@ class GadaiController extends Controller
$Gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','NULL']])->sum('pinjaman');
$Tebus = Gadai::on($cawangan['mysql'])
->join('tebus as teb','teb.norujukan','=','gadai.norujukan')
->where('gadai.tagpalsu','=',0)
->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['gadai.sttebus','=','T'],['gadai.hargajualan','<>','NULL']])
->where([['gadai.t_update','>=',$request->mula],['gadai.t_update','<=',$request->hingga],['gadai.hargajualan','<>','NULL']])
->whereIn('gadai.sttebus', ['T', 'L'])
->sum('gadai.pinjaman');
$pembiayaanlelong = Lelong::on($cawangan['mysql'])
->join('gadai as gad','gad.norujukan','=','lelong.norujukan')
->where('gad.hargajualan','!=',null)
->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga]])
->sum('lelong.pinjaman');
$Tebus += $pembiayaanlelong;
$rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus];
@@ -3188,9 +3181,8 @@ class GadaiController extends Controller
$tebus = Gadai::on($cawangan['mysql'])
->select('gadai.norujukan','gadai.hargajualan','gadai.bakihargajualan')
->join('tebus as t','gadai.norujukan','=','t.norujukan')
->where('gadai.sttebus','T')
->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga]])
->whereIn('gadai.sttebus',['T','L'])
->where([['t_update','>=',$request->mula],['t_update','<=',$request->hingga]])
->groupBy('gadai.norujukan')
->get();