diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 83ec9fa..5ba4e3d 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -3424,7 +3424,6 @@ class AdminPageController extends Controller $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) ->where('trans.trans_type','!=','A') - ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', '2022') ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09') ->whereYear('transaksi_keuntungan.tarikh_bayaran','<','2022') ->sum('transaksi_keuntungan.keuntungan_rebet'); @@ -3436,7 +3435,6 @@ class AdminPageController extends Controller $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) ->where('trans.trans_type','=','A') - ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', '2022') ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09') ->whereYear('tarikh_bayaran','<','2022') ->where('trans.kodcaw',$kodcaw) @@ -3462,8 +3460,6 @@ class AdminPageController extends Controller $keuntungansebenar = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran); - $keuntungansebenarakru = 0; - $get_norujukan = Gadai::on($cawangan['mysql']) ->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result") ->whereNotNull('hargajualan')->having('result','=',1)->whereYear('t_gadai','=','2022')->where('sttebus','<>','')->pluck('norujukan');