From db990b3964a29fb65f6f2ca6f8f5891676e006ec Mon Sep 17 00:00:00 2001
From: daengdeni <ddeni05@gmail.com>
Date: Thu, 4 Apr 2024 15:48:15 +0700
Subject: [PATCH] fix report penagihan

---
 Http/Controllers/ReportController.php | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/Http/Controllers/ReportController.php b/Http/Controllers/ReportController.php
index 548433a..bdd7af0 100644
--- a/Http/Controllers/ReportController.php
+++ b/Http/Controllers/ReportController.php
@@ -94,9 +94,9 @@
                     $date = Carbon::create($row->tanggal_hapus_buku);
                     return $date->locale('id')->translatedFormat('d F Y');
                 })->editColumn('branch', function ($row) {
-                    if(isset($row->branch->kode) && isset($row->branch->name)){
+                    if (isset($row->branch->kode) && isset($row->branch->name)) {
                         return $row->branch->kode . ' - ' . $row->branch->name;
-                    }else{
+                    } else {
                         return '-';
                     }
                 })->editColumn('debitur', function ($row) {
@@ -118,7 +118,7 @@
                         return '-';
                     }
                 })->editColumn('loan_type', function ($row) {
-                    if  (isset($row->loan_type->kode) && isset($row->loan_type->name)) {
+                    if (isset($row->loan_type->kode) && isset($row->loan_type->name)) {
                         return $row->loan_type->kode . ' - ' . $row->loan_type->name;
                     } else {
                         return '-';
@@ -149,7 +149,7 @@
                 })->editColumn('total_all_kewajiban', function ($row) {
                     return Number::currency($row->total_all_kewajiban ?? 0, 'IDR', 'id_ID');
                 })->editColumn('nominal', function ($row) {
-                        return Number::currency($row->nominal ?? 0, 'IDR', 'id_ID');
+                    return Number::currency($row->nominal ?? 0, 'IDR', 'id_ID');
                 })->editColumn('sisa_kewajiban', function ($row) {
                     $sisa = $row->total_all_kewajiban - $row->nominal;
                     return Number::currency($row->sisa ?? 0, 'IDR', 'id_ID');
@@ -230,6 +230,10 @@
                                      ->whereMonth('tanggal_hapus_buku', '<=', request()->get('bulan'))
                                      ->whereYear('tanggal_hapus_buku', '<=', request()->get('tahun'))
                                      ->whereRelation('debitur', 'name', 'like', '%' . request()->get('debitur') . '%')
+                                     ->where('detail_penagihan.deleted_at', null)
+                                     ->where('detail_pembayaran.deleted_at', null)
+                                     ->where('detail_jaminan.deleted_at', null)
+                                     ->groupBy('detail_penagihan.pic_penagihan', 'detail_penagihan.tanggal_penagihan')
                                      ->get();
                 } else {
                     $data = HapusBuku::with([
@@ -247,6 +251,10 @@
                                      ->whereYear('tanggal_hapus_buku', '<=', request()->get('tahun'))
                                      ->where('kode_cabang', request()->get('kode_cabang'))
                                      ->whereRelation('debitur', 'name', 'like', '%' . request()->get('debitur') . '%')
+                                     ->where('detail_penagihan.deleted_at', null)
+                                     ->where('detail_pembayaran.deleted_at', null)
+                                     ->where('detail_jaminan.deleted_at', null)
+                                     ->groupBy('detail_penagihan.pic_penagihan', 'detail_penagihan.tanggal_penagihan')
                                      ->get();
                 }
 
@@ -256,9 +264,9 @@
                     $date = Carbon::create($row->tanggal_hapus_buku);
                     return $date->locale('id')->translatedFormat('d F Y');
                 })->editColumn('branch', function ($row) {
-                    if(isset($row->branch->kode) && isset($row->branch->name)){
+                    if (isset($row->branch->kode) && isset($row->branch->name)) {
                         return $row->branch->kode . ' - ' . $row->branch->name;
-                    }else{
+                    } else {
                         return '-';
                     }
                 })->editColumn('debitur', function ($row) {
@@ -280,7 +288,7 @@
                         return '-';
                     }
                 })->editColumn('loan_type', function ($row) {
-                    if  (isset($row->loan_type->kode) && isset($row->loan_type->name)) {
+                    if (isset($row->loan_type->kode) && isset($row->loan_type->name)) {
                         return $row->loan_type->kode . ' - ' . $row->loan_type->name;
                     } else {
                         return '-';