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

fix skit2

Browse Source
This commit is contained in:
hafifierahman
2021-11-17 00:59:28 +08:00
parent d9ebb73880 1b94ecb236
commit 1fccbfa88b
11 changed files with 504 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LaporanController.php
+3 -8
View File
@@ -440,7 +440,7 @@ class LaporanController extends Controller
$rekodkoopquery = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']]);
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$tarikhtawarruq]]);
// ->sum('pinjaman');
$rekodkoop = $rekodkoopquery->sum('pinjaman');
@@ -463,18 +463,13 @@ class LaporanController extends Controller
$daterequest->addDays(1);
$bayaranpendahuluan_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->where('db2.sttebus','=','')
// ->where('db2.hargajualan','<>','null')
->where('tarikh_bayaran' ,'<=', $daterequest)
->where('kodcaw',$request->kodcaw)
// ->sum('bayaran_pembiayaan');
// ->get();
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$bayaranpendahuluan_data)
->where('sttebus' , '')
->whereNotNull('hargajualan')
->where([['sttebus',''],['hargajualan','<>','null']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['hargajualan','<>','null']])
->pluck('norujukan');
$bayaranpendahuluan = TransaksiKeuntungan::on('mysql7')