From a272171ebbef651f804e06fed4525ef466e9aefa Mon Sep 17 00:00:00 2001
From: "e.arrahn" <e.arrahn@gmail.com>
Date: Wed, 21 Dec 2022 16:33:36 +0800
Subject: [PATCH] updated server 21/12/2022

---
 app/Http/Controllers/LaporanController.php | 13 +++++++++++--
 app/Http/Controllers/LelongController.php  |  1 +
 app/Http/Controllers/TebusController.php   |  5 +++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index ff3fddd..a088cab 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -125,8 +125,17 @@ class LaporanController extends Controller
         $gadaiDataOnline = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data_online)->whereNotNull('hargajualan')->pluck('norujukan');
 
         $keuntunganansuran_online_query = TransaksiKeuntungan::on('mysql7')
-                                        ->whereIn('norujukan',$gadaiDataOnline)
-                                        ->whereDate('tarikh_bayaran','=',$request->tarikh);
+                                        ->leftJoin('transaction as trans', function($join)
+                                        {
+                                            $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                                            $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                                        })
+                                        ->whereDate('trans.created_at','=',$request->tarikh)
+                                        ->where('trans.teller','=','Online')
+                                        ->where('trans.trans_type','=','A')
+                                        ->where('trans.kodcaw',$request->kodcaw)
+                                        ->whereIn('trans.norujukan',$gadaiDataOnline)
+                                        ->whereDate('transaksi_keuntungan.tarikh_bayaran','=',$request->tarikh);
                                         
         $total_keuntunganansuran_online = $keuntunganansuran_online_query->sum('bayaran_keuntungan');
         $bil_keuntunganansuran_online = $keuntunganansuran_online_query->count();
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 71b2fb2..a8c2401 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -547,6 +547,7 @@ class LelongController extends Controller
         $lelong = Lelong::on($cawangan['mysql'])
         ->whereNotNull('t_jual')
         ->where('t_jual','=', $current->toDateString())
+	->where('teller','LIKE','LELONG')
         ->sum('hargajual');
 
         return response()->json($lelong,200);
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 24a1428..70e88f6 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -2033,8 +2033,8 @@ class TebusController extends Controller
             ->whereNotNull('hargajualan')
             ->having('result','=',1)
             ->whereYear('t_gadai','=',$year)
-            ->whereMonth('t_gadai','>',7)
-            ->whereMonth('t_gadai','<=',$month)
+            //->whereMonth('t_gadai','>',7)
+            ->whereMonth('t_gadai','=',$month)
             ->where('sttebus','<>','')
             ->pluck('norujukan');
 
@@ -2125,6 +2125,7 @@ class TebusController extends Controller
                 }
             }
             
+		//dd($jumlahakru,$accrual_net,$total);
             $total_accrual_net = $jumlahakru + ($accrual_net - $total);
 
         }else{