fix conflict

2021-06-20 15:30:28 +08:00
parent 42b83449f1
commit 12408dbdd1
2 changed files with 3 additions and 6 deletions
@@ -49,10 +49,9 @@ class LaporanController extends Controller
                    ->whereDate('trans.created_at','=',$request->tarikh)
                    ->where('trans.trans_type','=','A')
                    ->groupBy('trans.id')
-                    ->sum('keuntungan_rebet');
+                    ->sum('bayaran_keuntungan');

        // $total_ansuran = number_format($total_ansuran,2);
-
        $total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus);