From e3ff59a66a6797ad7830d04800413c3ad36988e9 Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Wed, 29 Mar 2023 14:25:41 +0800
Subject: [PATCH] fix ringkasan terkumpul untuk tebus penuh

---
 app/Http/Controllers/LaporanController.php | 35 ++++++++++------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 71531b0..7fbf990 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -776,7 +776,10 @@ class LaporanController extends Controller
 
         $gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir]])->where('pinjaman','>',0);
         
-        $tebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]]);
+        $tebus = Tebus::on($cawangan['mysql'])
+                ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
+                ->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]]);
+        
         $ansuran = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]]);
         $bayaranonlinequery = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where('teller','=','Online')->where('kodcaw',$request->kodcaw);
 
@@ -785,7 +788,11 @@ class LaporanController extends Controller
         
         //a
         $total_gadai = $gadai->sum('pinjaman');
-        $total_tebus = $tebus->sum('pinjaman');
+        $total_tebus = $tebus->when(['gad.hargajualan', '!=' ,'gad.bakihargajualan'], function ($query) {
+                            return $query->sum('gad.bakipjm');
+                        }, function ($query) {
+                            return $query->sum('gad.pinjaman');
+                        });
         // $total_ansuran = $ansuran->sum('duit_masuk');
         // $total_keuntungan = TransaksiKeuntungan::on('mysql7')->whereDate('tarikh_bayaran','=',$request->tarikh)->sum('bayaran_keuntungan');
         $total_upah = Advansur::on($cawangan['mysql'])->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->akhir]])->sum('upahdibayar');
@@ -816,8 +823,8 @@ class LaporanController extends Controller
         $bilangan_customer_baru = Customer::on($cawangan['mysql'])->where([['tarikhdaftar','>=',$request->mula],['tarikhdaftar','<=',$request->akhir]])->count();
 
         //f
-        $data_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','=',$request->mula],['t_jual','=',$request->akhir]])->get();
-        $bilangan_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','=',$request->mula],['t_jual','=',$request->akhir]])->count();
+        $data_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->akhir]])->get();
+        $bilangan_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->akhir]])->count();
         
         $cas_lelong = 0;
         $jumlah_lelong = 0;
@@ -837,8 +844,8 @@ class LaporanController extends Controller
         }
 
         //g
-        $tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','<',0);
-        $tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','>',0);
+        $tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->akhir]])->where('jumlah','<',0);
+        $tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->akhir]])->where('jumlah','>',0);
 
         $bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah');
         $bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah');
@@ -888,7 +895,7 @@ class LaporanController extends Controller
 
         $totalpendahuluan = GlDetail::on($cawangan['mysql'])
             ->where('ktacct','=',$pendahuluanpkb)
-            ->where([['tarikh','<=', $request->mula],['tarikh','<=', $request->akhir],['tarikh','>','2021-03-24']])
+            ->where([['tarikh','>=', $request->mula],['tarikh','<=', $request->akhir],['tarikh','>','2021-03-24']])
             ->sum('pendahuluan');
 
         $belanjaam = Panjar::on($cawangan['mysql'])->where('tag','=', 1)->where('tarikh','>=', $request->mula)->where('tarikh','<=', $request->akhir)->sum('bayaran');
@@ -1089,22 +1096,12 @@ class LaporanController extends Controller
 
         $totalpenebusan = 0;
 
-        foreach($tebus as $index1=>$teb)
-        {
-            if($teb['gad.hargajualan'] != $teb['bakihargajualan'])
-            {
-                $totalpenebusan += $teb['gadaibakipjm'];
-            }else{
-                $totalpenebusan += $teb['pinjaman'];
-            }
-        }
-
         //Lelongan Pembiayaan
-        $totalpenebusan += $pembiayaanlelong;
+        $totalpenebusan = $total_tebus + $pembiayaanlelong;
 
         array_push($laporan_terkumpul,[
             'total_gadai'=>$total_gadai,
-            'total_tebus'=>$total_tebus,
+            'total_tebus'=>$totalpenebusan,
             'total_ansuran'=>$total_ansuran,
             'total_ansuranonline'=>$total_ansuranonline,
             'bilangan_gadai'=>$bilangan_gadai,