diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index db9cdec..39de13d 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -1032,14 +1032,27 @@ class TebusController extends Controller $keuntunganreducing = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->join('transaction as t','transaksi_keuntungan.norujukan','=','t.norujukan') + ->where('t.trans_type','!=','A') // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq) ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) - ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('keuntungan_rebet'); - $total = $keuntungan + $keuntunganreducing; + $keuntunganansuran = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->join('transaction as t','transaksi_keuntungan.norujukan','=','t.norujukan') + ->where('t.trans_type','=','A') + // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq) + ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) + ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereYear('tarikh_bayaran','=',$current->year) + ->whereNotNull('db2.hargajualan') + ->sum('bayaran_keuntungan'); + + $total = $keuntungan + $keuntunganreducing + $keuntunganansuran; return response($total); }