This commit is contained in:
e.arrahn
2021-12-15 10:27:41 +08:00
parent fc6401dc09
commit 73ffd64ae1
2 changed files with 89 additions and 8 deletions
+42
View File
@@ -1497,6 +1497,47 @@ class TebusController extends Controller
$current = Carbon::now();
$current = new Carbon();
if($request->hingga < '2021-06-01')
{
$keuntungan_data = TransaksiKeuntungan::on('mysql7')
->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->hingga)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->where('kodcaw',$request->kodcaw)
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntungan = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiData)
->whereDate('tarikh_bayaran', '<=', $request->hingga)
->whereDate('tarikh_bayaran', '>=', $request->mula)
->whereDate('tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->sum('bayaran_keuntungan');
$keuntunganreducing_data = TransaksiKeuntungan::on('mysql7')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $request->mula)
->whereYear('tarikh_bayaran','=',$current->year)
->where('kodcaw',$request->kodcaw)
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntunganreducing_data)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntunganreducing = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiData)
->whereDate('tarikh_bayaran' ,'<=', $request->hingga)
->whereDate('tarikh_bayaran','>=', $request->mula)
->whereYear('tarikh_bayaran','=',$current->year)
->sum('keuntungan_rebet');
$total = ($keuntungan + $keuntunganreducing);
}else{
$bukanansuran_data = TransaksiKeuntungan::on('mysql7')
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join)
@@ -1550,6 +1591,7 @@ class TebusController extends Controller
}
$total = ($ansuran + $bukanansuran);
}
return response($total);
}