From 7d1c009e2fcf836b66283da344bafe0ce0a3e9d7 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Mon, 11 Oct 2021 14:42:43 +0800
Subject: [PATCH] fix laporan penebusan tambahan online

---
 app/Http/Controllers/GadaiController.php | 26 +++++++++++++++++++-----
 app/Http/Controllers/TebusController.php | 16 ++++++++++-----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 15e6b53..d29163d 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1037,7 +1037,7 @@ class GadaiController extends Controller
 
         $dateans = new Carbon($request->tarikh);
 
-        $ansurans = Transaction::on('mysql7')
+        $ansuranskaunter = Transaction::on('mysql7')
                 ->leftJoin('transaksi_keuntungan as trans', function($join)
                 {
                     $join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -1045,13 +1045,29 @@ class GadaiController extends Controller
                 })
                 ->where('transaction.kodcaw','=',$kodcaw)
                 ->where('transaction.trans_type','=','A')
+                ->where('transaction.teller','<>','Online')
                 ->whereDate('transaction.created_at','=',$dateans);
 
-        $keuntungan = $ansurans->sum('trans.bayaran_keuntungan');
-        $pendahuluan = $ansurans->sum('trans.bayaran_pembiayaan');
-        $bilangan = $ansurans->count();
+        $ansuransonline = Transaction::on('mysql7')
+                ->leftJoin('transaksi_keuntungan as trans', function($join)
+                {
+                    $join->on('transaction.norujukan', '=', 'trans.norujukan');
+                    $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
+                })
+                ->where('transaction.kodcaw','=',$kodcaw)
+                ->where('transaction.trans_type','=','A')
+                ->where('transaction.teller','=','Online')
+                ->whereDate('transaction.created_at','=',$dateans);
 
-        $arrayansuran = ['totalpendahuluan' => $pendahuluan, 'totalkeuntungan' => $keuntungan, 'bilangan' => $bilangan];
+        $keuntungankaunter = $ansuranskaunter->sum('trans.bayaran_keuntungan');
+        $pendahuluankaunter = $ansuranskaunter->sum('trans.bayaran_pembiayaan');
+        $bilangankaunter = $ansuranskaunter->count();
+
+        $keuntunganonline = $ansuransonline->sum('trans.bayaran_keuntungan');
+        $pendahuluanonline = $ansuransonline->sum('trans.bayaran_pembiayaan');
+        $bilanganonline = $ansuransonline->count();
+
+        $arrayansuran = ['totalpendahuluankaunter' => $pendahuluankaunter, 'totalkeuntungankaunter' => $keuntungankaunter, 'bilangankaunter' => $bilangankaunter,'totalpendahuluanonline' => $pendahuluanonline, 'totalkeuntunganonline' => $keuntunganonline, 'bilanganonline' => $bilanganonline];
         
         return response()->json($arrayansuran,200);
     }
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index f94e6d4..97f4565 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -893,13 +893,19 @@ class TebusController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-        $listadvansur = Advansur::on($cawangan['mysql'])
-        ->where('tarikh','=',$request->tarikh);
+        $listadvansurkaunter = Advansur::on($cawangan['mysql'])
+        ->where([['tarikh','=',$request->tarikh],['teller','<>','Online']]);
 
-        $countadvansur = $listadvansur->count();
-        $totaladvansur = $listadvansur->sum('upahdibayar');
+        $listadvansuronline = Advansur::on($cawangan['mysql'])
+        ->where([['tarikh','=',$request->tarikh],['teller','=','Online']]);
 
-        $arrayadvansur = ['bil' => $countadvansur, 'total' => $totaladvansur];
+        $countadvansurkaunter = $listadvansurkaunter->count();
+        $totaladvansurkaunter = $listadvansurkaunter->sum('upahdibayar');
+
+        $countadvansuronline = $listadvansuronline->count();
+        $totaladvansuronline = $listadvansuronline->sum('upahdibayar');
+
+        $arrayadvansur = ['bilkaunter' => $countadvansurkaunter, 'totalkaunter' => $totaladvansurkaunter,'bilonline' => $countadvansuronline, 'totalonline' => $totaladvansuronline];
 
         return response()->json($arrayadvansur,200);
     }