From 976991f6e5991e1f9e6f9eaafe608a53c122b59d Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Tue, 27 Apr 2021 15:57:16 +0800
Subject: [PATCH 1/8] laporan panjaran

---
 app/Http/Controllers/GadaiController.php | 56 +++++++++---------------
 routes/web.php                           |  2 +-
 2 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index c709384..ab1de7a 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -887,13 +887,20 @@ class GadaiController extends Controller
         return response()->json($array_harian);
     }
 
-    public function getLaporanAnsuran($kodcaw,$tarikh){
+    public function getLaporanAnsuran($kodcaw,Request $request){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-        $gadai = Tebus::on($cawangan['mysql'])
-                ->where('jenistebus','=',"A")
-                ->where('t_tebus','=',$tarikh)
-                ->orderBy('t_tebus')
+        $dateans = new Carbon($request->tarikh);
+        $dateans->addDays(1);
+
+        $date = new Carbon($request->tarikh);
+
+
+        $gadai = Transaction::on('mysql7')
+                ->join('transaksi_keuntungan', 'transaction.norujukan', '=', 'transaksi_keuntungan.norujukan')
+                ->where('transaction.trans_type','=','A')
+                ->where('transaction.created_at','>=',$date)
+                ->where('transaction.created_at','<=',$dateans)
                 ->get();
         
         return response()->json($gadai);
@@ -922,21 +929,21 @@ class GadaiController extends Controller
         ///////////
 
         $gadai1 = Gadai::on($cawangan['mysql'])
-                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
+                ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','<',$tarikh)
-                // ->where('sttebus','=','')
+                ->where('sttebus','=','')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
-                ->orderBy('t_gadai')
                 ->get();                
 
         $gadai2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
+                // ->where('t_gadai','<',$tarikh)
                 // ->where('sttebus','=','')
+                // ->where([['t_gadai','<=',$tarikh],['sttebus','=','']])
+                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<=',$tarikh]])
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->orderBy('t_gadai')
                 ->get();     
 
         $gadai3 = Gadai::on($cawangan['mysql'])
@@ -945,35 +952,31 @@ class GadaiController extends Controller
                 // ->where('sttebus','=','')
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->orderBy('t_gadai')
                 ->get();    
 
 
         $gadaiini1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                // ->where('sttebus','=','')
+                ->where('sttebus','=','')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
-                ->orderBy('t_gadai')
                 ->get();                
 
         $gadaiini2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                // ->where('sttebus','=','')
+                ->where('sttebus','=','')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->orderBy('t_gadai')
                 ->get();     
 
         $gadaiini3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                // ->where('sttebus','=','')
+                ->where('sttebus','=','')
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->orderBy('t_gadai')
                 ->get();    
                 
         
@@ -987,7 +990,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
-                ->orderBy('t_gadai')
                 ->get();                
 
         $tebus2 = Gadai::on($cawangan['mysql'])
@@ -996,7 +998,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->orderBy('t_gadai')
                 ->get();     
 
         $tebus3 = Gadai::on($cawangan['mysql'])
@@ -1005,7 +1006,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->orderBy('t_gadai')
                 ->get();    
 
         $tebusini1 = Gadai::on($cawangan['mysql'])
@@ -1014,7 +1014,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
-                ->orderBy('t_gadai')
                 ->get();                
 
         $tebusini2 = Gadai::on($cawangan['mysql'])
@@ -1023,7 +1022,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->orderBy('t_gadai')
                 ->get();     
 
         $tebusini3 = Gadai::on($cawangan['mysql'])
@@ -1032,7 +1030,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->orderBy('t_gadai')
                 ->get();    
 
 
@@ -1047,7 +1044,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
-                ->orderBy('t_gadai')
                 ->get();                
 
         $lelong2 = Gadai::on($cawangan['mysql'])
@@ -1056,7 +1052,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->orderBy('t_gadai')
                 ->get();     
 
         $lelong3 = Gadai::on($cawangan['mysql'])
@@ -1065,7 +1060,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->orderBy('t_gadai')
                 ->get();    
 
         $lelongini1 = Gadai::on($cawangan['mysql'])
@@ -1074,7 +1068,6 @@ class GadaiController extends Controller
             ->where('sttebus','=','L')
             ->where('nilaimarhun','>=',1)
             ->where('nilaimarhun','<=',400.99)
-            ->orderBy('t_gadai')
             ->get();                
 
         $lelongini2 = Gadai::on($cawangan['mysql'])
@@ -1083,7 +1076,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->orderBy('t_gadai')
                 ->get();     
 
         $lelongini3 = Gadai::on($cawangan['mysql'])
@@ -1092,7 +1084,6 @@ class GadaiController extends Controller
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->orderBy('t_gadai')
                 ->get();   
 
         //////////////////
@@ -1100,13 +1091,6 @@ class GadaiController extends Controller
         //////////////////
 
 
-
-                // $hapuskira = HapusKira::on($cawangan['mysql'])
-                // ->selectRaw('COUNT(*) AS bilangan, SUM(gadai.nilaimarhun) as jumlahmarhun, SUM(gadai.pinjaman) as jumlahpinjaman')
-                // ->where('hapuskira.Tarikh','=',$tarikh)
-                // ->rightJoin('gadai', 'gadai.norujukan', '=', 'hapuskira.norujukan')
-                // ->get();
-
         $hapuskira1 = HapusKira::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
                 ->where('tarikh','<',$tarikh)
diff --git a/routes/web.php b/routes/web.php
index ad29cf0..515e9c5 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -182,7 +182,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     
 
     //ANSURAN UPAH API
-    $router->get('ansuran/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong
+    $router->get('ansuran/laporan/{kodcaw}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong
     $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']);
     $router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']);
     $router->get('ansuranupah/{kodcaw}',['uses'=>'TebusController@getAdvansurByKodlaluan']);

From 627d61a2cde948dd93edcf516ee8a84952656dd8 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 28 Apr 2021 15:49:57 +0800
Subject: [PATCH 2/8] buat kawalanstoklama

---
 app/Http/Controllers/GadaiController.php | 153 +++++++++++++++++------
 app/KawalanStokLama.php                  |  26 ++++
 2 files changed, 140 insertions(+), 39 deletions(-)
 create mode 100644 app/KawalanStokLama.php

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index ab1de7a..f00a493 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -17,6 +17,7 @@ use App\Tebus;
 use App\Vault;
 use App\Tunai;
 use App\Komuditi;
+use App\KawalanStokLama;
 
 use Illuminate\Http\Request;
 
@@ -924,34 +925,51 @@ class GadaiController extends Controller
 
         $array_kawalanstok = [];
 
+
+        $kawalanstoklama = KawalanStokLama::on($cawangan['mysql'])
+                            ->get();
+
+
         ////////////
         ///GADAI////
         ///////////
 
         $gadai1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
-                ->where('sttebus','=','')
-                ->where('nilaimarhun','>=',1)
-                ->where('nilaimarhun','<=',400.99)
-                ->get();                
-
-        $gadai2 = Gadai::on($cawangan['mysql'])
-                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 // ->where('t_gadai','<',$tarikh)
                 // ->where('sttebus','=','')
-                // ->where([['t_gadai','<=',$tarikh],['sttebus','=','']])
-                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<=',$tarikh]])
-                ->where('nilaimarhun','>=',401)
-                ->where('nilaimarhun','<=',2000.99)
-                ->get();     
+                // ->where('nilaimarhun','>=',1)
+                // ->where('nilaimarhun','<=',400.99)
+                ->whereBetween('nilaimarhun', [1, 400.99])
+                ->where([['t_gadai','<',$tarikh],['sttebus','=','']])
+                ->orWhere([['t_gadai','<',$tarikh],['sttebus','!=',''],['t_update','>',$tarikh]])
+                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<',$tarikh],['nilaimarhun','>=',1],['nilaimarhun','<=',400.99]])
+                ->get();       
+        
+        
 
-        $gadai3 = Gadai::on($cawangan['mysql'])
-                ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
+        $gadai2 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
+                // ->where('t_gadai','<',$tarikh)
                 // ->where('sttebus','=','')
-                ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',1000000)
+                // ->where('nilaimarhun','>=',401)
+                // ->where('nilaimarhun','<=',2000.99)
+                ->whereBetween('nilaimarhun', [401, 2000.99])
+                ->where([['t_gadai','<',$tarikh],['sttebus','=','']])
+                ->orWhere([['t_gadai','<',$tarikh],['sttebus','!=',''],['t_update','>',$tarikh]])
+                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<',$tarikh],['nilaimarhun','>=',401],['nilaimarhun','<=',2000.99]])
+                ->get(); 
+                
+        $gadai3 = Gadai::on($cawangan['mysql'])
+                ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
+                // ->where('t_gadai','<',$tarikh)
+                // ->where('sttebus','=','')
+                // ->where('nilaimarhun','>=',2001)
+                // ->where('nilaimarhun','<=',100000)
+                ->whereBetween('nilaimarhun', [2001, 100000])
+                ->where([['t_gadai','<',$tarikh],['sttebus','=','']])
+                ->orWhere([['t_gadai','<',$tarikh],['sttebus','!=',''],['t_update','>',$tarikh]])
+                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<',$tarikh],['nilaimarhun','>=',2001],['nilaimarhun','<=',100000]])
                 ->get();    
 
 
@@ -961,6 +979,7 @@ class GadaiController extends Controller
                 ->where('sttebus','=','')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
+                ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','=',$tarikh],['nilaimarhun','>=',1],['nilaimarhun','<=',400.99]])
                 ->get();                
 
         $gadaiini2 = Gadai::on($cawangan['mysql'])
@@ -969,6 +988,7 @@ class GadaiController extends Controller
                 ->where('sttebus','=','')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
+                ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','=',$tarikh],['nilaimarhun','>=',401],['nilaimarhun','<=',2000.99]])
                 ->get();     
 
         $gadaiini3 = Gadai::on($cawangan['mysql'])
@@ -976,9 +996,13 @@ class GadaiController extends Controller
                 ->where('t_gadai','=',$tarikh)
                 ->where('sttebus','=','')
                 ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',1000000)
-                ->get();    
+                ->where('nilaimarhun','<=',100000)
+                ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','=',$tarikh],['nilaimarhun','>=',2001],['nilaimarhun','<=',100000]])
+                ->get();  
                 
+                
+
+
         
         ////////////
         ///TEBUS////
@@ -986,7 +1010,7 @@ class GadaiController extends Controller
 
         $tebus1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
+                ->where('t_update','<',$tarikh)
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
@@ -994,7 +1018,7 @@ class GadaiController extends Controller
 
         $tebus2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
+                ->where('t_update','<',$tarikh)
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
@@ -1002,15 +1026,15 @@ class GadaiController extends Controller
 
         $tebus3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
+                ->where('t_update','<',$tarikh)
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',1000000)
+                ->where('nilaimarhun','<=',100000)
                 ->get();    
 
         $tebusini1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','=',$tarikh)
+                ->where('t_update','=',$tarikh)
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
@@ -1018,7 +1042,7 @@ class GadaiController extends Controller
 
         $tebusini2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','=',$tarikh)
+                ->where('t_update','=',$tarikh)
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
@@ -1026,13 +1050,13 @@ class GadaiController extends Controller
 
         $tebusini3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','=',$tarikh)
+                ->where('t_update','=',$tarikh)
                 ->where('sttebus','=','T')
                 ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',1000000)
-                ->get();    
-
-
+                ->where('nilaimarhun','<=',100000)
+                ->get();   
+                
+                
         //////////////
         ///LELONG/////
         /////////////
@@ -1040,7 +1064,7 @@ class GadaiController extends Controller
 
         $lelong1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
+                ->where('t_update','<',$tarikh)
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
@@ -1048,7 +1072,7 @@ class GadaiController extends Controller
 
         $lelong2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
+                ->where('t_update','<',$tarikh)
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
@@ -1056,15 +1080,15 @@ class GadaiController extends Controller
 
         $lelong3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','<',$tarikh)
+                ->where('t_update','<',$tarikh)
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',1000000)
+                ->where('nilaimarhun','<=',100000)
                 ->get();    
 
         $lelongini1 = Gadai::on($cawangan['mysql'])
             ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-            ->where('t_gadai','=',$tarikh)
+            ->where('t_update','=',$tarikh)
             ->where('sttebus','=','L')
             ->where('nilaimarhun','>=',1)
             ->where('nilaimarhun','<=',400.99)
@@ -1072,7 +1096,7 @@ class GadaiController extends Controller
 
         $lelongini2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','=',$tarikh)
+                ->where('t_update','=',$tarikh)
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
@@ -1080,12 +1104,63 @@ class GadaiController extends Controller
 
         $lelongini3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
-                ->where('t_gadai','=',$tarikh)
+                ->where('t_update','=',$tarikh)
                 ->where('sttebus','=','L')
                 ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',1000000)
+                ->where('nilaimarhun','<=',100000)
                 ->get();   
 
+        foreach($kawalanstoklama as $indexgad => $gadaikawalanstok)
+        {
+            //Gadai 
+            $gad1 = $gadai1[0]['bil'] + intval($gadaikawalanstok['bilGad1']);
+            $gad2 = $gadai2[0]['bil'] + intval($gadaikawalanstok['bilGad2']);
+            $gad3 = $gadai3[0]['bil'] + intval($gadaikawalanstok['bilGad3']);
+            $gadpinj1 = $gadai1[0]['pinj'] + floatval($gadaikawalanstok['pinjGad1']);
+            $gadpinj2 = $gadai2[0]['pinj'] + floatval($gadaikawalanstok['pinjGad2']);
+            $gadpinj3 = $gadai3[0]['pinj'] + floatval($gadaikawalanstok['pinjGad3']);
+
+            $gadai1[0]['bil'] = $gad1;
+            $gadai1[0]['pinj'] = $gadpinj1;
+            $gadai2[0]['bil'] = $gad2;
+            $gadai2[0]['pinj'] = $gadpinj2;
+            $gadai3[0]['bil'] = $gad3;
+            $gadai3[0]['pinj'] = $gadpinj3;
+
+            //Tebus
+
+            $teb1 = $tebus1[0]['bil'] + intval($gadaikawalanstok['bilTeb1']);
+            $teb2 = $tebus2[0]['bil'] + intval($gadaikawalanstok['bilTeb2']);
+            $teb3 = $tebus3[0]['bil'] + intval($gadaikawalanstok['bilTeb3']);
+            $tebpinj1 = $tebus1[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb1']);
+            $tebpinj2 = $tebus2[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb2']);
+            $tebpinj3 = $tebus3[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb3']);
+
+            $tebus1[0]['bil'] = $teb1;
+            $tebus1[0]['pinj'] = $tebpinj1;
+            $tebus2[0]['bil'] = $teb2;
+            $tebus2[0]['pinj'] = $tebpinj2;
+            $tebus3[0]['bil'] = $teb3;
+            $tebus3[0]['pinj'] = $tebpinj3;
+
+            //Lelong
+
+            $lel1 = $lelong1[0]['bil'] + intval($gadaikawalanstok['bilLel1']);
+            $lel2 = $lelong2[0]['bil'] + intval($gadaikawalanstok['bilLel2']);
+            $lel3 = $lelong3[0]['bil'] + intval($gadaikawalanstok['bilLel3']);
+            $lelpinj1 = $lelong1[0]['pinj'] + floatval($gadaikawalanstok['pinjLel1']);
+            $lelpinj2 = $lelong2[0]['pinj'] + floatval($gadaikawalanstok['pinjLel2']);
+            $lelpinj3 = $lelong3[0]['pinj'] + floatval($gadaikawalanstok['pinjLel3']);
+
+            $lelong1[0]['bil'] = $lel1;
+            $lelong1[0]['pinj'] = $lelpinj1;
+            $lelong2[0]['bil'] = $lel2;
+            $lelong2[0]['pinj'] = $lelpinj2;
+            $lelong3[0]['bil'] = $lel3;
+            $lelong3[0]['pinj'] = $lelpinj3;
+
+        }
+
         //////////////////
         ///HAPUS KIRA/////
         //////////////////
diff --git a/app/KawalanStokLama.php b/app/KawalanStokLama.php
new file mode 100644
index 0000000..eaae7d8
--- /dev/null
+++ b/app/KawalanStokLama.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class KawalanStokLama extends Model
+{
+    protected $table = 'kawalanstok_lama';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'bilGad1','bilGad2','bilGad3','bilTeb1','bilTeb2','bilTeb3','bilLel1','bilLel2','bilLel3','pinjGad1','pinjGad2','pinjGad3','pinjTeb1','pinjTeb2','pinjTeb3','pinjLel1','pinjLel2','pinjLel3'
+    ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}
\ No newline at end of file

From 25e72272d2876a1fcd7c5e7a9989b56753d0338e Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Mon, 3 May 2021 09:37:06 +0800
Subject: [PATCH 3/8] kawalanstok

---
 app/Http/Controllers/GadaiController.php  | 128 +++++++++-------------
 app/Http/Controllers/PanjarController.php |  14 +++
 routes/web.php                            |   1 +
 3 files changed, 66 insertions(+), 77 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index ab699ff..7538897 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -936,68 +936,39 @@ class GadaiController extends Controller
 
         $gadai1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
-                // ->where('t_gadai','<',$tarikh)
-                // ->where('sttebus','=','')
-                // ->where('nilaimarhun','>=',1)
-                // ->where('nilaimarhun','<=',400.99)
+                ->where('t_gadai','<',$tarikh)
                 ->whereBetween('nilaimarhun', [1, 400.99])
-                ->where([['t_gadai','<',$tarikh],['sttebus','=','']])
-                ->orWhere([['t_gadai','<',$tarikh],['sttebus','!=',''],['t_update','>',$tarikh]])
-                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<',$tarikh],['nilaimarhun','>=',1],['nilaimarhun','<=',400.99]])
                 ->get();       
-        
-        
 
         $gadai2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
-                // ->where('t_gadai','<',$tarikh)
-                // ->where('sttebus','=','')
-                // ->where('nilaimarhun','>=',401)
-                // ->where('nilaimarhun','<=',2000.99)
+                ->where('t_gadai','<',$tarikh)
                 ->whereBetween('nilaimarhun', [401, 2000.99])
-                ->where([['t_gadai','<',$tarikh],['sttebus','=','']])
-                ->orWhere([['t_gadai','<',$tarikh],['sttebus','!=',''],['t_update','>',$tarikh]])
-                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<',$tarikh],['nilaimarhun','>=',401],['nilaimarhun','<=',2000.99]])
                 ->get(); 
                 
         $gadai3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
-                // ->where('t_gadai','<',$tarikh)
-                // ->where('sttebus','=','')
-                // ->where('nilaimarhun','>=',2001)
-                // ->where('nilaimarhun','<=',100000)
+                ->where('t_gadai','<',$tarikh)
                 ->whereBetween('nilaimarhun', [2001, 100000])
-                ->where([['t_gadai','<',$tarikh],['sttebus','=','']])
-                ->orWhere([['t_gadai','<',$tarikh],['sttebus','!=',''],['t_update','>',$tarikh]])
-                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<',$tarikh],['nilaimarhun','>=',2001],['nilaimarhun','<=',100000]])
                 ->get();    
 
 
         $gadaiini1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                ->where('sttebus','=','')
-                ->where('nilaimarhun','>=',1)
-                ->where('nilaimarhun','<=',400.99)
-                ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','=',$tarikh],['nilaimarhun','>=',1],['nilaimarhun','<=',400.99]])
-                ->get();                
+                ->whereBetween('nilaimarhun', [1, 400.99])
+                ->get();  
 
         $gadaiini2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                ->where('sttebus','=','')
-                ->where('nilaimarhun','>=',401)
-                ->where('nilaimarhun','<=',2000.99)
-                ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','=',$tarikh],['nilaimarhun','>=',401],['nilaimarhun','<=',2000.99]])
-                ->get();     
+                ->whereBetween('nilaimarhun', [401, 2000.99])
+                ->get();  
 
         $gadaiini3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                ->where('sttebus','=','')
-                ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',100000)
-                ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','=',$tarikh],['nilaimarhun','>=',2001],['nilaimarhun','<=',100000]])
+                ->whereBetween('nilaimarhun', [2001, 100000])
                 ->get();  
                 
                 
@@ -1110,55 +1081,58 @@ class GadaiController extends Controller
                 ->where('nilaimarhun','<=',100000)
                 ->get();   
 
-        foreach($kawalanstoklama as $indexgad => $gadaikawalanstok)
+        if($kodcaw == 'KB2')
         {
-            //Gadai 
-            $gad1 = $gadai1[0]['bil'] + intval($gadaikawalanstok['bilGad1']);
-            $gad2 = $gadai2[0]['bil'] + intval($gadaikawalanstok['bilGad2']);
-            $gad3 = $gadai3[0]['bil'] + intval($gadaikawalanstok['bilGad3']);
-            $gadpinj1 = $gadai1[0]['pinj'] + floatval($gadaikawalanstok['pinjGad1']);
-            $gadpinj2 = $gadai2[0]['pinj'] + floatval($gadaikawalanstok['pinjGad2']);
-            $gadpinj3 = $gadai3[0]['pinj'] + floatval($gadaikawalanstok['pinjGad3']);
+            foreach($kawalanstoklama as $indexgad => $gadaikawalanstok)
+            {
+                //Gadai 
+                $gad1 = $gadai1[0]['bil'] + intval($gadaikawalanstok['bilGad1']);
+                $gad2 = $gadai2[0]['bil'] + intval($gadaikawalanstok['bilGad2']);
+                $gad3 = $gadai3[0]['bil'] + intval($gadaikawalanstok['bilGad3']);
+                $gadpinj1 = $gadai1[0]['pinj'] + floatval($gadaikawalanstok['pinjGad1']);
+                $gadpinj2 = $gadai2[0]['pinj'] + floatval($gadaikawalanstok['pinjGad2']);
+                $gadpinj3 = $gadai3[0]['pinj'] + floatval($gadaikawalanstok['pinjGad3']);
 
-            $gadai1[0]['bil'] = $gad1;
-            $gadai1[0]['pinj'] = $gadpinj1;
-            $gadai2[0]['bil'] = $gad2;
-            $gadai2[0]['pinj'] = $gadpinj2;
-            $gadai3[0]['bil'] = $gad3;
-            $gadai3[0]['pinj'] = $gadpinj3;
+                $gadai1[0]['bil'] = $gad1;
+                $gadai1[0]['pinj'] = $gadpinj1;
+                $gadai2[0]['bil'] = $gad2;
+                $gadai2[0]['pinj'] = $gadpinj2;
+                $gadai3[0]['bil'] = $gad3;
+                $gadai3[0]['pinj'] = $gadpinj3;
 
-            //Tebus
+                //Tebus
 
-            $teb1 = $tebus1[0]['bil'] + intval($gadaikawalanstok['bilTeb1']);
-            $teb2 = $tebus2[0]['bil'] + intval($gadaikawalanstok['bilTeb2']);
-            $teb3 = $tebus3[0]['bil'] + intval($gadaikawalanstok['bilTeb3']);
-            $tebpinj1 = $tebus1[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb1']);
-            $tebpinj2 = $tebus2[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb2']);
-            $tebpinj3 = $tebus3[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb3']);
+                $teb1 = $tebus1[0]['bil'] + intval($gadaikawalanstok['bilTeb1']);
+                $teb2 = $tebus2[0]['bil'] + intval($gadaikawalanstok['bilTeb2']);
+                $teb3 = $tebus3[0]['bil'] + intval($gadaikawalanstok['bilTeb3']);
+                $tebpinj1 = $tebus1[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb1']);
+                $tebpinj2 = $tebus2[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb2']);
+                $tebpinj3 = $tebus3[0]['pinj'] + floatval($gadaikawalanstok['pinjTeb3']);
 
-            $tebus1[0]['bil'] = $teb1;
-            $tebus1[0]['pinj'] = $tebpinj1;
-            $tebus2[0]['bil'] = $teb2;
-            $tebus2[0]['pinj'] = $tebpinj2;
-            $tebus3[0]['bil'] = $teb3;
-            $tebus3[0]['pinj'] = $tebpinj3;
+                $tebus1[0]['bil'] = $teb1;
+                $tebus1[0]['pinj'] = $tebpinj1;
+                $tebus2[0]['bil'] = $teb2;
+                $tebus2[0]['pinj'] = $tebpinj2;
+                $tebus3[0]['bil'] = $teb3;
+                $tebus3[0]['pinj'] = $tebpinj3;
 
-            //Lelong
+                //Lelong
 
-            $lel1 = $lelong1[0]['bil'] + intval($gadaikawalanstok['bilLel1']);
-            $lel2 = $lelong2[0]['bil'] + intval($gadaikawalanstok['bilLel2']);
-            $lel3 = $lelong3[0]['bil'] + intval($gadaikawalanstok['bilLel3']);
-            $lelpinj1 = $lelong1[0]['pinj'] + floatval($gadaikawalanstok['pinjLel1']);
-            $lelpinj2 = $lelong2[0]['pinj'] + floatval($gadaikawalanstok['pinjLel2']);
-            $lelpinj3 = $lelong3[0]['pinj'] + floatval($gadaikawalanstok['pinjLel3']);
+                $lel1 = $lelong1[0]['bil'] + intval($gadaikawalanstok['bilLel1']);
+                $lel2 = $lelong2[0]['bil'] + intval($gadaikawalanstok['bilLel2']);
+                $lel3 = $lelong3[0]['bil'] + intval($gadaikawalanstok['bilLel3']);
+                $lelpinj1 = $lelong1[0]['pinj'] + floatval($gadaikawalanstok['pinjLel1']);
+                $lelpinj2 = $lelong2[0]['pinj'] + floatval($gadaikawalanstok['pinjLel2']);
+                $lelpinj3 = $lelong3[0]['pinj'] + floatval($gadaikawalanstok['pinjLel3']);
 
-            $lelong1[0]['bil'] = $lel1;
-            $lelong1[0]['pinj'] = $lelpinj1;
-            $lelong2[0]['bil'] = $lel2;
-            $lelong2[0]['pinj'] = $lelpinj2;
-            $lelong3[0]['bil'] = $lel3;
-            $lelong3[0]['pinj'] = $lelpinj3;
+                $lelong1[0]['bil'] = $lel1;
+                $lelong1[0]['pinj'] = $lelpinj1;
+                $lelong2[0]['bil'] = $lel2;
+                $lelong2[0]['pinj'] = $lelpinj2;
+                $lelong3[0]['bil'] = $lel3;
+                $lelong3[0]['pinj'] = $lelpinj3;
 
+            }
         }
 
         //////////////////
diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php
index 8304536..08843cc 100644
--- a/app/Http/Controllers/PanjarController.php
+++ b/app/Http/Controllers/PanjarController.php
@@ -38,6 +38,20 @@ class PanjarController extends Controller
       return response()->json($panjar);
    }
 
+   public function listeachpanjar(Request $request,$kodcaw)
+   {
+      $harini = Carbon::now();
+      $harini = new Carbon;
+
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+      $panjar=Panjar::on($cawangan['mysql'])
+               ->where('nobaucer','=',$request->nobaucer)
+               ->first();
+
+      return response()->json($panjar);
+   }
+
    public function listmulaakhir($kodcaw,$mula,$akhir)
    {
    
diff --git a/routes/web.php b/routes/web.php
index e7bcbbb..49aa4c9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -235,6 +235,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //API PANJAR KHAZANAH
     $router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']);
     $router->get('SenaraiPanjar/list/{kodcaw}',['uses'=>'PanjarController@listpanjar']);
+    $router->get('SenaraiPanjar/listeach/{kodcaw}',['uses'=>'PanjarController@listeachpanjar']);
     $router->get('SenaraiPanjar/{kodcaw}/{mula}/{akhir}',['uses'=>'PanjarController@listmulaakhir']);
     // $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'PanjarController@update']);
     $router->post('CreatePanjar/{kodcaw}',['uses'=>'PanjarController@create']);

From 6da7c5b51ff08ad7fc51c7ae76002851e6b044ee Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Mon, 3 May 2021 16:02:07 +0800
Subject: [PATCH 4/8] fix skit2

---
 app/Http/Controllers/GadaiController.php   | 118 +++++++++++++++++++++
 app/Http/Controllers/LaporanController.php |  14 ++-
 2 files changed, 130 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 7538897..2226823 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1135,6 +1135,124 @@ class GadaiController extends Controller
             }
         }
 
+        //////////////////
+        /////ANSURAN//////
+        //////////////////
+
+        $daterequest = new Carbon($tarikh);
+        $dateselepas = $daterequest;
+        $dateselepas->addDays(1);
+
+        $ansuran1 = TransaksiKeuntungan::on('mysql7')
+                    ->leftJoin('transaction as trans', function($join)
+                         {
+                             $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                             $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                         })
+                    ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
+                    ->where('trans.created_at','<',$dateselepas)
+                    ->where('trans.trans_type','=','A')
+                    ->whereBetween('nilaimarhun', [1, 400.99])
+                    ->groupBy('trans.id')
+                    ->get();
+
+        $ansuranharini1 = TransaksiKeuntungan::on('mysql7')
+                    ->leftJoin('transaction as trans', function($join)
+                         {
+                             $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                             $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                         })
+                    ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
+                    ->where('trans.created_at','<',$dateselepas)
+                    ->where('trans.trans_type','=','A')
+                    ->whereBetween('nilaimarhun', [1, 400.99])
+                    ->groupBy('trans.id')
+                    ->get();
+
+        $ansuran2 = TransaksiKeuntungan::on('mysql7')
+                    ->leftJoin('transaction as trans', function($join)
+                            {
+                                $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                                $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                            })
+                    ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
+                    ->where('trans.created_at','<',$dateselepas)
+                    ->where('trans.trans_type','=','A')
+                    ->whereBetween('nilaimarhun', [401, 2000.99])
+                    ->groupBy('trans.id')
+                    ->get();
+
+        $ansuranharini2 = TransaksiKeuntungan::on('mysql7')
+                    ->leftJoin('transaction as trans', function($join)
+                         {
+                             $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                             $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                         })
+                    ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
+                    ->where('trans.created_at','<',$dateselepas)
+                    ->where('trans.trans_type','=','A')
+                    ->whereBetween('nilaimarhun', [401, 2000.99])
+                    ->groupBy('trans.id')
+                    ->get();
+
+        $ansuran3 = TransaksiKeuntungan::on('mysql7')
+                    ->leftJoin('transaction as trans', function($join)
+                            {
+                                $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                                $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                            })
+                    ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
+                    ->where('trans.created_at','<',$dateselepas)
+                    ->where('trans.trans_type','=','A')
+                    ->whereBetween('nilaimarhun', [2001, 100000])
+                    ->groupBy('trans.id')
+                    ->get();
+        
+        $ansuranharini3 = TransaksiKeuntungan::on('mysql7')
+                    ->leftJoin('transaction as trans', function($join)
+                         {
+                             $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                             $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                         })
+                    ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
+                    ->where('trans.created_at','<',$dateselepas)
+                    ->where('trans.trans_type','=','A')
+                    ->whereBetween('nilaimarhun', [2001, 100000])
+                    ->groupBy('trans.id')
+                    ->get();
+
+        //Calculation Ansuran guna foreach
+
+        $totalans1 = 0;
+        $countans1 = 0;
+        foreach($ansuran1 as $ans1)
+        {
+            $totalans1 += $ans1['bayaran_pembiayaan'];
+            $countans1++;
+        }
+        
+        $totalans2 = 0;
+        $countans2 = 0;
+        foreach($ansuran2 as $ans2)
+        {
+            $totalans2 += $ans2['bayaran_pembiayaan'];
+            $countans2++;
+        }
+
+        $totalans3 = 0;
+        $countans3 = 0;
+        foreach($ansuran3 as $ans3)
+        {
+            $totalans3 += $ans3['bayaran_pembiayaan'];
+            $countans3++;
+        }
+
+
+        return;
+        
+                    
+
+
         //////////////////
         ///HAPUS KIRA/////
         //////////////////
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 47c85a6..561a370 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -12,6 +12,9 @@ use App\Customer;
 use App\TuntutBaki;
 use App\Panjar;
 use App\Lelong;
+use App\Advansur;
+use App\Vault;
+use App\Denominasi;
 
 use Carbon\Carbon;
 
@@ -31,7 +34,8 @@ class LaporanController extends Controller
         $total_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->sum('pinjaman');
         $total_tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->sum('pinjaman');
         $total_ansuran = Transaction::on('mysql7')->whereRaw('DATE(created_at) = ?',[$request->tarikh])->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]])->sum('duit_masuk');
-        $total_keuntungan = TransaksiKeuntungan::on('mysql7')->whereRaw('DATE(tarikh_bayaran) = ?',[$request->tarikh])->sum('keuntungan_sebenar');
+        $total_keuntungan = TransaksiKeuntungan::on('mysql7')->whereRaw('DATE(tarikh_bayaran) = ?',[$request->tarikh])->sum('bayaran_keuntungan');
+        $total_upah = Advansur::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('upahdibayar');
 
         //b
         $bilangan_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->count();
@@ -40,6 +44,8 @@ class LaporanController extends Controller
         $bilangan_customer_baru = Customer::on($cawangan['mysql'])->where('tarikhdaftar','=',$request->tarikh)->count();
 
         //c
+        $petibesi_sistem = Vault::on($cawangan['mysql'])->where('tarikh','=', $request->tarikh)->sum('bakiakhir');
+        $petibesi_deno = Denominasi::on($cawangan['mysql'])->where('tarikh','=', $request->tarikh)->sum('txtjumlah'); 
 
         //d
         $panjar_harian = Panjar::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('bayaran');
@@ -111,7 +117,11 @@ class LaporanController extends Controller
             'jumlah_lelong'=>$jumlah_lelong,
             'baki_lelong'=>$baki_lelong,
             'rugi_lelong'=>$rugi_lelong,
-            'total_keuntungan'=>$total_keuntungan
+            'total_keuntungan'=>$total_keuntungan,
+            'total_upah'=>$total_upah,
+            'petibesi_sistem'=>$petibesi_sistem,
+            'petibesi_deno'=>$petibesi_deno 
+
             ]);
             
         return response()->json($laporan_harian);

From 09183315b918bb884d950caac0222f35a0ae3dda Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Tue, 4 May 2021 09:30:51 +0800
Subject: [PATCH 5/8] fix ringkasan

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

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 2226823..acd4659 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1140,8 +1140,6 @@ class GadaiController extends Controller
         //////////////////
 
         $daterequest = new Carbon($tarikh);
-        $dateselepas = $daterequest;
-        $dateselepas->addDays(1);
 
         $ansuran1 = TransaksiKeuntungan::on('mysql7')
                     ->leftJoin('transaction as trans', function($join)
@@ -1150,7 +1148,7 @@ class GadaiController extends Controller
                              $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
                          })
                     ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
-                    ->where('trans.created_at','<',$dateselepas)
+                    ->where('trans.created_at','<',$daterequest)
                     ->where('trans.trans_type','=','A')
                     ->whereBetween('nilaimarhun', [1, 400.99])
                     ->groupBy('trans.id')
@@ -1163,7 +1161,8 @@ class GadaiController extends Controller
                              $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
                          })
                     ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
-                    ->where('trans.created_at','<',$dateselepas)
+                    // ->where('trans.created_at','=',$daterequest)
+                    ->whereDate('trans.created_at','=',$tarikh)
                     ->where('trans.trans_type','=','A')
                     ->whereBetween('nilaimarhun', [1, 400.99])
                     ->groupBy('trans.id')
@@ -1176,7 +1175,7 @@ class GadaiController extends Controller
                                 $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
                             })
                     ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
-                    ->where('trans.created_at','<',$dateselepas)
+                    ->where('trans.created_at','<',$daterequest)
                     ->where('trans.trans_type','=','A')
                     ->whereBetween('nilaimarhun', [401, 2000.99])
                     ->groupBy('trans.id')
@@ -1189,12 +1188,12 @@ class GadaiController extends Controller
                              $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
                          })
                     ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
-                    ->where('trans.created_at','<',$dateselepas)
+                    ->whereDate('trans.created_at','=',$tarikh)
                     ->where('trans.trans_type','=','A')
                     ->whereBetween('nilaimarhun', [401, 2000.99])
                     ->groupBy('trans.id')
                     ->get();
-
+        
         $ansuran3 = TransaksiKeuntungan::on('mysql7')
                     ->leftJoin('transaction as trans', function($join)
                             {
@@ -1202,7 +1201,7 @@ class GadaiController extends Controller
                                 $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
                             })
                     ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
-                    ->where('trans.created_at','<',$dateselepas)
+                    ->where('trans.created_at','<',$daterequest)
                     ->where('trans.trans_type','=','A')
                     ->whereBetween('nilaimarhun', [2001, 100000])
                     ->groupBy('trans.id')
@@ -1215,7 +1214,7 @@ class GadaiController extends Controller
                              $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
                          })
                     ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
-                    ->where('trans.created_at','<',$dateselepas)
+                    ->whereDate('trans.created_at','=',$tarikh)
                     ->where('trans.trans_type','=','A')
                     ->whereBetween('nilaimarhun', [2001, 100000])
                     ->groupBy('trans.id')
@@ -1223,34 +1222,67 @@ class GadaiController extends Controller
 
         //Calculation Ansuran guna foreach
 
-        $totalans1 = 0;
-        $countans1 = 0;
+        $totalans1 = 0;$totalharinians1 = 0;
+        $countans1 = 0;$countharinians1 = 0;
         foreach($ansuran1 as $ans1)
         {
             $totalans1 += $ans1['bayaran_pembiayaan'];
             $countans1++;
         }
+
+        $arrayans1 = ['bil' => $countans1, 'pinj' => $totalans1];
         
-        $totalans2 = 0;
-        $countans2 = 0;
+        foreach($ansuranharini1 as $ansharini1)
+        {
+            $totalharinians1 += $ansharini1['bayaran_pembiayaan'];
+            $countharinians1 ++;
+        }
+
+        $arrayharinians1 = ['bil' => $countharinians1, 'pinj' => $totalharinians1];
+
+        //End 1
+
+        
+        $totalans2 = 0;$totalharinians2 = 0;
+        $countans2 = 0;$countharinians2 = 0;
         foreach($ansuran2 as $ans2)
         {
             $totalans2 += $ans2['bayaran_pembiayaan'];
             $countans2++;
         }
 
-        $totalans3 = 0;
-        $countans3 = 0;
+        $arrayans2 = ['bil' => $countans2, 'pinj' => $totalans2];
+
+
+        foreach($ansuranharini2 as $ansharini2)
+        {
+            $totalharinians2 += $ansharini2['bayaran_pembiayaan'];
+            $countharinians2 ++;
+        }
+
+        $arrayharinians2 = ['bil' => $countharinians2, 'pinj' => $totalharinians2];
+
+        //End 2
+
+        $totalans3 = 0;$totalharinians3 = 0;
+        $countans3 = 0;$countharinians3 = 0;
         foreach($ansuran3 as $ans3)
         {
             $totalans3 += $ans3['bayaran_pembiayaan'];
             $countans3++;
         }
 
+        $arrayans3 = ['bil' => $countans3, 'pinj' => $totalans3];
 
-        return;
-        
-                    
+        foreach($ansuranharini3 as $ansharini3)
+        {
+            $totalharinians3 += $ansharini3['bayaran_pembiayaan'];
+            $countharinians3 ++;
+        }
+
+        $arrayharinians3 = ['bil' => $countharinians3, 'pinj' => $totalharinians3];
+
+        //End 3
 
 
         //////////////////
@@ -1311,6 +1343,7 @@ class GadaiController extends Controller
         array_push($array_kawalanstok,["tebus1" => $tebus1, "tebus2" => $tebus2, "tebus3" => $tebus3,"tebusini1" => $tebusini1, "tebusini2" => $tebusini2, "tebusini3" => $tebusini3]);
         array_push($array_kawalanstok,["lelong1" => $lelong1, "lelong2" => $lelong2, "lelong3" => $lelong3,"lelongini1" => $lelongini1, "lelongini2" => $lelongini2, "lelongini3" => $lelongini3]);
         array_push($array_kawalanstok,["hapuskira1" => $hapuskira1, "hapuskira2" => $hapuskira2, "hapuskira3" => $hapuskira3,"hapuskiraini1" => $hapuskiraini1, "hapuskiraini2" => $hapuskiraini2, "hapuskiraini3" => $hapuskiraini3]);
+        array_push($array_kawalanstok,["ans1" => $arrayans1, "ans2" => $arrayans2, "ans3" => $arrayans3,"ansini1" => $arrayharinians1, "ansini2" => $arrayharinians2, "ansini3" => $arrayharinians3]);
         return response()->json($array_kawalanstok);
 
     }
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 561a370..fbcd868 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -53,6 +53,22 @@ class LaporanController extends Controller
         $panjar_tahunan = Panjar::on($cawangan['mysql'])->where([['tarikh','<=',$request->tarikh],['tarikh','>=',$firstDayYear]])->sum('bayaran');
 
         //e
+        /* Imbang Duga */
+
+        
+
+        /* Stok Audit */
+
+        $stokaudit = Gadai::on($cawangan['mysql'])
+                    ->where('tagpalsu','=',0)
+                    ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+                    ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
+                    ->sum('pinjaman');
+
+        /* Kawalan Stok */
+
+        
+
 
         //f
         $data_lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$request->tarikh)->get();
@@ -120,7 +136,8 @@ class LaporanController extends Controller
             'total_keuntungan'=>$total_keuntungan,
             'total_upah'=>$total_upah,
             'petibesi_sistem'=>$petibesi_sistem,
-            'petibesi_deno'=>$petibesi_deno 
+            'petibesi_deno'=>$petibesi_deno,
+            'stokaudit'=>$stokaudit 
 
             ]);
             

From fd8e1d504d6e43502b7a52492defd82005b73a2c Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Tue, 4 May 2021 16:34:00 +0800
Subject: [PATCH 6/8] fix laporan

---
 app/Http/Controllers/GadaiController.php   | 13 +++---
 app/Http/Controllers/LaporanController.php | 22 +++++++++--
 app/Http/Controllers/TebusController.php   | 46 ++++++++++++++++++++++
 routes/web.php                             |  3 +-
 4 files changed, 73 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index acd4659..7498b05 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -892,16 +892,15 @@ class GadaiController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $dateans = new Carbon($request->tarikh);
-        $dateans->addDays(1);
-
-        $date = new Carbon($request->tarikh);
-
 
         $gadai = Transaction::on('mysql7')
-                ->join('transaksi_keuntungan', 'transaction.norujukan', '=', 'transaksi_keuntungan.norujukan')
+                ->leftJoin('transaksi_keuntungan as trans', function($join)
+                {
+                    $join->on('transaction.norujukan', '=', 'trans.norujukan');
+                    $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
+                })
                 ->where('transaction.trans_type','=','A')
-                ->where('transaction.created_at','>=',$date)
-                ->where('transaction.created_at','<=',$dateans)
+                ->whereDate('transaction.created_at','=',$dateans)
                 ->get();
         
         return response()->json($gadai);
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index fbcd868..5ee9dbe 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -34,8 +34,25 @@ class LaporanController extends Controller
         $total_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->sum('pinjaman');
         $total_tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->sum('pinjaman');
         $total_ansuran = Transaction::on('mysql7')->whereRaw('DATE(created_at) = ?',[$request->tarikh])->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]])->sum('duit_masuk');
-        $total_keuntungan = TransaksiKeuntungan::on('mysql7')->whereRaw('DATE(tarikh_bayaran) = ?',[$request->tarikh])->sum('bayaran_keuntungan');
+        // $total_keuntungan = TransaksiKeuntungan::on('mysql7')->whereDate('tarikh_bayaran','=',$request->tarikh)->sum('bayaran_keuntungan');
         $total_upah = Advansur::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('upahdibayar');
+        $total_keuntungantebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->sum('bakiupah');
+
+        $total_keuntunganansuran = TransaksiKeuntungan::on('mysql7')
+                    ->leftJoin('transaction as trans', function($join)
+                         {
+                             $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                             $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                         })
+                    ->whereDate('trans.created_at','=',$request->tarikh)
+                    ->where('trans.trans_type','=','A')
+                    ->groupBy('trans.id')
+                    ->sum('keuntungan_rebet');
+
+        // $total_ansuran = number_format($total_ansuran,2);
+
+        $total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus);
+
 
         //b
         $bilangan_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->count();
@@ -133,8 +150,7 @@ class LaporanController extends Controller
             'jumlah_lelong'=>$jumlah_lelong,
             'baki_lelong'=>$baki_lelong,
             'rugi_lelong'=>$rugi_lelong,
-            'total_keuntungan'=>$total_keuntungan,
-            'total_upah'=>$total_upah,
+            'total_keuntungan'=>floatval($total_keuntungan),
             'petibesi_sistem'=>$petibesi_sistem,
             'petibesi_deno'=>$petibesi_deno,
             'stokaudit'=>$stokaudit 
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 07d12d4..efda1e5 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -396,6 +396,34 @@ class TebusController extends Controller
         return response()->json($tebus);
     }
 
+    public function getLaporanTebusPengasingan($kodcaw,Request $request){
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $tebusarrahn = Tebus::on($cawangan['mysql'])
+                ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
+                ->where('t_tebus','=',$request->tarikh)
+                ->whereNull('hargajualan');
+
+        $totalpenebusanarrahn = $tebusarrahn->sum('tebus.pinjaman');
+        $bilpenebusanarrahn = $tebusarrahn->count();
+        $totalkeuntunganarrahn = $tebusarrahn->sum('tebus.bakiupah');
+
+        $tebustawarruq = Tebus::on($cawangan['mysql'])
+                ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
+                ->where('t_tebus','=',$request->tarikh)
+                ->whereNotNull('hargajualan');
+
+        $totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman');
+        $bilpenebusantawarruq = $tebustawarruq->count();
+        $totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate');
+        $totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah');
+
+        $array_penebusan = ['bilarrahn' => $bilpenebusanarrahn, 'totalarrahn' => $totalpenebusanarrahn, 'keuntunganarrahn' => $totalkeuntunganarrahn,  'biltawarruq' => $bilpenebusantawarruq, 'totaltawarruq' => $totalpenebusantawarruq,'totalrebate' => $totalrebatetawarruq,'keuntungantawarruq' => $totalkeuntungantawarruq];
+
+        return response()->json($array_penebusan);
+    }
+
     public function listPenebusanBaru($kodcaw){
     
         $current = Carbon::now();
@@ -569,6 +597,24 @@ class TebusController extends Controller
 
     }
 
+    public function advansurdetails($kodcaw,Request $request){
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $listadvansur = Advansur::on($cawangan['mysql'])
+        ->where('tarikh','=',$request->tarikh);
+
+        $countadvansur = $listadvansur->count();
+        $totaladvansur = $listadvansur->sum('upahdibayar');
+
+        $arrayadvansur = ['bil' => $countadvansur, 'total' => $totaladvansur];
+
+        return response()->json($arrayadvansur,200);
+    }
+
     public function getAdvansurByKodlaluan($kodcaw,Request $request)
     {
         $current = Carbon::now();
diff --git a/routes/web.php b/routes/web.php
index 376fb1d..13c97dd 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -86,12 +86,12 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('tebusbukantawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusNotTawarruq']);
     $router->get('upahbukantawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@upahNotTawarruq']);
     $router->get('tebus/laporan/{kodcaw}/{tarikh}',['uses'=>'TebusController@getLaporanTebus']);
+    $router->get('tebus/laporanjenistawarruq/{kodcaw}',['uses'=>'TebusController@getLaporanTebusPengasingan']);
     //Maintenance API TEBUS
     // $router->get('rebet/{kodcaw}/{norujukan}',['uses' => 'TebusController@rebet']);
     $router->put('updatetebus/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdate']);
     $router->get('listpenebusanhistory/{kodcaw}',['uses'=>'TebusController@listhistorypenebusan']);
 
-
     //API FARIS
     $router->put('tebus/serah_marhun_teller/{kodcaw}/{norujukan}',['uses'=>'GadaiController@barcodescanTebus']);
     // $router->get('tebus_serahan/{kodcaw}',['uses'=>'TebusController@SerahMarhunTeller']);
@@ -188,6 +188,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']);
     $router->get('ansuranupah/{kodcaw}',['uses'=>'TebusController@getAdvansurByKodlaluan']);
     $router->get('advansurharini/{kodcaw}',['uses'=>'TebusController@advansurharini']);
+    $router->get('advansurdetails/{kodcaw}',['uses'=>'TebusController@advansurdetails']);
     $router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']);
     $router->get('advansur/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansurUpah']);
 

From 86fa607efbcc2e040b80d589c3f1049238d355e3 Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Wed, 5 May 2021 09:11:11 +0800
Subject: [PATCH 7/8] fix laporan

---
 app/Http/Controllers/LaporanController.php | 31 ++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 5ee9dbe..7204d7f 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -14,6 +14,7 @@ use App\Panjar;
 use App\Lelong;
 use App\Advansur;
 use App\Vault;
+use App\Tunai;
 use App\Denominasi;
 
 use Carbon\Carbon;
@@ -72,7 +73,32 @@ class LaporanController extends Controller
         //e
         /* Imbang Duga */
 
-        
+        $totalbakiakhirtunai = 0;
+  
+        $vault=Vault::on($cawangan['mysql'])
+                ->where('kodcaw','=',$request->kodcaw)
+                ->where('tarikh','<=', $request->tarikh)
+                ->orderby('tarikh','desc')->first();
+  
+        $tunai = Tunai::on($cawangan['mysql'])
+                 ->where('kodcaw','=',$request->kodcaw)
+                 ->where('tarikh','=', $request->tarikh)
+                 ->get();
+  
+        $total = 0;
+        foreach($tunai as $index=>$money)
+        {
+           $total+=$money['baki'];
+        }
+  
+  
+        if($total != 0)
+        {
+           $totalbakiakhirtunai = $vault['bakiakhir'] + $total;
+        }else
+        {
+           $totalbakiakhirtunai = $vault['bakiakhir'];
+        }
 
         /* Stok Audit */
 
@@ -153,7 +179,8 @@ class LaporanController extends Controller
             'total_keuntungan'=>floatval($total_keuntungan),
             'petibesi_sistem'=>$petibesi_sistem,
             'petibesi_deno'=>$petibesi_deno,
-            'stokaudit'=>$stokaudit 
+            'stokaudit'=>$stokaudit,
+            'petibesiimbangduga'=>$totalbakiakhirtunai 
 
             ]);
             

From a54e39a6587330b977cfa36ff74ec5a38f4c3df9 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 5 May 2021 15:56:49 +0800
Subject: [PATCH 8/8] fix laporan

---
 app/Http/Controllers/LaporanController.php | 57 +++++++++++++++++-----
 app/Http/Controllers/PanjarController.php  |  1 -
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 7204d7f..3d5e762 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -62,17 +62,10 @@ class LaporanController extends Controller
         $bilangan_customer_baru = Customer::on($cawangan['mysql'])->where('tarikhdaftar','=',$request->tarikh)->count();
 
         //c
+        /* Sistem */
         $petibesi_sistem = Vault::on($cawangan['mysql'])->where('tarikh','=', $request->tarikh)->sum('bakiakhir');
-        $petibesi_deno = Denominasi::on($cawangan['mysql'])->where('tarikh','=', $request->tarikh)->sum('txtjumlah'); 
-
-        //d
-        $panjar_harian = Panjar::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('bayaran');
-        $panjar_bulanan = Panjar::on($cawangan['mysql'])->where([['tarikh','<=',$request->tarikh],['tarikh','>=',$firstDay]])->sum('bayaran');
-        $panjar_tahunan = Panjar::on($cawangan['mysql'])->where([['tarikh','<=',$request->tarikh],['tarikh','>=',$firstDayYear]])->sum('bayaran');
-
-        //e
+       
         /* Imbang Duga */
-
         $totalbakiakhirtunai = 0;
   
         $vault=Vault::on($cawangan['mysql'])
@@ -100,18 +93,53 @@ class LaporanController extends Controller
            $totalbakiakhirtunai = $vault['bakiakhir'];
         }
 
+        /* Denominasi */
+        $petibesi_deno = Denominasi::on($cawangan['mysql'])->where('tarikh','=', $request->tarikh)->sum('txtjumlah'); 
+
+
+        //d
+        $panjar_harian = Panjar::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('bayaran');
+        $panjar_bulanan = Panjar::on($cawangan['mysql'])->where([['tarikh','<=',$request->tarikh],['tarikh','>=',$firstDay]])->sum('bayaran');
+        $panjar_tahunan = Panjar::on($cawangan['mysql'])->where([['tarikh','<=',$request->tarikh],['tarikh','>=',$firstDayYear]])->sum('bayaran');
+
+        //e
+        /* Imbang Duga */
+
+        $rekodkoop = Gadai::on($cawangan['mysql'])
+                            ->where('tagpalsu','=',0)
+                            ->where([['t_gadai','<=','2021-04-13'],['sttebus','=','']])
+                            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']])
+                            ->sum('pinjaman');
+
+        if($request->tarikh > '2021-04-13'){
+            $rekodtawarruq = Gadai::on($cawangan['mysql'])
+                ->where('tagpalsu','=',0)
+                ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
+                ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
+                ->sum('pinjaman');
+            }
+
+        $outstandingimbangduga = floatval($rekodkoop) + floatval($rekodtawarruq);
+
+   
         /* Stok Audit */
 
         $stokaudit = Gadai::on($cawangan['mysql'])
                     ->where('tagpalsu','=',0)
                     ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-                    ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
-                    ->sum('pinjaman');
+                    ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
+
+        $stokauditpembiayaan = $stokaudit->sum('pinjaman');
+        $stokauditnilaimarhun = $stokaudit->sum('nilaimarhun'); 
+        $stokauditcount = $stokaudit->count(); 
+
 
         /* Kawalan Stok */
 
         
 
+        
+
 
         //f
         $data_lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$request->tarikh)->get();
@@ -179,8 +207,11 @@ class LaporanController extends Controller
             'total_keuntungan'=>floatval($total_keuntungan),
             'petibesi_sistem'=>$petibesi_sistem,
             'petibesi_deno'=>$petibesi_deno,
-            'stokaudit'=>$stokaudit,
-            'petibesiimbangduga'=>$totalbakiakhirtunai 
+            'stokauditpembiayaan'=>$stokauditpembiayaan,
+            'stokauditnilaimarhun'=>$stokauditnilaimarhun,
+            'stokauditcount'=>$stokauditcount,
+            'petibesiimbangduga'=>$totalbakiakhirtunai,
+            'outstandingimbangduga'=>$outstandingimbangduga
 
             ]);
             
diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php
index 08843cc..1add74b 100644
--- a/app/Http/Controllers/PanjarController.php
+++ b/app/Http/Controllers/PanjarController.php
@@ -96,7 +96,6 @@ class PanjarController extends Controller
 
       $panjar=Panjar::on($cawangan['mysql'])
                ->create([ 
-              
                         'tarikh'=> $harini->toDateString(),
                         'deskripsi'=> $request->deskripsi,
                         'bayaran' => $request->bayaran,