fix imbangduga latest

2023-12-30 14:23:59 +08:00
parent 9b611cbaf7
commit bc8f9a14e9
7 changed files with 50 additions and 12 deletions
@@ -3157,7 +3157,29 @@ class AdminPageController extends Controller
        ->where('margin_semasa','=',0)
        ->sum('bayaran_keuntungan');

-        $total = $sum_keun_tebus + $sum_keun_ansuran;
+
+        $sagbaru_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','=',$year)
+        ->whereMonth('t_gadai','<=',$month)
+        ->where('sttebus','=','')
+        ->where('tagbaru',1)
+        ->pluck('norujukan');
+
+        $keuntungan_baru = Transaction::on('mysql7')
+        ->leftJoin('transaksi_keuntungan as trans', function($join)
+        {
+                $join->on('transaction.norujukan', '=', 'trans.norujukan');
+                $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
+        })
+        ->whereIn('trans.norujukan',$sagbaru_norujukan)
+        ->where('transaction.trans_type','A')
+        ->sum('bayaran_keuntungan');
+
+
+        $total = $sum_keun_tebus + $sum_keun_ansuran + $keuntungan_baru;


        return response()->json($total);