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

Merge branch 'apiaku' into 'master'

Browse Source 
fix lejeram

See merge request online-sistem1/api_arrahn!129
This commit is contained in:
hafifie rahman
2021-11-07 05:53:18 +00:00
parent b9f38fd009 7d5157461f
commit 9d95f13414
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+16 -8
View File
@@ -2915,16 +2915,24 @@ class GadaiController extends Controller
->where('kodcaw',$kodcaw) ->where('kodcaw',$kodcaw)
->pluck('norujukan'); ->pluck('norujukan');
$transaksi_kredit_gadai = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data) $transaksi_kredit_gadai = Gadai::on($cawangan['mysql'])
->where([['sttebus',''],['hargajualan','<>','null']]) ->whereIn('gadai.norujukan',$transaksi_data)
->pluck('norujukan'); ->join('tebus as t','gadai.norujukan','=','t.norujukan')
->where([['hargajualan','<>','null']])
->pluck('gadai.norujukan');
$transaksi_kredit = TransaksiKeuntungan::on('mysql7') $transaksi_kredit = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$transaksi_kredit_gadai) ->leftJoin('transaction as trans', function($join)
->whereDate('tarikh_bayaran','<=', $request->hingga) {
->whereDate('tarikh_bayaran','>=', $request->mula) $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
// ->whereBetween('tarikh_bayaran',[$from,$to]) $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
->sum('bayaran_pembiayaan'); })
->whereIn('transaksi_keuntungan.norujukan',$transaksi_kredit_gadai)
->where('trans.trans_type','=','A')
->whereDate('tarikh_bayaran','<=', $request->hingga)
->whereDate('tarikh_bayaran','>=', $request->mula)
// ->whereBetween('tarikh_bayaran',[$from,$to])
->sum('bayaran_pembiayaan');
// $transaksi_kredit = TransaksiKeuntungan::on('mysql7') // $transaksi_kredit = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')