From b4e82cc58ce1df77f4e1255981981a8d248603c0 Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Thu, 10 Jun 2021 09:41:40 +0800
Subject: [PATCH] fix imbang duga untung rugi

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

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 39455d8..971aceb 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -1015,17 +1015,15 @@ class TebusController extends Controller
         $daterequest = new Carbon($request->tarikh);
         $daterequest->addDays(1);
 
-        $dateSM = new Carbon('2021-04-24');
-        $dateSM->addDays(1);
+        $dateSM = '2021-04-24';
 
         $current = Carbon::now();
         $current = new Carbon();
 
         $keuntungan = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-                    // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
-		    ->where('transaksi_keuntungan.tarikh_bayaran', '<=', $daterequest)
-                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM)
                     ->whereYear('tarikh_bayaran','=',$current->year)
                     ->whereNotNull('db2.hargajualan')
                     ->sum('bayaran_keuntungan');
@@ -1033,15 +1031,14 @@ class TebusController extends Controller
 
         $keuntunganreducing = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
-                    ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
+                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
                     ->whereYear('tarikh_bayaran','=',$current->year)
                     ->whereNotNull('db2.hargajualan')
                     ->sum('keuntungan_rebet');
 
-        
 
-        $keuntunganreducinga = TransaksiKeuntungan::on('mysql7')
+        $bukanansuran = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     ->leftJoin('transaction as trans', function($join)
                     {
@@ -1049,31 +1046,35 @@ class TebusController extends Controller
                         $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)
+                    // ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
+                    // ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
                     ->whereYear('tarikh_bayaran','=',$current->year)
                     ->whereNotNull('db2.hargajualan')
                     ->sum('keuntungan_rebet');
 
-        $keuntunganansuran = 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)
-                            ->whereNotNull('db2.hargajualan')
-                            ->sum('bayaran_keuntungan');
+        $ansuran = 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)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
+                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->whereNotNull('db2.hargajualan')
+                    ->sum('bayaran_keuntungan');
 
-                            dd($keuntunganreducing,$keuntungan,$keuntunganreducinga,$keuntunganansuran);
+                            dd($keuntunganreducing,$keuntungan,$bukanansuran,$ansuran);
         
-        $total = $keuntungan + $keuntunganreducing + ($keuntunganreducinga - $keuntunganansuran);   
-        dd($total);
-        $total = $keuntungan + $keuntunganreducing + $keuntunganansuran;
+        // $total = $keuntungan + $keuntunganreducing + ($keuntunganreducinga - $keuntunganansuran);   
+        // dd($total);
+        // $total = $keuntungan + $keuntunganreducing + $keuntunganansuran;
         // $total = $keuntungan + $keuntunganreducing;