fix imbangduga

2024-04-28 11:06:45 +08:00
parent 13890767dd
commit 5d2f5c53a5
6 changed files with 74 additions and 31 deletions
@@ -1527,8 +1527,6 @@ class TebusController extends Controller
        ->whereYear('t_jual','=',$current->year)
        ->sum('bakiupah');

-        dd($ansuran,$bukanansuran,$upahlelong);
-
 	    $total = ($ansuran + $bukanansuran + $upahlelong);
 	}

@@ -1730,8 +1728,8 @@ class TebusController extends Controller
                    $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
            })
            ->whereIn('trans.norujukan',$get_norujukan)
-            ->where('transaction.trans_type','T')
-            // ->where('trans.margin_semasa','=',0) //3.80
+            ->where('transaction.trans_type','<>','A')
+            ->where('trans.margin_semasa','=',0) //3.80
            ->sum('keuntungan_rebet');

        $sum_keun_ansuran = Transaction::on('mysql7')