From 94d80b497114059b32542a06a2446283c3ea0d59 Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Mon, 12 Jul 2021 10:47:22 +0800
Subject: [PATCH] fix

---
 app/Http/Controllers/GadaiController.php | 11 +++++++----
 app/Http/Controllers/TebusController.php |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index be7bf5f..84d01fd 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -921,6 +921,7 @@ class GadaiController extends Controller
         $dateans = new Carbon($request->tarikh);
 
         $ansuran = Transaction::on('mysql7')
+                ->select('transaction.norujukan','trans.tarikh_bayaran','transaction.nokp','transaction.kodcaw','transaction.trans_type','cust.nama','db2.tempoh','db2.bakipjm','trans.bayaran_pembiayaan','transaction.duit_masuk','trans.bayaran_keuntungan','transaction.teller')
                 ->leftJoin('transaksi_keuntungan as trans', function($join)
                 {
                     $join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -2547,12 +2548,14 @@ class GadaiController extends Controller
             ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']])
             ->sum('pinjaman');
 
-        $Tebus = Gadai::on($cawangan['mysql'])
-            ->join('Tebus as teb','teb.norujukan','=','Gadai.norujukan')
-            ->where('Gadai.tagpalsu','=',0)
-            ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['Gadai.sttebus','=','T'],['Gadai.hargajualan','<>','NULL']])
+        $Tebus = Tebus::on($cawangan['mysql'])
+            ->join('Gadai as gad','gad.norujukan','=','Tebus.norujukan')
+            ->where('gad.tagpalsu','=',0)
+            ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['gad.sttebus','=','T'],['gad.hargajualan','<>','NULL']])
             ->sum('teb.pinjaman');
 
+        dd($Tebus);
+
             $rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus];
 
         return response()->json($rekod_pinjamandiberi);
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index b126639..425d2b2 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -515,6 +515,7 @@ class TebusController extends Controller
                 })
                 ->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan')
                 ->where('tebus.t_tebus','=',$tarikh)
+                ->groupBy('tebus.norujukan')
                 ->orderBy('tebus.teller')
                 ->orderBy('tebus.sirit')
                 ->get();