diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index a088cab..17b4277 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -1244,6 +1244,9 @@ class LaporanController extends Controller $current = Carbon::now(); $current = new Carbon(); + $mulaCarbon = new Carbon($request->mula); + $hinggaCarbon = new Carbon($request->hingga); + /* Start Keuntungan Sebenar Calculation */ $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") @@ -1278,13 +1281,13 @@ class LaporanController extends Controller ->whereIn('trans.norujukan',$get_norujukan) ->whereDate('trans.tarikh_bayaran' ,'>=', $request->mula) ->whereDate('trans.tarikh_bayaran' ,'<=', $request->hingga) - ->whereYear('tarikh_bayaran','=',$current->year) + ->whereYear('tarikh_bayaran','=',$mulaCarbon->year) ->where('trans.kodcaw',$request->kodcaw) ->get()->toArray(); $upahlelong = Lelong::on($cawangan['mysql']) ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga],['t_jual','>','2022-07-24']]) - ->whereYear('t_jual','=',$current->year) + ->whereYear('t_jual','=',$mulaCarbon->year) ->sum('bakiupah'); $sum_keuntungan = ($summation) ? $summation[0]['sum_keun'] : 0;