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

Merge branch 'adminapi' into 'master'

Browse Source 
Adminapi

See merge request online-sistem1/api_arrahn!153
This commit is contained in:
hafifie rahman
2022-08-02 04:12:51 +00:00
parent aba1af6e79 6836ecad71
commit e4ffdd9e59
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+1 -1
View File
@@ -2323,7 +2323,7 @@ class AdminPageController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$wtdnorujukan = WTDDraft::on('mysql7')->where('batchno_serah',$batchno)->pluck('norujukan'); $wtdnorujukan = WTDDraft::on('mysql7')->where('batchno_serah',$batchno)->where('kodcaw','=',$request->kodcaw)->pluck('norujukan');
$lelong = Lelong::on($cawangan['mysql']) $lelong = Lelong::on($cawangan['mysql'])
->select('gadai.norujukan','lelong.t_lelong','gadai.pinjaman','lelong.baki') ->select('gadai.norujukan','lelong.t_lelong','gadai.pinjaman','lelong.baki')
app/Http/Controllers/GadaiController.php
+3 -1
View File
@@ -2907,8 +2907,10 @@ class GadaiController extends Controller
->sum('teb.pinjaman'); ->sum('teb.pinjaman');
$pembiayaanlelong = Lelong::on($cawangan['mysql']) $pembiayaanlelong = Lelong::on($cawangan['mysql'])
->join('gadai as gad','gad.norujukan','=','lelong.norujukan')
->where('gad.t_gadai','<=',$tarikhtawarruq)
->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga]]) ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga]])
->sum('pinjaman'); ->sum('lelong.pinjaman');
$tebus = $tebus + $pembiayaanlelong; $tebus = $tebus + $pembiayaanlelong;