fix keuntungan sebenar

2024-08-10 16:01:17 +08:00
parent 97a4868f50
commit da177c9eb6
3 changed files with 99 additions and 40 deletions
@@ -3143,23 +3143,57 @@ class AdminPageController extends Controller

        /* Ansuran masuk dalam ni */

-        $get_norujukan_ansuran = 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');
+        $collection_trans = TransaksiKeuntungan::on('mysql7')
+        ->leftJoin('transaction as trans', function($join)
+        {
+            $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+            $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+        })
+        ->where('trans.kodcaw','=',$request->kodcaw)
+        ->where('trans.trans_type','=','A')
+        ->where('transaksi_keuntungan.margin_semasa','>','0')
+        ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$year)
+        ->whereMonth('transaksi_keuntungan.tarikh_bayaran','<=',$month)
+        ->get();

-        $summation_ansuran = TransaksiKeuntungan::on('mysql7')
-        ->whereIn('norujukan',$get_norujukan_ansuran)->sum('bayaran_keuntungan');
+
+        $array_norujukan = $collection_trans->pluck('norujukan')->toArray();
+
+        $collection_gadai = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$array_norujukan)->where('tagbaru',1)->get();
+
+        $keuntungan_semasa_collection = $collection_trans->filter(function ($trans) use ($collection_gadai) {
+                
+                foreach ($collection_gadai as $gadai) {
+                        if($gadai->norujukan === $trans->norujukan){
+                                $t_gadai = Carbon::parse($gadai->t_gadai);
+                                $t_bayaran = Carbon::parse($trans->tarikh_bayaran);
+                                
+                                if ($t_gadai->month !== $t_bayaran->month) {
+                                        return false;
+                                }
+                        }
+                }
+                return true;
+        });
+
+        $summation_ansuran = $keuntungan_semasa_collection->sum('bayaran_keuntungan');
+
+        // $get_norujukan_ansuran = 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');
+
+        // $summation_ansuran = TransaksiKeuntungan::on('mysql7')
+        // ->whereIn('norujukan',$get_norujukan_ansuran)->sum('bayaran_keuntungan');



        $total = $sum_keuntungan + $sum_bayaran + $summation_ansuran;
-        // $total = $sum_keuntungan + $sum_bayaran;
        return response()->json($total);
    }