From 5e578a1a9ab8f5aac5230508cd5321a38eac5a1f Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 9 Jun 2021 17:29:32 +0800
Subject: [PATCH] fix imbangduga

---
 app/Http/Controllers/TebusController.php | 35 ++++++++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 39de13d..39455d8 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -1030,11 +1030,25 @@ class TebusController extends Controller
                     ->whereNotNull('db2.hargajualan')
                     ->sum('bayaran_keuntungan');
 
+
         $keuntunganreducing = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-                    ->join('transaction as t','transaksi_keuntungan.norujukan','=','t.norujukan')
-                    ->where('t.trans_type','!=','A')
-                    // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
+                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
+                    ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
+                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->whereNotNull('db2.hargajualan')
+                    ->sum('keuntungan_rebet');
+
+        
+
+        $keuntunganreducinga = TransaksiKeuntungan::on('mysql7')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->leftJoin('transaction as trans', function($join)
+                    {
+                        $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                        $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                    })
+                    ->where('trans.trans_type','!=','A')
                     ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
                     ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
                     ->whereYear('tarikh_bayaran','=',$current->year)
@@ -1043,16 +1057,25 @@ class TebusController extends Controller
 
         $keuntunganansuran = TransaksiKeuntungan::on('mysql7')
                             ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-                            ->join('transaction as t','transaksi_keuntungan.norujukan','=','t.norujukan')
-                            ->where('t.trans_type','=','A')
-                            // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
+                            ->leftJoin('transaction as trans', function($join)
+                            {
+                                $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                                $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                            })
+                            ->where('trans.trans_type','=','A')
                             ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
                             ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
                             ->whereYear('tarikh_bayaran','=',$current->year)
                             ->whereNotNull('db2.hargajualan')
                             ->sum('bayaran_keuntungan');
 
+                            dd($keuntunganreducing,$keuntungan,$keuntunganreducinga,$keuntunganansuran);
+        
+        $total = $keuntungan + $keuntunganreducing + ($keuntunganreducinga - $keuntunganansuran);   
+        dd($total);
         $total = $keuntungan + $keuntunganreducing + $keuntunganansuran;
+        // $total = $keuntungan + $keuntunganreducing;
+
 
         return response($total);
     }