From 041480c4ea854241dacd89feea6591e2b694ab7e Mon Sep 17 00:00:00 2001
From: Hafifie PKB <hafpkb@Hafifies-MacBook-Pro.local>
Date: Sun, 17 Dec 2023 11:56:57 +0800
Subject: [PATCH] fix ambigous jenistebus and batalGadai wrong filename

---
 app/Http/Controllers/GadaiController.php   | 4 ++--
 app/Http/Controllers/LaporanController.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 830a19f..2d1584c 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -8,7 +8,7 @@ use App\Cawangan;
 use App\Transaction;
 use App\TransaksiKeuntungan;
 use App\TransactionOnline;
-use App\batalGadai;
+use App\BatalGadai;
 use App\TuntutBaki;
 use App\AnsRugi;
 use App\Lelong;
@@ -579,7 +579,7 @@ class GadaiController extends Controller
     public function getLaporanBatalGadai($kodcaw,$tarikh){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-        $gadai = batalGadai::on($cawangan['mysql'])
+        $gadai = BatalGadai::on($cawangan['mysql'])
                 ->where('tarikh','=',$tarikh)
                 ->orderBy('tarikh','desc')
                 ->get();
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 6da65f0..8f11948 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -785,7 +785,7 @@ class LaporanController extends Controller
         
         $tebus = Tebus::on($cawangan['mysql'])
                 ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
-                ->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir],['jenistebus','=','T']]);
+                ->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir],['tebus.jenistebus','=','T']]);
         
         $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);