From 9cd6f0f64a180ea794dfec125c2b4db06785e66d Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Mon, 14 Nov 2022 00:41:13 +0800
Subject: [PATCH] fix laporan aging

---
 app/Http/Controllers/AdminPageController.php | 62 ++++++++++++--------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
index 99ffba0..97bbb6f 100644
--- a/app/Http/Controllers/AdminPageController.php
+++ b/app/Http/Controllers/AdminPageController.php
@@ -2719,38 +2719,48 @@ class AdminPageController extends Controller
 
      public function LaporanAging(Request $request){
 
+        $current = Carbon::now();
+        $current = new Carbon();
+
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
         $bulan = $request->bulan;
         $tahun = $request->tahun;
 
-        if($bulan == 1){
-            $audit = StokAudit1::on($cawangan['mysql'])->where('tahun',$tahun);
-        }elseif($bulan == 2){
-            $audit = StokAudit2::on($cawangan['mysql'])->where('tahun',$tahun);
-        }elseif($bulan == 3){
-            $audit = StokAudit3::on($cawangan['mysql'])->where('tahun',$tahun);
-        }elseif($bulan == 4){
-            $audit = StokAudit4::on($cawangan['mysql'])->where('tahun',$tahun);
-        }elseif($bulan == 5){
-            $audit = StokAudit5::on($cawangan['mysql'])->where('tahun',$tahun);
-        }elseif($bulan == 6){
-            $audit = StokAudit6::on($cawangan['mysql'])->where('tahun',$tahun);
-        }elseif($bulan == 7){
-            $audit = StokAudit7::on($cawangan['mysql'])->where('tahun',$tahun);
-        }elseif($bulan == 8){
-            $audit = StokAudit8::on($cawangan['mysql'])->where('tahun',$tahun);
-        }elseif($bulan == 9){
-            $audit = StokAudit9::on($cawangan['mysql'])->where('tahun',$tahun);
-        }elseif($bulan == 10){
-            $audit = StokAudit10::on($cawangan['mysql'])->where('tahun',$tahun);
-        }elseif($bulan == 11){
-            $audit = StokAudit11::on($cawangan['mysql'])->where('tahun',$tahun);
-        }elseif($bulan == 12){
-            $audit = StokAudit12::on($cawangan['mysql'])->where('tahun',$tahun);
+        if($current->month == $request->bulan)
+        {
+                $audit = Gadai::on($cawangan['mysql'])
+                ->where(function($q) use ($current) {
+                        $q->where([['tagpalsu','=',0],['t_gadai','<=',$current->toDateString()],['sttebus','=','']])
+                        ->orWhere([['tagpalsu','=',0],['t_update','>',$current->toDateString()],['sttebus','!=',''],['t_gadai','<=',$current->toDateString()]]);
+                });
+        }else{
+                if($bulan == 1){
+                $audit = StokAudit1::on($cawangan['mysql'])->where('tahun',$tahun);
+                }elseif($bulan == 2){
+                $audit = StokAudit2::on($cawangan['mysql'])->where('tahun',$tahun);
+                }elseif($bulan == 3){
+                $audit = StokAudit3::on($cawangan['mysql'])->where('tahun',$tahun);
+                }elseif($bulan == 4){
+                $audit = StokAudit4::on($cawangan['mysql'])->where('tahun',$tahun);
+                }elseif($bulan == 5){
+                $audit = StokAudit5::on($cawangan['mysql'])->where('tahun',$tahun);
+                }elseif($bulan == 6){
+                $audit = StokAudit6::on($cawangan['mysql'])->where('tahun',$tahun);
+                }elseif($bulan == 7){
+                $audit = StokAudit7::on($cawangan['mysql'])->where('tahun',$tahun);
+                }elseif($bulan == 8){
+                $audit = StokAudit8::on($cawangan['mysql'])->where('tahun',$tahun);
+                }elseif($bulan == 9){
+                $audit = StokAudit9::on($cawangan['mysql'])->where('tahun',$tahun);
+                }elseif($bulan == 10){
+                $audit = StokAudit10::on($cawangan['mysql'])->where('tahun',$tahun);
+                }elseif($bulan == 11){
+                $audit = StokAudit11::on($cawangan['mysql'])->where('tahun',$tahun);
+                }elseif($bulan == 12){
+                $audit = StokAudit12::on($cawangan['mysql'])->where('tahun',$tahun);
+                }
         }
 
-        // dd($audit->where('tempoh','<=',5)->count());
-
         $jumlahrekod = $audit->count();
         $jumlahpinjaman = $audit->sum('bakipjm');