From 7d5157461f30edbea369277cff6cac1605430813 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 7 Nov 2021 13:45:00 +0800 Subject: [PATCH] fix lejeram --- app/Http/Controllers/GadaiController.php | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 7387700..42e1d4c 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2912,16 +2912,24 @@ class GadaiController extends Controller ->where('kodcaw',$kodcaw) ->pluck('norujukan'); - $transaksi_kredit_gadai = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data) - ->where([['sttebus',''],['hargajualan','<>','null']]) - ->pluck('norujukan'); + $transaksi_kredit_gadai = Gadai::on($cawangan['mysql']) + ->whereIn('gadai.norujukan',$transaksi_data) + ->join('tebus as t','gadai.norujukan','=','t.norujukan') + ->where([['hargajualan','<>','null']]) + ->pluck('gadai.norujukan'); $transaksi_kredit = TransaksiKeuntungan::on('mysql7') - ->whereIn('norujukan',$transaksi_kredit_gadai) - ->whereDate('tarikh_bayaran','<=', $request->hingga) - ->whereDate('tarikh_bayaran','>=', $request->mula) - // ->whereBetween('tarikh_bayaran',[$from,$to]) - ->sum('bayaran_pembiayaan'); + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->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') // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')