From 6d40be59d5ce5d452a4c99453e0900a6d58e4e07 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Mon, 5 Apr 2021 16:31:05 +0800
Subject: [PATCH 01/60] fix skit gadai

---
 app/Http/Controllers/GadaiController.php | 28 +++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index f7f50f5..dea0e97 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1430,6 +1430,7 @@ class GadaiController extends Controller
         $bakiakhir = 0;
         $totalkeluar = 0;
 
+
         if($gadai[0]['historygadaian'] != "0" && $gadai[0]['historygadaian'] != '')
         {
 
@@ -1437,10 +1438,11 @@ class GadaiController extends Controller
             {
                 if($tebus['jenistebus'] == 'P')
                 {
+
                      $totalkeluar = $keluar - $tebus['addpinjaman'];
                      $totalmasuk = $masuk - $tebus['bakiupah'];
          
-                     $bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
+                     $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
          
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -1448,12 +1450,15 @@ class GadaiController extends Controller
                     'masuk' => $totalmasuk,
                     'baki' => $bakiakhir
                     ));
+                    
          
                 }else{
          
                      $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
                      $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
-                     $bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
+                     $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
+
+                    //  dd($totalmasuk,$totalkeluar,$bakiakhir);
          
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -1461,6 +1466,7 @@ class GadaiController extends Controller
                     'masuk' => $totalmasuk,
                     'baki' => $bakiakhir
                     ));
+
                 }
             }else{
 
@@ -1468,7 +1474,7 @@ class GadaiController extends Controller
 
                 if($tebus['jenistebus'] == 'P')
                 {
-           
+
                     $bakiakhir = $bakiakhir - $tebus['bakiupah'] + $tebus['addpinjaman'];
         
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
@@ -1497,6 +1503,10 @@ class GadaiController extends Controller
             Gadai::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->update(['sttebus' => '']);
 
             Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+
+            TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$gadai[0]['historygadaian'])->orderBy('id', 'desc')->limit(1)->delete();
+            
+            Transaction::on('mysql7')->where('norujukan','=',$gadai[0]['historygadaian'])->orderBy('id', 'desc')->limit(1)->delete();
     
             Tebus::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->delete();
 
@@ -1537,9 +1547,9 @@ class GadaiController extends Controller
                 
             Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
             Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
-    
+            // TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
+            // Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
             
-
             return response('Deleted Successfully', 200);
         }
        
@@ -1587,6 +1597,10 @@ class GadaiController extends Controller
                 Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
 
                 Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+
+                TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
+            
+                Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
         
                 return response('Deleted Successfully', 200);
             }
@@ -1609,6 +1623,10 @@ class GadaiController extends Controller
                 Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
 
                 Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+
+                TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
+            
+                Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
         
                 return response('Deleted Successfully', 200);
             }

From a6f7ab21d47e45201bc16b0113d118500abd5082 Mon Sep 17 00:00:00 2001
From: Afiq Zakwan Hamdan <afiqzakwanhamdan@gmail.com>
Date: Wed, 7 Apr 2021 12:44:01 +0800
Subject: [PATCH 02/60] slm

---
 app/Gadai.php                            |   1 +
 app/Http/Controllers/GadaiController.php | 160 ++++++++---------------
 app/Http/Controllers/TebusController.php |  85 ++----------
 app/TransaksiKeuntungan.php              |   2 +-
 4 files changed, 72 insertions(+), 176 deletions(-)

diff --git a/app/Gadai.php b/app/Gadai.php
index 9372369..d5864da 100644
--- a/app/Gadai.php
+++ b/app/Gadai.php
@@ -72,6 +72,7 @@ class Gadai extends Model
         'upah12',
         'tagkomuditi',
         'tempohbayar',
+        'lelong_tawarruq'
     ];
 
     /**
diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index f7f50f5..2dc1dd1 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -28,8 +28,7 @@ use Carbon\Carbon;
 class GadaiController extends Controller
 {
 
-    public function showAllGadais()
-    {
+    public function showAllGadais(){
         return response()->json(Gadai::all());
     }
 
@@ -41,8 +40,7 @@ class GadaiController extends Controller
         return response()->json($gadaiTransaction);
     }
 
-    public function showOneGadai($noic)
-    {
+    public function showOneGadai($noic){
         $cawangan_all = Cawangan::on('mysql7')->get();
         $gadai_all = [];
         foreach($cawangan_all as $index=>$cawangan){
@@ -55,8 +53,7 @@ class GadaiController extends Controller
         return response()->json($gadai_all);
     }
 
-    public function showOneGadaiMobile($noic)
-    {
+    public function showOneGadaiMobile($noic){
         $cawangan_all = Cawangan::on('mysql7')->get();
         $gadai_all = [];
         foreach($cawangan_all as $index=>$cawangan){
@@ -97,16 +94,14 @@ class GadaiController extends Controller
         return response()->json($gadai);
     }
 
-    public function showOneGadaibyRujukanAndCawangan($kodcaw,$norujukan)
-    {
+    public function showOneGadaibyRujukanAndCawangan($kodcaw,$norujukan){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->get();
 
         return response()->json($gadai);
     }
 
-    public function create($kodcaw,Request $request)
-    {
+    public function create($kodcaw,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -124,8 +119,7 @@ class GadaiController extends Controller
         return response()->json($gadai, 201);
     }
 
-    public function createold($kodcaw,Request $request)
-    {
+    public function createold($kodcaw,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -188,8 +182,7 @@ class GadaiController extends Controller
     }
 
 
-    public function daftarGadaiMarhun($norujukan,Request $request)
-    {
+    public function daftarGadaiMarhun($norujukan,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -228,7 +221,10 @@ class GadaiController extends Controller
                 't_matang1' => $t_kontrak,
                 'tempoh' => 0.5,
                 'kuantiti' => $request->kuantiti_marhun,
-                'tagkomuditi' => 0
+                'tagkomuditi' => 0,
+                'upahdibayar' => 0.00,
+                'tempohbayar' => 0.00,
+                'lelong_tawarruq' => 1
             ));
         return response()->json($gadai, 200);
     }
@@ -266,31 +262,17 @@ class GadaiController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
-        if($gadai_data['tempoh'] > 6){
-            $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
-            $upah_semasa_round = number_format($upahsemasa_raw,2);
-            $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
-        }else{
-            if($gadai_data['tempoh'] == 6){
-                if($gadai_data['bakiupah'] != 0){
-                    $upah_semasa = $gadai_data['bakiupah'];
-                }else{
-                    $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
-                    $upah_semasa_round = number_format($upahsemasa_raw,2);
-                    $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
-                }
-            }else{
-                $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
-                $upah_semasa_round = number_format($upahsemasa_raw,2);
-                $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
-            }
-        }
+        $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
+
+        $upahsemasa_raw = $bilangan_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
+
+        $upah_semasa_round = number_format($upahsemasa_raw,2);
+        $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
 
         return $upah_semasa;
     }
 
-    public function updateGadaiMarhunOnline($kodcaw,$norujukan,Request $request)
-    {
+    public function updateGadaiMarhunOnline($kodcaw,$norujukan,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -299,32 +281,22 @@ class GadaiController extends Controller
 
         $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
         
-        if($gadai['tempoh'] > 6){
-            $baki_bayaran = $request->bayaran - $upahsemasa;
-            $baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran;
-            $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
-            $baki_upah = 0;
-            $keuntungan_sebenar = $upahsemasa;
+        $total_bayaran_prev = Transaction::on('mysql7')->where([['norujukan','=',$norujukan],['trans_type','=','A']])->sum('duit_masuk');
+
+        $total_bayaran_semasa = $total_bayaran_prev + $request->bayaran;
+
+        if($total_bayaran_semasa >= $gadai['bakiupah']){
+            $lelong_tawarruq = 0;
         }else{
-            if($gadai['bakiupah'] > $request->bayaran){
-                $keuntungan_sebenar = $request->bayaran;
-            }else{
-                $keuntungan_sebenar = $gadai['bakiupah'];
-            }
-            $baki_upah = $gadai['bakiupah'] - $request->bayaran;
-            $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
-            if($gadai['bakipjm'] == null){
-                $baki_pinjaman = $gadai['pinjaman'];
-            }else{
-                $baki_pinjaman = $gadai['bakipjm'];
-            }
-            
-            if($baki_upah < 0){
-                $baki_pinjaman = $baki_pinjaman + $baki_upah;
-                $baki_upah = 0;
-            }
+            $lelong_tawarruq = 1;
         }
 
+        $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
+
+        $baki_bayaran = $request->bayaran - $upahsemasa;
+
+        $baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran;
+
         $transaction = Transaction::on('mysql7')->create([
             'trans_type' => 'A',
             'norujukan' => $norujukan,
@@ -339,9 +311,9 @@ class GadaiController extends Controller
         $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
             'norujukan' => $norujukan,
             'bayaran_keuntungan' => $upahsemasa,
+            'bayaran_pembiayaan' => $baki_bayaran,
             'tarikh_bayaran'=> $current,
-            'kodcaw'=> $kodcaw,
-            'keuntungan_sebenar' => $keuntungan_sebenar
+            'kodcaw'=> $kodcaw
         ]);
 
         $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
@@ -354,8 +326,7 @@ class GadaiController extends Controller
         return response()->json($update_gadai, 200);
     }
 
-    public function updateGadaiMarhunKaunter($kodcaw,$norujukan,Request $request)
-    {
+    public function updateGadaiMarhunKaunter($kodcaw,$norujukan,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -364,32 +335,22 @@ class GadaiController extends Controller
 
         $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
 
-        if($gadai['tempoh'] > 6){
-            $baki_bayaran = $request->bayaran - $upahsemasa;
-            $baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran;
-            $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
-            $baki_upah = 0;
-            $keuntungan_sebenar = $upahsemasa;
+        $total_bayaran_prev = Transaction::on('mysql7')->where([['norujukan','=',$norujukan],['trans_type','=','A']])->sum('duit_masuk');
+
+        $total_bayaran_semasa = $total_bayaran_prev + $request->bayaran;
+
+        if($total_bayaran_semasa >= $gadai['bakiupah']){
+            $lelong_tawarruq = 0;
         }else{
-            if($gadai['bakiupah'] > $request->bayaran){
-                $keuntungan_sebenar = $request->bayaran;
-            }else{
-                $keuntungan_sebenar = $gadai['bakiupah'];
-            }
-            $baki_upah = $gadai['bakiupah'] - $request->bayaran;
-            $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
-            if($gadai['bakipjm'] == null){
-                $baki_pinjaman = $gadai['pinjaman'];
-            }else{
-                $baki_pinjaman = $gadai['bakipjm'];
-            }
-            
-            if($baki_upah < 0){
-                $baki_pinjaman = $baki_pinjaman + $baki_upah;
-                $baki_upah = 0;
-            }
+            $lelong_tawarruq = 1;
         }
 
+        $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
+
+        $baki_bayaran = $request->bayaran - $upahsemasa;
+
+        $baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran;
+
         $transaction = Transaction::on('mysql7')->create([
             'trans_type' => 'A',
             'norujukan' => $norujukan,
@@ -404,9 +365,9 @@ class GadaiController extends Controller
         $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
             'norujukan' => $norujukan,
             'bayaran_keuntungan' => $upahsemasa,
+            'bayaran_pembiayaan' => $baki_bayaran,
             'tarikh_bayaran'=> $current,
-            'kodcaw'=> $kodcaw,
-            'keuntungan_sebenar' => $keuntungan_sebenar
+            'kodcaw'=> $kodcaw
         ]);
 
         $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
@@ -414,12 +375,13 @@ class GadaiController extends Controller
             'bakiupah' => $baki_upah,
             'jbg' => 0,
             't_update' => $current->toDateString(),
-            'bakihargajualan' => $baki_hargajualan
+            'bakihargajualan' => $baki_hargajualan,
+            'tempohbayar' => $gadai['tempoh'],
+            'lelong_tawarruq' => $lelong_tawarruq
         ));
         return response()->json($update_gadai, 200);
     }
 
-
     public function getGadaianSemasa($kodcaw){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
@@ -514,8 +476,7 @@ class GadaiController extends Controller
     }
 
     
-    public function barcodeScanTebus($kodcaw,$norujukan)
-    {
+    public function barcodeScanTebus($kodcaw,$norujukan){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
         $namaTeller=$gadai['tellernew'];
@@ -566,7 +527,6 @@ class GadaiController extends Controller
         return response()->json($gadai);
     }
 
-
     public function getLaporanGadai($kodcaw,$tarikh){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
@@ -589,8 +549,7 @@ class GadaiController extends Controller
         return response()->json($gadai);
     }
 
-    public function dashboardall($kodcaw)
-    {
+    public function dashboardall($kodcaw){
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -670,8 +629,7 @@ class GadaiController extends Controller
 
     }
 
-    public function GadaiTebusListTeller($kodcaw,Request $request)
-    {
+    public function GadaiTebusListTeller($kodcaw,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -898,8 +856,7 @@ class GadaiController extends Controller
         return response()->json($gadai);
     }
 
-    public function updateHistoryGadai($kodcaw,$norujukan,Request $request)
-    {
+    public function updateHistoryGadai($kodcaw,$norujukan,Request $request){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $updatehistory = Gadai::on($cawangan['mysql'])
@@ -1248,8 +1205,7 @@ class GadaiController extends Controller
         }
         return response()->json(number_format($upahToday,2));
     }
-    public function showAllGadaiTerkumpul()
-    {
+    public function showAllGadaiTerkumpul(){
         $cawangan_all = Cawangan::on('mysql7')->get();
         $current = Carbon::now();
         $current = new Carbon();
@@ -1352,8 +1308,6 @@ class GadaiController extends Controller
         return response()->json(number_format($jumlahPetibesi,2));
     }
 
-    
-
     public function prestasiCawangan(Request $request){
 
         if($request->tarikh == null){
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 17b277b..3d45bb8 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -33,30 +33,7 @@ class TebusController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
-
-        $upah_semasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
-
-        $transaction = Transaction::on('mysql7')
-                    ->where([['norujukan','=',$norujukan],['trans_type','=','A']])
-                    ->get();
-
-        $transaction_keuntungan = TransaksiKeuntungan::on('mysql7')
-                                ->where('norujukan','=',$norujukan)
-                                ->get();
-
-        $totalBayaranKeuntungan = 0;
-        $totalBayaran = 0;
-
-
-        foreach($transaction as $index=>$trans){
-            $totalBayaran += $trans['duit_masuk'];
-        }
-
-        foreach($transaction_keuntungan as $index=>$untung){
-            $totalBayaranKeuntungan += $untung['bayaran_keuntungan'];
-        }
-
-        $rebet = $gadai_data['upah12'] - $totalBayaranKeuntungan - $upah_semasa;
+        $rebet = $this->rebetselepastawarruq($kodcaw,$norujukan);
 
         $harga_tebus = $gadai_data['bakihargajualan'] - $rebet;
 
@@ -72,25 +49,12 @@ class TebusController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
-        if($gadai_data['tempoh'] > 6){
-            $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
-            $upah_semasa_round = number_format($upahsemasa_raw,2);
-            $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
-        }else{
-            if($gadai_data['tempoh'] == 6){
-                if($gadai_data['bakiupah'] != 0){
-                    $upah_semasa = $gadai_data['bakiupah'];
-                }else{
-                    $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
-                    $upah_semasa_round = number_format($upahsemasa_raw,2);
-                    $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
-                }
-            }else{
-                $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
-                $upah_semasa_round = number_format($upahsemasa_raw,2);
-                $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
-            }
-        }
+        $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
+
+        $upahsemasa_raw = $bilangan_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
+
+        $upah_semasa_round = number_format($upahsemasa_raw,2);
+        $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
 
         return $upah_semasa;
     }
@@ -112,11 +76,7 @@ class TebusController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
-        $upahsemasa = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
-
-        $upah_semasa_round = round($upahsemasa,2);
-
-        $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
+        $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
 
         $array_recno_marhun = $request->array_recno;
 
@@ -136,8 +96,6 @@ class TebusController extends Controller
 
         $totalhargatebus = (float)substr($total_harga_tebus_round, 0, -1);
 
-        // $total_harga_tebus += $upahsemasa;
-
         return response()->json($totalhargatebus);
     }
 
@@ -251,29 +209,13 @@ class TebusController extends Controller
         $gadai_data = Gadai::on($cawangan['mysql'])
                     ->where('norujukan','=',$norujukan)
                     ->first();
-                    
-        $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
 
-        $transaction = Transaction::on('mysql7')
-                    ->where([['norujukan','=',$norujukan],['trans_type','=','A']])
-                    ->get();
+        $bln_tebus_awl = 12 - $gadai_data['tempoh'];
 
-        $transaction_keuntungan = TransaksiKeuntungan::on('mysql7')
-                                ->where('norujukan','=',$norujukan)
-                                ->get();
+        $rebet_raw = $bln_tebus_awl * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
 
-        $totalBayaranKeuntungan = 0;
-        $totalBayaran = 0;
-
-        foreach($transaction as $index=>$trans){
-            $totalBayaran += $trans['duit_masuk'];
-        }
-
-        foreach($transaction_keuntungan as $index=>$untung){
-            $totalBayaranKeuntungan += $untung['bayaran_keuntungan'];
-        }
-
-        $rebet = $gadai_data['upah12'] - $totalBayaranKeuntungan - $upahsemasa;
+        $rebet_round = number_format($upahsemasa_raw,2);
+        $rebet = (float)substr($rebet_round, 0, -1);
 
         return $rebet;
     }
@@ -347,8 +289,7 @@ class TebusController extends Controller
             'norujukan' => $norujukan,
             'bayaran_keuntungan' => $request->bakiupah,
             'tarikh_bayaran'=> $current,
-            'kodcaw'=> $kodcaw,
-            'keuntungan_sebenar'=>$request->bakiupah
+            'kodcaw'=> $kodcaw
         ]);
 
         
diff --git a/app/TransaksiKeuntungan.php b/app/TransaksiKeuntungan.php
index 963fd6b..57bbca1 100644
--- a/app/TransaksiKeuntungan.php
+++ b/app/TransaksiKeuntungan.php
@@ -14,7 +14,7 @@ class TransaksiKeuntungan extends Model
      * @var array
      */
     protected $fillable = [
-      'norujukan','bayaran_keuntungan','tarikh_bayaran','kodcaw','keuntungan_sebenar'
+      'norujukan','bayaran_keuntungan','tarikh_bayaran','kodcaw','bayaran_pembiayaan'
     ];
 
     /**

From 946ccabb57fcf883595ba423a0795e80d8b30488 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 7 Apr 2021 16:57:28 +0800
Subject: [PATCH 03/60] fix skit imbang duga

---
 app/Http/Controllers/GadaiController.php | 24 ++++++++++++++----------
 routes/web.php                           |  2 ++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index dea0e97..be631bc 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1986,28 +1986,32 @@ class GadaiController extends Controller
             ->sum('pinjaman');
 
         
-        if($request->tarikh <= '2021-02-25')
-        {
             $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
             ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
             ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
-        }
-        else{
-            $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
-            ->where('tagpalsu','=',0)
-            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
-            ->sum('pinjaman');
-        }
 
         $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
 
         return response()->json($array_rekodemas);
     }
 
+    public function CalculationPembiayaanTawarruq($kodcaw,Request $request)
+    {
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
+        ->where('tagpalsu','=',0)
+        ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+        ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
+        ->sum('pinjaman');
+
+        return response()->json($rekod_pinjamandiberi);
+    }
+
     public function CalculationKeuntungan($kodcaw,Request $request)
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
diff --git a/routes/web.php b/routes/web.php
index 9bfedaa..cf672b0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -327,6 +327,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //-- Harta Semasa --//
     $router->get('PinjamanDiberi/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi
+    $router->get('PembiayaanDiberiTawarruq/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruq']); //pembiayaan tawarruq
+
     $router->get('TunaiDiTangan/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan
     $router->get('PenghutangKakitangan/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan
 

From 14ed5c6470e1824a310711a605cb6bbb7f89d43e Mon Sep 17 00:00:00 2001
From: Afiq Zakwan Hamdan <afiqzakwanhamdan@gmail.com>
Date: Thu, 8 Apr 2021 11:11:43 +0800
Subject: [PATCH 04/60] fix keuntungan

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

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 2dc1dd1..9825010 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -264,7 +264,7 @@ class GadaiController extends Controller
 
         $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
 
-        $upahsemasa_raw = $bilangan_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
+        $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
 
         $upah_semasa_round = number_format($upahsemasa_raw,2);
         $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 3d45bb8..2ff8b52 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -51,7 +51,7 @@ class TebusController extends Controller
 
         $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
 
-        $upahsemasa_raw = $bilangan_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
+        $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
 
         $upah_semasa_round = number_format($upahsemasa_raw,2);
         $upah_semasa = (float)substr($upah_semasa_round, 0, -1);

From 076885f205e032e5d70966187c177c49c91cba5b Mon Sep 17 00:00:00 2001
From: Afiq Zakwan Hamdan <afiqzakwanhamdan@gmail.com>
Date: Thu, 8 Apr 2021 11:31:37 +0800
Subject: [PATCH 05/60] fix bayaran

---
 app/Http/Controllers/GadaiController.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 9825010..3624a9b 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -318,7 +318,6 @@ class GadaiController extends Controller
 
         $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
             'bakipjm' => $baki_pinjaman,
-            'bakiupah' => $baki_upah,
             'jbg' => 0,
             't_update' => $current->toDateString(),
             'bakihargajualan' => $baki_hargajualan
@@ -372,7 +371,6 @@ class GadaiController extends Controller
 
         $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
             'bakipjm' => $baki_pinjaman,
-            'bakiupah' => $baki_upah,
             'jbg' => 0,
             't_update' => $current->toDateString(),
             'bakihargajualan' => $baki_hargajualan,

From 02aadaec8ffe46dec4523857be2ed76bf06281a5 Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Sat, 10 Apr 2021 17:04:07 +0800
Subject: [PATCH 06/60] fix api

---
 app/Http/Controllers/GadaiController.php | 30 ++++++++++++++++++++++--
 app/Http/Controllers/TebusController.php |  7 ++++++
 app/Http/Controllers/VaultController.php | 24 +++++++++++++++----
 routes/web.php                           |  5 ++++
 4 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 69dd843..a8f2163 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1937,6 +1937,10 @@ class GadaiController extends Controller
             // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
+            if($request->tarikh > '2021-02-25')
+            {
+                $request->tarikh = '2021-02-25';
+            }
         
             $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
@@ -1955,11 +1959,13 @@ class GadaiController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
+        if($request->tarikh > '2021-02-25'){
         $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
         ->where('tagpalsu','=',0)
-        ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-        ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
+        ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-02-25'],['sttebus','=','']])
+        // ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
         ->sum('pinjaman');
+        }
 
         return response()->json($rekod_pinjamandiberi);
     }
@@ -1976,7 +1982,27 @@ class GadaiController extends Controller
         ->whereNotNull('upah12')
         ->sum('upah12');
 
+        // $keuntungandibayar = 
+
         return response()->json($keuntungan,200);
     }
 
+    public function CalculationBayaranPendahuluan($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $datetawarruq = new Carbon('2021-02-25');
+        $daterequest = new Carbon($request->tarikh);
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $transaksi = TransaksiKeuntungan::on('mysql7')
+                    ->where('tarikh_bayaran' ,'>=', $datetawarruq)
+                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->sum('bayaran_pembiayaan');
+
+        return response($transaksi);
+    }
+
 }
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 2ff8b52..aff7ca3 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -76,6 +76,8 @@ class TebusController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
+        // $totalnmhargasemasa = $request->tnmhargasemasa;
+
         $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
 
         $array_recno_marhun = $request->array_recno;
@@ -632,4 +634,9 @@ class TebusController extends Controller
         return response()->json($penghutangkaki,200);
     }
 
+    public function untungrugicalculation($kodcaw,Request $request)
+    {
+
+    }
+
 }
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index ee936a6..bb6392c 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -243,15 +243,31 @@ class VaultController extends Controller
    public function TunaiDiTangan($kodcaw,Request $request)
    {
      $current = Carbon::now();
-     $current = new Carbon();    
+     $current = new Carbon();   
+     
+     $totalbakiakhirtunai = 0;
   
       $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
       $vault=Vault::on($cawangan['mysql'])
               ->where('kodcaw','=',$kodcaw)
-              ->where('tarikh','=', $request->tarikh)
+              ->where('tarikh','<=', $request->tarikh)
               ->orderby('tarikh','desc')->first();
-  
-      return response()->json($vault);
+
+      $tunai = Tunai::on($cawangan['mysql'])
+               ->where('kodcaw','=',$kodcaw)
+               ->where('tarikh','<=', $request->tarikh)
+               ->orderby('tarikh','desc')->first();
+
+
+      if($tunai['baki'] != 0)
+      {
+         $totalbakiakhirtunai = $vault['bakiakhir'] + $tunai['baki'];
+      }else
+      {
+         $totalbakiakhirtunai = $vault['bakiakhir'];
+      }
+   
+      return response()->json($totalbakiakhirtunai);
    }
 
 
diff --git a/routes/web.php b/routes/web.php
index cf672b0..ac66731 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -328,6 +328,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //-- Harta Semasa --//
     $router->get('PinjamanDiberi/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi
     $router->get('PembiayaanDiberiTawarruq/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruq']); //pembiayaan tawarruq
+    $router->get('BayaranPendahuluan/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluan']); //pembiayaan tawarruq
 
     $router->get('TunaiDiTangan/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan
     $router->get('PenghutangKakitangan/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan
@@ -340,6 +341,10 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('KeuntunganSebenar/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenar']); //Keuntungan Sebenar
     $router->get('UntungRugiTerkumpul/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun
     $router->get('cajperkhidmatanterkumpul/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun
+
+    //-- Untung Rugi --//
+    $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar
+    
     
     //END IMBANG DUGA//
 

From 3b96ab7ef37e0e327892b93464990302d5991d5f Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Sun, 11 Apr 2021 07:35:36 +0800
Subject: [PATCH 07/60] fix skit2

---
 app/Http/Controllers/GadaiController.php | 20 +++++++++++++++----
 app/Http/Controllers/TebusController.php | 25 ++++++++++++++++++++++++
 routes/web.php                           |  1 +
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index a8f2163..dc1f026 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1974,17 +1974,26 @@ class GadaiController extends Controller
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
+        $datetawarruq = new Carbon('2021-02-25');
+        $daterequest = new Carbon($request->tarikh);
+        $daterequest->addDays(1);
+
         $keuntungan = Gadai::on($cawangan['mysql'])
         ->where('t_gadai','<=',$request->tarikh)
         ->where('t_gadai','>=','2021-03-14')
-        ->where('sttebus','=','')
+        // ->where('sttebus','=','')
         ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-03-14']])
         ->whereNotNull('upah12')
         ->sum('upah12');
 
-        // $keuntungandibayar = 
+        $transaksi = TransaksiKeuntungan::on('mysql7')
+        ->where('tarikh_bayaran' ,'>=', $datetawarruq)
+        ->where('tarikh_bayaran' ,'<=', $daterequest)
+        ->sum('bayaran_keuntungan');
 
-        return response()->json($keuntungan,200);
+        $totalkeuntungan = $keuntungan - $transaksi;
+
+        return response()->json($totalkeuntungan,200);
     }
 
     public function CalculationBayaranPendahuluan($kodcaw,Request $request)
@@ -1993,13 +2002,16 @@ class GadaiController extends Controller
 
         $datetawarruq = new Carbon('2021-02-25');
         $daterequest = new Carbon($request->tarikh);
+        $daterequest->addDays(1);
 
         $current = Carbon::now();
         $current = new Carbon();
 
         $transaksi = TransaksiKeuntungan::on('mysql7')
+                    ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->where('db2.sttebus','=','')
                     ->where('tarikh_bayaran' ,'>=', $datetawarruq)
-                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->where('tarikh_bayaran' ,'<=', $daterequest)
                     ->sum('bayaran_pembiayaan');
 
         return response($transaksi);
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index aff7ca3..a99bdc7 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -636,7 +636,32 @@ class TebusController extends Controller
 
     public function untungrugicalculation($kodcaw,Request $request)
     {
+        $datetawarruq = new Carbon('2021-02-25');
+        $daterequest = new Carbon($request->tarikh);
+        $daterequest->addDays(1);
 
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $keuntungan = TransaksiKeuntungan::on('mysql7')
+                    ->where('tarikh_bayaran' ,'>=', $datetawarruq)
+                    ->where('tarikh_bayaran' ,'<=', $daterequest)
+                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->sum('bayaran_keuntungan');
+
+        return response($keuntungan);
+    }
+
+    public function RebetCalculation($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $rebet = Tebus::on($cawangan['mysql'])
+                ->where('t_tebus','>','2021-02-25')
+                ->where('t_tebus','<=',$request->tarikh)
+                ->sum('rebate');
+
+        return response($rebet);
     }
 
 }
diff --git a/routes/web.php b/routes/web.php
index ac66731..bf08d0a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -324,6 +324,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //Dua-Dua Table
     $router->get('CalculationPendahuluanSerahan/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahan']); //pendahuluan dan serahan
     $router->get('KeuntunganArRahn/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntungan']); //Penghutang Ar-Rahn dan Keuntungan Terakru
+    $router->get('RebetCalculation/{kodcaw}',['uses'=>'TebusController@RebetCalculation']); //Penghutang Ar-Rahn dan Keuntungan Terakru
 
     //-- Harta Semasa --//
     $router->get('PinjamanDiberi/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi

From 40cf314d4592a0934f98de78e5f3755a22b68354 Mon Sep 17 00:00:00 2001
From: Afiq Zakwan Hamdan <afiqzakwanhamdan@gmail.com>
Date: Sun, 11 Apr 2021 10:21:38 +0800
Subject: [PATCH 08/60] fix rebet

---
 app/Http/Controllers/TebusController.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 2ff8b52..7dba3c8 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -214,7 +214,10 @@ class TebusController extends Controller
 
         $rebet_raw = $bln_tebus_awl * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
 
-        $rebet_round = number_format($upahsemasa_raw,2);
+        $rebet_round = number_format($rebet_raw,2);
+        if(strpos($rebet_round,',')){
+            $rebet_round = str_replace(',','',$rebet_round);
+        }
         $rebet = (float)substr($rebet_round, 0, -1);
 
         return $rebet;

From 73d7587ce4e0812d1aa1628d2d0ec99809f79e86 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Sun, 11 Apr 2021 17:36:00 +0800
Subject: [PATCH 09/60] fix skit2

---
 .DS_Store                                |  Bin 8196 -> 8196 bytes
 app/Http/Controllers/TebusController.php |   23 +-
 composer.lock                            | 2440 +++++++++++++++-------
 config/database.php                      |   28 +-
 4 files changed, 1684 insertions(+), 807 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index dc4cb3dedf3afcabaa5fbd569b28a279aed5d653..082406abdaf869781baf6f0e0181883d3fcdad6d 100644
GIT binary patch
delta 32
mcmZp1XmOa}&nUPtU^hRb;AS3y9M+9x{Y;zLB?^Iz9wq>+KnhF%

delta 94
zcmZp1XmOa}&nUDpU^hRb&}JTi99CI2hBAg!hCGH8hJ1!1&z$_^q@4UD1_lNJ1_s8@
Sn=?g=m^QOZ6cSdK&jbL2q!-=*

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 56f9511..b97ceb5 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -17,6 +17,7 @@ use App\Lelong;
 use App\HapusKira;
 use App\Parameter;
 use App\Panjar;
+use App\HargaEmas;
 
 use Illuminate\Http\Request;
 
@@ -76,13 +77,12 @@ class TebusController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
-        // $totalnmhargasemasa = $request->tnmhargasemasa;
-
         $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
 
         $array_recno_marhun = $request->array_recno;
 
         $margin_pembiayaan = round(($gadai_data['bakipjm']/$gadai_data['nilaimarhun'])*100,2);
+        // $margin_pembiayaan = round(($gadai_data['bakipjm']/$request->hargasemasa)*100,2);
 
         $nilai_marhun = $gadai_data['nilaimarhun'];
         $total_harga_tebus = 0;
@@ -217,11 +217,13 @@ class TebusController extends Controller
         $rebet_raw = $bln_tebus_awl * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
 
         $rebet_round = number_format($rebet_raw,2);
+
         if(strpos($rebet_round,',')){
             $rebet_round = str_replace(',','',$rebet_round);
         }
-        $rebet = (float)substr($rebet_round, 0, -1);
 
+        $rebet = (float)substr($rebet_round, 0, -1);
+        
         return $rebet;
     }
 
@@ -496,12 +498,12 @@ class TebusController extends Controller
         $keuntungansebelumtawarruq = 0;
 
 
-        $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
-            ->where('t_tebus','<=',$request->tarikh)
-            ->where('t_tebus','>=','2021-03-14')
-            ->whereYear('t_tebus','=',$current->year)
-            ->whereNotNull('rebate')
-            ->sum('rebate');
+        // $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
+        //     ->where('t_tebus','<=',$request->tarikh)
+        //     ->where('t_tebus','>=','2021-03-14')
+        //     ->whereYear('t_tebus','=',$current->year)
+        //     ->whereNotNull('rebate')
+        //     ->sum('rebate');
 
         $keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
             ->where('t_tebus','<=',$request->tarikh)
@@ -528,7 +530,8 @@ class TebusController extends Controller
 
         $keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
 
-        $keuntunganselepastawarruq = $keuntunganselepastawarruqrebate + $keuntunganselepastawarruqupah; 
+        $keuntunganselepastawarruq = $keuntunganselepastawarruqupah; 
+
 
         $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
 
diff --git a/composer.lock b/composer.lock
index 26e5ef7..e8abc6c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,31 +8,35 @@
     "packages": [
         {
             "name": "auth0/auth0-php",
-            "version": "7.4.0",
+            "version": "7.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/auth0/auth0-PHP.git",
-                "reference": "ccead4f3eab36703b905eee49e9e61a282cb7694"
+                "reference": "1335f7dee53c7afb8614049c05518e6b8d30eb84"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/auth0/auth0-PHP/zipball/ccead4f3eab36703b905eee49e9e61a282cb7694",
-                "reference": "ccead4f3eab36703b905eee49e9e61a282cb7694",
+                "url": "https://api.github.com/repos/auth0/auth0-PHP/zipball/1335f7dee53c7afb8614049c05518e6b8d30eb84",
+                "reference": "1335f7dee53c7afb8614049c05518e6b8d30eb84",
                 "shasum": ""
             },
             "require": {
+                "auth0/php-jwt": "3.3.4",
                 "ext-json": "*",
-                "guzzlehttp/guzzle": "~6.0 | ~7.0",
-                "lcobucci/jwt": "^3.3",
-                "php": "^7.1",
+                "ext-openssl": "*",
+                "guzzlehttp/guzzle": "^7.2",
+                "php": "^7.3 | ^8.0",
                 "psr/simple-cache": "^1.0"
             },
             "require-dev": {
-                "cache/array-adapter": "^1.0",
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
-                "josegonzalez/dotenv": "^2.0",
+                "cache/adapter-common": "^1.2",
+                "cache/array-adapter": "^1.1",
+                "cache/hierarchical-cache": "^1.1",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
+                "josegonzalez/dotenv": "^3.2",
                 "phpcompatibility/php-compatibility": "^8.1",
-                "phpunit/phpunit": "^7.0",
+                "phpstan/phpstan": "^0.12.64",
+                "phpunit/phpunit": "^9.3",
                 "squizlabs/php_codesniffer": "^3.2"
             },
             "type": "library",
@@ -54,30 +58,102 @@
             ],
             "description": "Auth0 PHP SDK.",
             "homepage": "https://github.com/auth0/auth0-PHP",
-            "time": "2020-09-28T14:41:29+00:00"
+            "support": {
+                "issues": "https://github.com/auth0/auth0-PHP/issues",
+                "source": "https://github.com/auth0/auth0-PHP/tree/7.7.0"
+            },
+            "time": "2021-03-19T20:04:00+00:00"
         },
         {
-            "name": "brick/math",
-            "version": "0.9.1",
+            "name": "auth0/php-jwt",
+            "version": "3.3.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/brick/math.git",
-                "reference": "283a40c901101e66de7061bd359252c013dcc43c"
+                "url": "https://github.com/auth0/php-jwt.git",
+                "reference": "a0daa1a728cf85230843ebb8c1183047fe493284"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/283a40c901101e66de7061bd359252c013dcc43c",
-                "reference": "283a40c901101e66de7061bd359252c013dcc43c",
+                "url": "https://api.github.com/repos/auth0/php-jwt/zipball/a0daa1a728cf85230843ebb8c1183047fe493284",
+                "reference": "a0daa1a728cf85230843ebb8c1183047fe493284",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "ext-openssl": "*",
+                "php": "^5.6 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "mikey179/vfsstream": "~1.5",
+                "phpmd/phpmd": "~2.2",
+                "phpunit/php-invoker": "~1.1",
+                "phpunit/phpunit": "^5.7 || ^7.3",
+                "squizlabs/php_codesniffer": "~2.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Lcobucci\\JWT\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Luís Otávio Cobucci Oblonczyk",
+                    "email": "lcobucci@gmail.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A simple library to work with JSON Web Token and JSON Web Signature",
+            "keywords": [
+                "JWS",
+                "jwt"
+            ],
+            "support": {
+                "source": "https://github.com/auth0/php-jwt/tree/3.3.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/lcobucci",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/lcobucci",
+                    "type": "patreon"
+                }
+            ],
+            "time": "2021-01-04T20:39:06+00:00"
+        },
+        {
+            "name": "brick/math",
+            "version": "0.9.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/brick/math.git",
+                "reference": "dff976c2f3487d42c1db75a3b180e2b9f0e72ce0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/brick/math/zipball/dff976c2f3487d42c1db75a3b180e2b9f0e72ce0",
+                "reference": "dff976c2f3487d42c1db75a3b180e2b9f0e72ce0",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "php": "^7.1|^8.0"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.2",
-                "phpunit/phpunit": "^7.5.15|^8.5",
-                "vimeo/psalm": "^3.5"
+                "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.0",
+                "vimeo/psalm": "4.3.2"
             },
             "type": "library",
             "autoload": {
@@ -100,7 +176,17 @@
                 "brick",
                 "math"
             ],
-            "time": "2020-08-18T23:57:15+00:00"
+            "support": {
+                "issues": "https://github.com/brick/math/issues",
+                "source": "https://github.com/brick/math/tree/0.9.2"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/brick/math",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-20T22:51:39+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -177,6 +263,24 @@
                 "uppercase",
                 "words"
             ],
+            "support": {
+                "issues": "https://github.com/doctrine/inflector/issues",
+                "source": "https://github.com/doctrine/inflector/tree/2.0.x"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-29T15:13:26+00:00"
         },
         {
@@ -239,6 +343,24 @@
                 "parser",
                 "php"
             ],
+            "support": {
+                "issues": "https://github.com/doctrine/lexer/issues",
+                "source": "https://github.com/doctrine/lexer/tree/1.2.1"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-25T17:44:05+00:00"
         },
         {
@@ -293,20 +415,30 @@
                 "cron",
                 "schedule"
             ],
+            "support": {
+                "issues": "https://github.com/dragonmantank/cron-expression/issues",
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v2.3.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/dragonmantank",
+                    "type": "github"
+                }
+            ],
             "time": "2020-10-13T00:52:37+00:00"
         },
         {
             "name": "egulias/email-validator",
-            "version": "2.1.22",
+            "version": "2.1.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5"
+                "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5",
-                "reference": "68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4",
+                "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4",
                 "shasum": ""
             },
             "require": {
@@ -351,26 +483,36 @@
                 "validation",
                 "validator"
             ],
-            "time": "2020-09-26T15:48:38+00:00"
+            "support": {
+                "issues": "https://github.com/egulias/EmailValidator/issues",
+                "source": "https://github.com/egulias/EmailValidator/tree/2.1.25"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/egulias",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-12-29T14:50:06+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.2.0",
+            "version": "7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "0aa74dfb41ae110835923ef10a9d803a22d50e79"
+                "reference": "7008573787b430c1c1f650e3722d9bba59967628"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0aa74dfb41ae110835923ef10a9d803a22d50e79",
-                "reference": "0aa74dfb41ae110835923ef10a9d803a22d50e79",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7008573787b430c1c1f650e3722d9bba59967628",
+                "reference": "7008573787b430c1c1f650e3722d9bba59967628",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "guzzlehttp/promises": "^1.4",
-                "guzzlehttp/psr7": "^1.7",
+                "guzzlehttp/psr7": "^1.7 || ^2.0",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0"
             },
@@ -378,6 +520,7 @@
                 "psr/http-client-implementation": "1.0"
             },
             "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4.1",
                 "ext-curl": "*",
                 "php-http/client-integration-tests": "^3.0",
                 "phpunit/phpunit": "^8.5.5 || ^9.3.5",
@@ -391,7 +534,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "7.1-dev"
+                    "dev-master": "7.3-dev"
                 }
             },
             "autoload": {
@@ -431,20 +574,42 @@
                 "rest",
                 "web service"
             ],
-            "time": "2020-10-10T11:47:56+00:00"
+            "support": {
+                "issues": "https://github.com/guzzle/guzzle/issues",
+                "source": "https://github.com/guzzle/guzzle/tree/7.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/alexeyshockov",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/gmponos",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-03-23T11:33:13+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.4.0",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "60d379c243457e073cff02bc323a2a86cb355631"
+                "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/60d379c243457e073cff02bc323a2a86cb355631",
-                "reference": "60d379c243457e073cff02bc323a2a86cb355631",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d",
+                "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d",
                 "shasum": ""
             },
             "require": {
@@ -482,20 +647,24 @@
             "keywords": [
                 "promise"
             ],
-            "time": "2020-09-30T07:37:28+00:00"
+            "support": {
+                "issues": "https://github.com/guzzle/promises/issues",
+                "source": "https://github.com/guzzle/promises/tree/1.4.1"
+            },
+            "time": "2021-03-07T09:25:29+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.7.0",
+            "version": "1.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3"
+                "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3",
-                "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1",
+                "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1",
                 "shasum": ""
             },
             "require": {
@@ -553,20 +722,24 @@
                 "uri",
                 "url"
             ],
-            "time": "2020-09-30T07:37:11+00:00"
+            "support": {
+                "issues": "https://github.com/guzzle/psr7/issues",
+                "source": "https://github.com/guzzle/psr7/tree/1.8.1"
+            },
+            "time": "2021-03-21T16:25:00+00:00"
         },
         {
             "name": "illuminate/auth",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/auth.git",
-                "reference": "2e247aa56c7b5516fe1ea759b4f58b0bf765c71c"
+                "reference": "d523b7b96cd1afc55d24afba8fc3176e84eb8154"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/auth/zipball/2e247aa56c7b5516fe1ea759b4f58b0bf765c71c",
-                "reference": "2e247aa56c7b5516fe1ea759b4f58b0bf765c71c",
+                "url": "https://api.github.com/repos/illuminate/auth/zipball/d523b7b96cd1afc55d24afba8fc3176e84eb8154",
+                "reference": "d523b7b96cd1afc55d24afba8fc3176e84eb8154",
                 "shasum": ""
             },
             "require": {
@@ -574,7 +747,7 @@
                 "illuminate/http": "^7.0",
                 "illuminate/queue": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5"
+                "php": "^7.2.5|^8.0"
             },
             "suggest": {
                 "illuminate/console": "Required to use the auth:clear-resets command (^7.0).",
@@ -604,20 +777,24 @@
             ],
             "description": "The Illuminate Auth package.",
             "homepage": "https://laravel.com",
-            "time": "2020-08-24T13:15:53+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-27T15:11:37+00:00"
         },
         {
             "name": "illuminate/broadcasting",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/broadcasting.git",
-                "reference": "3c9ccfb377d49aed72bb30aaa6297c12530d633f"
+                "reference": "b30bf4ff2b020a98aca537877a68fabecfa3a8ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/broadcasting/zipball/3c9ccfb377d49aed72bb30aaa6297c12530d633f",
-                "reference": "3c9ccfb377d49aed72bb30aaa6297c12530d633f",
+                "url": "https://api.github.com/repos/illuminate/broadcasting/zipball/b30bf4ff2b020a98aca537877a68fabecfa3a8ab",
+                "reference": "b30bf4ff2b020a98aca537877a68fabecfa3a8ab",
                 "shasum": ""
             },
             "require": {
@@ -626,7 +803,7 @@
                 "illuminate/contracts": "^7.0",
                 "illuminate/queue": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5",
+                "php": "^7.2.5|^8.0",
                 "psr/log": "^1.0"
             },
             "suggest": {
@@ -655,27 +832,31 @@
             ],
             "description": "The Illuminate Broadcasting package.",
             "homepage": "https://laravel.com",
-            "time": "2020-09-22T13:39:22+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-11-21T14:36:22+00:00"
         },
         {
             "name": "illuminate/bus",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/bus.git",
-                "reference": "4efd9511ee3c548f05d251033f861ecc3e8ad20f"
+                "reference": "78d8013a700eef9fbece09094d422d73fa9a493a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/bus/zipball/4efd9511ee3c548f05d251033f861ecc3e8ad20f",
-                "reference": "4efd9511ee3c548f05d251033f861ecc3e8ad20f",
+                "url": "https://api.github.com/repos/illuminate/bus/zipball/78d8013a700eef9fbece09094d422d73fa9a493a",
+                "reference": "78d8013a700eef9fbece09094d422d73fa9a493a",
                 "shasum": ""
             },
             "require": {
                 "illuminate/contracts": "^7.0",
                 "illuminate/pipeline": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5"
+                "php": "^7.2.5|^8.0"
             },
             "suggest": {
                 "illuminate/queue": "Required to use closures when chaining jobs (^7.0)."
@@ -703,26 +884,30 @@
             ],
             "description": "The Illuminate Bus package.",
             "homepage": "https://laravel.com",
-            "time": "2020-08-24T13:15:53+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-27T15:11:37+00:00"
         },
         {
             "name": "illuminate/cache",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/cache.git",
-                "reference": "520dcec6001d6dee19efa5b6edb06f95772d7bbc"
+                "reference": "f9155c4827600ea3e0743eb03402f8048c04455c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/cache/zipball/520dcec6001d6dee19efa5b6edb06f95772d7bbc",
-                "reference": "520dcec6001d6dee19efa5b6edb06f95772d7bbc",
+                "url": "https://api.github.com/repos/illuminate/cache/zipball/f9155c4827600ea3e0743eb03402f8048c04455c",
+                "reference": "f9155c4827600ea3e0743eb03402f8048c04455c",
                 "shasum": ""
             },
             "require": {
                 "illuminate/contracts": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5"
+                "php": "^7.2.5|^8.0"
             },
             "suggest": {
                 "ext-memcached": "Required to use the memcache cache driver.",
@@ -754,26 +939,30 @@
             ],
             "description": "The Illuminate Cache package.",
             "homepage": "https://laravel.com",
-            "time": "2020-09-10T19:33:05+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-27T15:11:37+00:00"
         },
         {
             "name": "illuminate/config",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/config.git",
-                "reference": "0084b12f82e8031d36a55ad28295e65c39420047"
+                "reference": "9d908793eceb04a8c8f74cfc6af3429ce140d2e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/config/zipball/0084b12f82e8031d36a55ad28295e65c39420047",
-                "reference": "0084b12f82e8031d36a55ad28295e65c39420047",
+                "url": "https://api.github.com/repos/illuminate/config/zipball/9d908793eceb04a8c8f74cfc6af3429ce140d2e2",
+                "reference": "9d908793eceb04a8c8f74cfc6af3429ce140d2e2",
                 "shasum": ""
             },
             "require": {
                 "illuminate/contracts": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5"
+                "php": "^7.2.5|^8.0"
             },
             "type": "library",
             "extra": {
@@ -798,32 +987,36 @@
             ],
             "description": "The Illuminate Config package.",
             "homepage": "https://laravel.com",
-            "time": "2020-08-24T13:15:53+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-27T15:11:37+00:00"
         },
         {
             "name": "illuminate/console",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/console.git",
-                "reference": "6f0788320dc7358b032bae5c07697a6e0b3b5898"
+                "reference": "7dd038f1729af6390654f065c3ada5dc275fb01a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/console/zipball/6f0788320dc7358b032bae5c07697a6e0b3b5898",
-                "reference": "6f0788320dc7358b032bae5c07697a6e0b3b5898",
+                "url": "https://api.github.com/repos/illuminate/console/zipball/7dd038f1729af6390654f065c3ada5dc275fb01a",
+                "reference": "7dd038f1729af6390654f065c3ada5dc275fb01a",
                 "shasum": ""
             },
             "require": {
                 "illuminate/contracts": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5",
+                "php": "^7.2.5|^8.0",
                 "symfony/console": "^5.0",
                 "symfony/process": "^5.0"
             },
             "suggest": {
-                "dragonmantank/cron-expression": "Required to use scheduler (^2.0).",
-                "guzzlehttp/guzzle": "Required to use the ping methods on schedules (^6.3.1|^7.0).",
+                "dragonmantank/cron-expression": "Required to use scheduler (^2.3.1).",
+                "guzzlehttp/guzzle": "Required to use the ping methods on schedules (^6.3.1|^7.0.1).",
                 "illuminate/bus": "Required to use the scheduled job dispatcher (^7.0).",
                 "illuminate/container": "Required to use the scheduler (^7.0).",
                 "illuminate/filesystem": "Required to use the generator command (^7.0).",
@@ -852,25 +1045,29 @@
             ],
             "description": "The Illuminate Console package.",
             "homepage": "https://laravel.com",
-            "time": "2020-08-31T13:37:25+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-27T19:51:21+00:00"
         },
         {
             "name": "illuminate/container",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/container.git",
-                "reference": "c0d892450f12ed22e4d8f7bec647230d0be8405b"
+                "reference": "cf94ed8fbaeb26906bb42b24377dbb061b97a096"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/container/zipball/c0d892450f12ed22e4d8f7bec647230d0be8405b",
-                "reference": "c0d892450f12ed22e4d8f7bec647230d0be8405b",
+                "url": "https://api.github.com/repos/illuminate/container/zipball/cf94ed8fbaeb26906bb42b24377dbb061b97a096",
+                "reference": "cf94ed8fbaeb26906bb42b24377dbb061b97a096",
                 "shasum": ""
             },
             "require": {
                 "illuminate/contracts": "^7.0",
-                "php": "^7.2.5",
+                "php": "^7.2.5|^8.0",
                 "psr/container": "^1.0"
             },
             "provide": {
@@ -899,24 +1096,28 @@
             ],
             "description": "The Illuminate Container package.",
             "homepage": "https://laravel.com",
-            "time": "2020-08-13T14:33:41+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-27T16:17:28+00:00"
         },
         {
             "name": "illuminate/contracts",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/contracts.git",
-                "reference": "cd12d3c23a3dbbb7b43e68b4105f68ad68d0c3cc"
+                "reference": "7d964384f0283bd7525ae7b5baa7ad32e5503b8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/contracts/zipball/cd12d3c23a3dbbb7b43e68b4105f68ad68d0c3cc",
-                "reference": "cd12d3c23a3dbbb7b43e68b4105f68ad68d0c3cc",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/7d964384f0283bd7525ae7b5baa7ad32e5503b8e",
+                "reference": "7d964384f0283bd7525ae7b5baa7ad32e5503b8e",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": "^7.2.5|^8.0",
                 "psr/container": "^1.0",
                 "psr/simple-cache": "^1.0"
             },
@@ -943,20 +1144,24 @@
             ],
             "description": "The Illuminate Contracts package.",
             "homepage": "https://laravel.com",
-            "time": "2020-09-07T02:45:15+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-12-18T14:19:44+00:00"
         },
         {
             "name": "illuminate/database",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/database.git",
-                "reference": "0e685f2243ffe2ee344fc361c840eaaa159b414a"
+                "reference": "c7a35698106b1ed6b50f7fd4c30ec8e9fc900e41"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/database/zipball/0e685f2243ffe2ee344fc361c840eaaa159b414a",
-                "reference": "0e685f2243ffe2ee344fc361c840eaaa159b414a",
+                "url": "https://api.github.com/repos/illuminate/database/zipball/c7a35698106b1ed6b50f7fd4c30ec8e9fc900e41",
+                "reference": "c7a35698106b1ed6b50f7fd4c30ec8e9fc900e41",
                 "shasum": ""
             },
             "require": {
@@ -964,12 +1169,12 @@
                 "illuminate/container": "^7.0",
                 "illuminate/contracts": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5",
+                "php": "^7.2.5|^8.0",
                 "symfony/console": "^5.0"
             },
             "suggest": {
                 "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
-                "fzaninotto/faker": "Required to use the eloquent factory builder (^1.9.1).",
+                "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
                 "illuminate/console": "Required to use the database commands (^7.0).",
                 "illuminate/events": "Required to use the observers with Eloquent (^7.0).",
                 "illuminate/filesystem": "Required to use the migrations (^7.0).",
@@ -1005,20 +1210,24 @@
                 "orm",
                 "sql"
             ],
-            "time": "2020-09-29T14:36:41+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2021-01-21T14:08:35+00:00"
         },
         {
             "name": "illuminate/encryption",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/encryption.git",
-                "reference": "8fcf466815a8b00b1419dc5e0c798cd07f443329"
+                "reference": "2b58e3a5175003f8a2272691a8b5c6c8e059c97d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/encryption/zipball/8fcf466815a8b00b1419dc5e0c798cd07f443329",
-                "reference": "8fcf466815a8b00b1419dc5e0c798cd07f443329",
+                "url": "https://api.github.com/repos/illuminate/encryption/zipball/2b58e3a5175003f8a2272691a8b5c6c8e059c97d",
+                "reference": "2b58e3a5175003f8a2272691a8b5c6c8e059c97d",
                 "shasum": ""
             },
             "require": {
@@ -1027,7 +1236,7 @@
                 "ext-openssl": "*",
                 "illuminate/contracts": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5"
+                "php": "^7.2.5|^8.0"
             },
             "type": "library",
             "extra": {
@@ -1052,27 +1261,31 @@
             ],
             "description": "The Illuminate Encryption package.",
             "homepage": "https://laravel.com",
-            "time": "2020-08-24T13:15:53+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-27T15:11:37+00:00"
         },
         {
             "name": "illuminate/events",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/events.git",
-                "reference": "cd6170a6ef48d284a66429a786ce45575abc9c6b"
+                "reference": "6f64db49dbfd490c6e30c983964543a054882faf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/events/zipball/cd6170a6ef48d284a66429a786ce45575abc9c6b",
-                "reference": "cd6170a6ef48d284a66429a786ce45575abc9c6b",
+                "url": "https://api.github.com/repos/illuminate/events/zipball/6f64db49dbfd490c6e30c983964543a054882faf",
+                "reference": "6f64db49dbfd490c6e30c983964543a054882faf",
                 "shasum": ""
             },
             "require": {
                 "illuminate/container": "^7.0",
                 "illuminate/contracts": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5"
+                "php": "^7.2.5|^8.0"
             },
             "type": "library",
             "extra": {
@@ -1097,32 +1310,36 @@
             ],
             "description": "The Illuminate Events package.",
             "homepage": "https://laravel.com",
-            "time": "2020-08-24T13:15:53+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-27T15:11:37+00:00"
         },
         {
             "name": "illuminate/filesystem",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/filesystem.git",
-                "reference": "393756aab086f643fc4e7ee2639bf792b754e767"
+                "reference": "2013f94a3a7dff008be54884774548e3c222c3e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/393756aab086f643fc4e7ee2639bf792b754e767",
-                "reference": "393756aab086f643fc4e7ee2639bf792b754e767",
+                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/2013f94a3a7dff008be54884774548e3c222c3e8",
+                "reference": "2013f94a3a7dff008be54884774548e3c222c3e8",
                 "shasum": ""
             },
             "require": {
                 "illuminate/contracts": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5",
+                "php": "^7.2.5|^8.0",
                 "symfony/finder": "^5.0"
             },
             "suggest": {
                 "ext-ftp": "Required to use the Flysystem FTP driver.",
                 "illuminate/http": "Required for handling uploaded files (^7.0).",
-                "league/flysystem": "Required to use the Flysystem local and FTP drivers (^1.0.34).",
+                "league/flysystem": "Required to use the Flysystem local and FTP drivers (^1.1).",
                 "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
                 "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
                 "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
@@ -1152,26 +1369,30 @@
             ],
             "description": "The Illuminate Filesystem package.",
             "homepage": "https://laravel.com",
-            "time": "2020-09-29T14:36:41+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-27T15:11:37+00:00"
         },
         {
             "name": "illuminate/hashing",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/hashing.git",
-                "reference": "275e271c0f42079e3a9d403a743b36aab9b8b24e"
+                "reference": "021a2a74f77f2b7bab4ef19b32bb9326c7cefacd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/hashing/zipball/275e271c0f42079e3a9d403a743b36aab9b8b24e",
-                "reference": "275e271c0f42079e3a9d403a743b36aab9b8b24e",
+                "url": "https://api.github.com/repos/illuminate/hashing/zipball/021a2a74f77f2b7bab4ef19b32bb9326c7cefacd",
+                "reference": "021a2a74f77f2b7bab4ef19b32bb9326c7cefacd",
                 "shasum": ""
             },
             "require": {
                 "illuminate/contracts": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5"
+                "php": "^7.2.5|^8.0"
             },
             "type": "library",
             "extra": {
@@ -1196,34 +1417,38 @@
             ],
             "description": "The Illuminate Hashing package.",
             "homepage": "https://laravel.com",
-            "time": "2020-08-13T14:33:41+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-27T15:11:37+00:00"
         },
         {
             "name": "illuminate/http",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/http.git",
-                "reference": "97ab6d0624a8fff364158ad2efe135cd41273a38"
+                "reference": "39d6e9eca58b575016be5d85cc1f223f632c0e95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/http/zipball/97ab6d0624a8fff364158ad2efe135cd41273a38",
-                "reference": "97ab6d0624a8fff364158ad2efe135cd41273a38",
+                "url": "https://api.github.com/repos/illuminate/http/zipball/39d6e9eca58b575016be5d85cc1f223f632c0e95",
+                "reference": "39d6e9eca58b575016be5d85cc1f223f632c0e95",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "illuminate/session": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5",
+                "php": "^7.2.5|^8.0",
                 "symfony/http-foundation": "^5.0",
                 "symfony/http-kernel": "^5.0",
                 "symfony/mime": "^5.0"
             },
             "suggest": {
                 "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().",
-                "guzzlehttp/guzzle": "Required to use the HTTP Client (^6.3.1|^7.0)."
+                "guzzlehttp/guzzle": "Required to use the HTTP Client (^6.3.1|^7.0.1)."
             },
             "type": "library",
             "extra": {
@@ -1248,27 +1473,31 @@
             ],
             "description": "The Illuminate Http package.",
             "homepage": "https://laravel.com",
-            "time": "2020-09-04T16:07:33+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2021-01-21T14:08:35+00:00"
         },
         {
             "name": "illuminate/log",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/log.git",
-                "reference": "603737e002313762020371e956dc47c6aa2f15aa"
+                "reference": "5c3ef2f534b82a5a4a1e2739ec8a70851b51ff77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/log/zipball/603737e002313762020371e956dc47c6aa2f15aa",
-                "reference": "603737e002313762020371e956dc47c6aa2f15aa",
+                "url": "https://api.github.com/repos/illuminate/log/zipball/5c3ef2f534b82a5a4a1e2739ec8a70851b51ff77",
+                "reference": "5c3ef2f534b82a5a4a1e2739ec8a70851b51ff77",
                 "shasum": ""
             },
             "require": {
                 "illuminate/contracts": "^7.0",
                 "illuminate/support": "^7.0",
                 "monolog/monolog": "^2.0",
-                "php": "^7.2.5"
+                "php": "^7.2.5|^8.0"
             },
             "type": "library",
             "extra": {
@@ -1293,27 +1522,31 @@
             ],
             "description": "The Illuminate Log package.",
             "homepage": "https://laravel.com",
-            "time": "2020-08-24T13:15:53+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-27T15:11:37+00:00"
         },
         {
             "name": "illuminate/pagination",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/pagination.git",
-                "reference": "2ca38b304313ab60415c07856a066aede2d3c8ed"
+                "reference": "ba0940dc07dde18249f4f46573969f8d87197a3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/pagination/zipball/2ca38b304313ab60415c07856a066aede2d3c8ed",
-                "reference": "2ca38b304313ab60415c07856a066aede2d3c8ed",
+                "url": "https://api.github.com/repos/illuminate/pagination/zipball/ba0940dc07dde18249f4f46573969f8d87197a3e",
+                "reference": "ba0940dc07dde18249f4f46573969f8d87197a3e",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "illuminate/contracts": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5"
+                "php": "^7.2.5|^8.0"
             },
             "type": "library",
             "extra": {
@@ -1338,26 +1571,30 @@
             ],
             "description": "The Illuminate Pagination package.",
             "homepage": "https://laravel.com",
-            "time": "2020-08-24T13:15:53+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-27T15:11:37+00:00"
         },
         {
             "name": "illuminate/pipeline",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/pipeline.git",
-                "reference": "93fa6f688bd1bb87d837e7cff31f256cdcd4a248"
+                "reference": "68434133b675a9914868fb2d8f665ec2157d9faa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/pipeline/zipball/93fa6f688bd1bb87d837e7cff31f256cdcd4a248",
-                "reference": "93fa6f688bd1bb87d837e7cff31f256cdcd4a248",
+                "url": "https://api.github.com/repos/illuminate/pipeline/zipball/68434133b675a9914868fb2d8f665ec2157d9faa",
+                "reference": "68434133b675a9914868fb2d8f665ec2157d9faa",
                 "shasum": ""
             },
             "require": {
                 "illuminate/contracts": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5"
+                "php": "^7.2.5|^8.0"
             },
             "type": "library",
             "extra": {
@@ -1382,20 +1619,24 @@
             ],
             "description": "The Illuminate Pipeline package.",
             "homepage": "https://laravel.com",
-            "time": "2020-08-24T13:15:53+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-27T15:11:37+00:00"
         },
         {
             "name": "illuminate/queue",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/queue.git",
-                "reference": "376052ca91ad8e82a65b591cadd56f10152eb3a9"
+                "reference": "daf415d911c0f2651a43f83f04e6e4855c919328"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/queue/zipball/376052ca91ad8e82a65b591cadd56f10152eb3a9",
-                "reference": "376052ca91ad8e82a65b591cadd56f10152eb3a9",
+                "url": "https://api.github.com/repos/illuminate/queue/zipball/daf415d911c0f2651a43f83f04e6e4855c919328",
+                "reference": "daf415d911c0f2651a43f83f04e6e4855c919328",
                 "shasum": ""
             },
             "require": {
@@ -1407,13 +1648,13 @@
                 "illuminate/filesystem": "^7.0",
                 "illuminate/pipeline": "^7.0",
                 "illuminate/support": "^7.0",
-                "opis/closure": "^3.1",
-                "php": "^7.2.5",
+                "opis/closure": "^3.6",
+                "php": "^7.2.5|^8.0",
                 "ramsey/uuid": "^3.7|^4.0",
                 "symfony/process": "^5.0"
             },
             "suggest": {
-                "aws/aws-sdk-php": "Required to use the SQS queue driver and DynamoDb failed job storage (^3.0).",
+                "aws/aws-sdk-php": "Required to use the SQS queue driver and DynamoDb failed job storage (^3.155).",
                 "ext-pcntl": "Required to use all features of the queue worker.",
                 "ext-posix": "Required to use all features of the queue worker.",
                 "illuminate/redis": "Required to use the Redis queue driver (^7.0).",
@@ -1442,20 +1683,24 @@
             ],
             "description": "The Illuminate Queue package.",
             "homepage": "https://laravel.com",
-            "time": "2020-08-17T13:28:58+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-11-18T14:37:23+00:00"
         },
         {
             "name": "illuminate/session",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/session.git",
-                "reference": "1d426cbcb7ea582474f1f8d47e25f24aa305dfd2"
+                "reference": "b18bc348f4af2afae78e72ea332a4390c5c01a72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/session/zipball/1d426cbcb7ea582474f1f8d47e25f24aa305dfd2",
-                "reference": "1d426cbcb7ea582474f1f8d47e25f24aa305dfd2",
+                "url": "https://api.github.com/repos/illuminate/session/zipball/b18bc348f4af2afae78e72ea332a4390c5c01a72",
+                "reference": "b18bc348f4af2afae78e72ea332a4390c5c01a72",
                 "shasum": ""
             },
             "require": {
@@ -1463,7 +1708,7 @@
                 "illuminate/contracts": "^7.0",
                 "illuminate/filesystem": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5",
+                "php": "^7.2.5|^8.0",
                 "symfony/finder": "^5.0",
                 "symfony/http-foundation": "^5.0"
             },
@@ -1493,20 +1738,24 @@
             ],
             "description": "The Illuminate Session package.",
             "homepage": "https://laravel.com",
-            "time": "2020-08-26T13:35:34+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-27T15:11:37+00:00"
         },
         {
             "name": "illuminate/support",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/support.git",
-                "reference": "8ee8e0e719cda577e2ca5b78766a4b079bf332f8"
+                "reference": "1c95b8f842308ff15a56d29d897d3bda29001f1c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/8ee8e0e719cda577e2ca5b78766a4b079bf332f8",
-                "reference": "8ee8e0e719cda577e2ca5b78766a4b079bf332f8",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/1c95b8f842308ff15a56d29d897d3bda29001f1c",
+                "reference": "1c95b8f842308ff15a56d29d897d3bda29001f1c",
                 "shasum": ""
             },
             "require": {
@@ -1514,8 +1763,8 @@
                 "ext-json": "*",
                 "ext-mbstring": "*",
                 "illuminate/contracts": "^7.0",
-                "nesbot/carbon": "^2.17",
-                "php": "^7.2.5",
+                "nesbot/carbon": "^2.31",
+                "php": "^7.2.5|^8.0",
                 "voku/portable-ascii": "^1.4.8"
             },
             "conflict": {
@@ -1555,34 +1804,38 @@
             ],
             "description": "The Illuminate Support package.",
             "homepage": "https://laravel.com",
-            "time": "2020-08-28T14:23:23+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-12-22T16:12:23+00:00"
         },
         {
             "name": "illuminate/testing",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/testing.git",
-                "reference": "c66a0e9aaf65e86132f2e3788ed374bd1d781621"
+                "reference": "d7e365ded1a73298ec068dae2e9958378f71630d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/testing/zipball/c66a0e9aaf65e86132f2e3788ed374bd1d781621",
-                "reference": "c66a0e9aaf65e86132f2e3788ed374bd1d781621",
+                "url": "https://api.github.com/repos/illuminate/testing/zipball/d7e365ded1a73298ec068dae2e9958378f71630d",
+                "reference": "d7e365ded1a73298ec068dae2e9958378f71630d",
                 "shasum": ""
             },
             "require": {
                 "illuminate/contracts": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5",
+                "php": "^7.2.5|^8.0",
                 "symfony/polyfill-php73": "^1.17"
             },
             "suggest": {
                 "illuminate/console": "Required to assert console commands (^7.0).",
                 "illuminate/database": "Required to assert databases (^7.0).",
                 "illuminate/http": "Required to assert responses (^7.0).",
-                "mockery/mockery": "Required to use mocking (^1.3.1).",
-                "phpunit/phpunit": "Required to use assertions and run tests (^8.4|^9.0)."
+                "mockery/mockery": "Required to use mocking (~1.3.3|^1.4.2).",
+                "phpunit/phpunit": "Required to use assertions and run tests (^8.4|^9.3.3)."
             },
             "type": "library",
             "extra": {
@@ -1607,20 +1860,24 @@
             ],
             "description": "The Illuminate Testing package.",
             "homepage": "https://laravel.com",
-            "time": "2020-09-03T14:26:35+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-31T18:35:25+00:00"
         },
         {
             "name": "illuminate/translation",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/translation.git",
-                "reference": "6c60b567e86ea84d6a1706a52c9d30c903c8bdf1"
+                "reference": "3fa058d9fbac56fd53d211e43acdb107fb1d2a77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/translation/zipball/6c60b567e86ea84d6a1706a52c9d30c903c8bdf1",
-                "reference": "6c60b567e86ea84d6a1706a52c9d30c903c8bdf1",
+                "url": "https://api.github.com/repos/illuminate/translation/zipball/3fa058d9fbac56fd53d211e43acdb107fb1d2a77",
+                "reference": "3fa058d9fbac56fd53d211e43acdb107fb1d2a77",
                 "shasum": ""
             },
             "require": {
@@ -1628,7 +1885,7 @@
                 "illuminate/contracts": "^7.0",
                 "illuminate/filesystem": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5"
+                "php": "^7.2.5|^8.0"
             },
             "type": "library",
             "extra": {
@@ -1653,20 +1910,24 @@
             ],
             "description": "The Illuminate Translation package.",
             "homepage": "https://laravel.com",
-            "time": "2020-09-15T17:56:12+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-27T15:11:37+00:00"
         },
         {
             "name": "illuminate/validation",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/validation.git",
-                "reference": "52e0009a16525ed32fc24c83a404fabf548debd4"
+                "reference": "ef77d7d509e1f3d98279045bd7ed397bccf0d1fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/validation/zipball/52e0009a16525ed32fc24c83a404fabf548debd4",
-                "reference": "52e0009a16525ed32fc24c83a404fabf548debd4",
+                "url": "https://api.github.com/repos/illuminate/validation/zipball/ef77d7d509e1f3d98279045bd7ed397bccf0d1fc",
+                "reference": "ef77d7d509e1f3d98279045bd7ed397bccf0d1fc",
                 "shasum": ""
             },
             "require": {
@@ -1676,7 +1937,7 @@
                 "illuminate/contracts": "^7.0",
                 "illuminate/support": "^7.0",
                 "illuminate/translation": "^7.0",
-                "php": "^7.2.5",
+                "php": "^7.2.5|^8.0",
                 "symfony/http-foundation": "^5.0",
                 "symfony/mime": "^5.0"
             },
@@ -1706,20 +1967,24 @@
             ],
             "description": "The Illuminate Validation package.",
             "homepage": "https://laravel.com",
-            "time": "2020-09-15T20:15:06+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2021-01-13T13:37:00+00:00"
         },
         {
             "name": "illuminate/view",
-            "version": "v7.28.4",
+            "version": "v7.30.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/view.git",
-                "reference": "8c58d239597da88c5cd8b01cd4e397c529597108"
+                "reference": "5c2279062da803f36093108d09f4db1d54b302d5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/view/zipball/8c58d239597da88c5cd8b01cd4e397c529597108",
-                "reference": "8c58d239597da88c5cd8b01cd4e397c529597108",
+                "url": "https://api.github.com/repos/illuminate/view/zipball/5c2279062da803f36093108d09f4db1d54b302d5",
+                "reference": "5c2279062da803f36093108d09f4db1d54b302d5",
                 "shasum": ""
             },
             "require": {
@@ -1729,7 +1994,7 @@
                 "illuminate/events": "^7.0",
                 "illuminate/filesystem": "^7.0",
                 "illuminate/support": "^7.0",
-                "php": "^7.2.5"
+                "php": "^7.2.5|^8.0"
             },
             "type": "library",
             "extra": {
@@ -1754,7 +2019,11 @@
             ],
             "description": "The Illuminate View package.",
             "homepage": "https://laravel.com",
-            "time": "2020-09-14T13:24:58+00:00"
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2020-10-27T15:11:37+00:00"
         },
         {
             "name": "laravel/lumen-framework",
@@ -1845,75 +2114,24 @@
                 "laravel",
                 "lumen"
             ],
+            "support": {
+                "issues": "https://github.com/laravel/lumen-framework/issues",
+                "source": "https://github.com/laravel/lumen-framework"
+            },
             "time": "2020-09-15T14:53:08+00:00"
         },
-        {
-            "name": "lcobucci/jwt",
-            "version": "3.3.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/lcobucci/jwt.git",
-                "reference": "c1123697f6a2ec29162b82f170dd4a491f524773"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/c1123697f6a2ec29162b82f170dd4a491f524773",
-                "reference": "c1123697f6a2ec29162b82f170dd4a491f524773",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "ext-openssl": "*",
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "mikey179/vfsstream": "~1.5",
-                "phpmd/phpmd": "~2.2",
-                "phpunit/php-invoker": "~1.1",
-                "phpunit/phpunit": "^5.7 || ^7.3",
-                "squizlabs/php_codesniffer": "~2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Lcobucci\\JWT\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Luís Otávio Cobucci Oblonczyk",
-                    "email": "lcobucci@gmail.com",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A simple library to work with JSON Web Token and JSON Web Signature",
-            "keywords": [
-                "JWS",
-                "jwt"
-            ],
-            "time": "2020-08-20T13:22:28+00:00"
-        },
         {
             "name": "monolog/monolog",
-            "version": "2.1.1",
+            "version": "2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "f9eee5cec93dfb313a38b6b288741e84e53f02d5"
+                "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f9eee5cec93dfb313a38b6b288741e84e53f02d5",
-                "reference": "f9eee5cec93dfb313a38b6b288741e84e53f02d5",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1cb1cde8e8dd0f70cc0fe51354a59acad9302084",
+                "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084",
                 "shasum": ""
             },
             "require": {
@@ -1926,16 +2144,17 @@
             "require-dev": {
                 "aws/aws-sdk-php": "^2.4.9 || ^3.0",
                 "doctrine/couchdb": "~1.0@dev",
-                "elasticsearch/elasticsearch": "^6.0",
+                "elasticsearch/elasticsearch": "^7",
                 "graylog2/gelf-php": "^1.4.2",
+                "mongodb/mongodb": "^1.8",
                 "php-amqplib/php-amqplib": "~2.4",
                 "php-console/php-console": "^3.1.3",
-                "php-parallel-lint/php-parallel-lint": "^1.0",
                 "phpspec/prophecy": "^1.6.1",
+                "phpstan/phpstan": "^0.12.59",
                 "phpunit/phpunit": "^8.5",
                 "predis/predis": "^1.1",
                 "rollbar/rollbar": "^1.3",
-                "ruflin/elastica": ">=0.90 <3.0",
+                "ruflin/elastica": ">=0.90 <7.0.1",
                 "swiftmailer/swiftmailer": "^5.3|^6.0"
             },
             "suggest": {
@@ -1955,7 +2174,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.x-dev"
+                    "dev-main": "2.x-dev"
                 }
             },
             "autoload": {
@@ -1971,30 +2190,44 @@
                 {
                     "name": "Jordi Boggiano",
                     "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
+                    "homepage": "https://seld.be"
                 }
             ],
             "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
-            "homepage": "http://github.com/Seldaek/monolog",
+            "homepage": "https://github.com/Seldaek/monolog",
             "keywords": [
                 "log",
                 "logging",
                 "psr-3"
             ],
-            "time": "2020-07-23T08:41:23+00:00"
+            "support": {
+                "issues": "https://github.com/Seldaek/monolog/issues",
+                "source": "https://github.com/Seldaek/monolog/tree/2.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/Seldaek",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-12-14T13:15:25+00:00"
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.41.3",
+            "version": "2.46.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "e148788eeae9b9b7b87996520358b86faad37b52"
+                "reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e148788eeae9b9b7b87996520358b86faad37b52",
-                "reference": "e148788eeae9b9b7b87996520358b86faad37b52",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4",
+                "reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4",
                 "shasum": ""
             },
             "require": {
@@ -2009,8 +2242,8 @@
                 "kylekatarnls/multi-tester": "^2.0",
                 "phpmd/phpmd": "^2.9",
                 "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^0.12.35",
-                "phpunit/phpunit": "^7.5 || ^8.0",
+                "phpstan/phpstan": "^0.12.54",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.14",
                 "squizlabs/php_codesniffer": "^3.4"
             },
             "bin": [
@@ -2060,7 +2293,21 @@
                 "datetime",
                 "time"
             ],
-            "time": "2020-10-12T20:36:09+00:00"
+            "support": {
+                "issues": "https://github.com/briannesbitt/Carbon/issues",
+                "source": "https://github.com/briannesbitt/Carbon"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/Carbon",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-02-24T17:30:44+00:00"
         },
         {
             "name": "nikic/fast-route",
@@ -2106,20 +2353,24 @@
                 "router",
                 "routing"
             ],
+            "support": {
+                "issues": "https://github.com/nikic/FastRoute/issues",
+                "source": "https://github.com/nikic/FastRoute/tree/master"
+            },
             "time": "2018-02-13T20:26:39+00:00"
         },
         {
             "name": "opis/closure",
-            "version": "3.6.0",
+            "version": "3.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/opis/closure.git",
-                "reference": "c547f8262a5fa9ff507bd06cc394067b83a75085"
+                "reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/opis/closure/zipball/c547f8262a5fa9ff507bd06cc394067b83a75085",
-                "reference": "c547f8262a5fa9ff507bd06cc394067b83a75085",
+                "url": "https://api.github.com/repos/opis/closure/zipball/943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5",
+                "reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5",
                 "shasum": ""
             },
             "require": {
@@ -2167,52 +2418,11 @@
                 "serialization",
                 "serialize"
             ],
-            "time": "2020-10-11T21:42:15+00:00"
-        },
-        {
-            "name": "paragonie/random_compat",
-            "version": "v9.99.99",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
+            "support": {
+                "issues": "https://github.com/opis/closure/issues",
+                "source": "https://github.com/opis/closure/tree/3.6.1"
             },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*|5.*",
-                "vimeo/psalm": "^1"
-            },
-            "suggest": {
-                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Paragon Initiative Enterprises",
-                    "email": "security@paragonie.com",
-                    "homepage": "https://paragonie.com"
-                }
-            ],
-            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
-            "keywords": [
-                "csprng",
-                "polyfill",
-                "pseudorandom",
-                "random"
-            ],
-            "time": "2018-07-02T15:55:56+00:00"
+            "time": "2020-11-07T02:01:34+00:00"
         },
         {
             "name": "phpoption/phpoption",
@@ -2267,31 +2477,40 @@
                 "php",
                 "type"
             ],
+            "support": {
+                "issues": "https://github.com/schmittjoh/php-option/issues",
+                "source": "https://github.com/schmittjoh/php-option/tree/1.7.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-07-20T17:29:33+00:00"
         },
         {
             "name": "psr/container",
-            "version": "1.0.0",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=7.2.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -2304,7 +2523,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common Container Interface (PHP FIG PSR-11)",
@@ -2316,7 +2535,11 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2017-02-14T16:28:37+00:00"
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/1.1.1"
+            },
+            "time": "2021-03-05T17:36:06+00:00"
         },
         {
             "name": "psr/event-dispatcher",
@@ -2362,6 +2585,10 @@
                 "psr",
                 "psr-14"
             ],
+            "support": {
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+            },
             "time": "2019-01-08T18:20:26+00:00"
         },
         {
@@ -2411,6 +2638,9 @@
                 "psr",
                 "psr-18"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/http-client/tree/master"
+            },
             "time": "2020-06-29T06:28:15+00:00"
         },
         {
@@ -2461,6 +2691,9 @@
                 "request",
                 "response"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/master"
+            },
             "time": "2016-08-06T14:39:51+00:00"
         },
         {
@@ -2508,6 +2741,9 @@
                 "psr",
                 "psr-3"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.3"
+            },
             "time": "2020-03-23T09:12:05+00:00"
         },
         {
@@ -2556,6 +2792,9 @@
                 "psr-16",
                 "simple-cache"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/simple-cache/tree/master"
+            },
             "time": "2017-10-23T01:57:42+00:00"
         },
         {
@@ -2596,20 +2835,24 @@
                 }
             ],
             "description": "A polyfill for getallheaders.",
+            "support": {
+                "issues": "https://github.com/ralouphie/getallheaders/issues",
+                "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+            },
             "time": "2019-03-08T08:55:37+00:00"
         },
         {
             "name": "ramsey/collection",
-            "version": "1.1.1",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/collection.git",
-                "reference": "24d93aefb2cd786b7edd9f45b554aea20b28b9b1"
+                "reference": "28a5c4ab2f5111db6a60b2b4ec84057e0f43b9c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/collection/zipball/24d93aefb2cd786b7edd9f45b554aea20b28b9b1",
-                "reference": "24d93aefb2cd786b7edd9f45b554aea20b28b9b1",
+                "url": "https://api.github.com/repos/ramsey/collection/zipball/28a5c4ab2f5111db6a60b2b4ec84057e0f43b9c1",
+                "reference": "28a5c4ab2f5111db6a60b2b4ec84057e0f43b9c1",
                 "shasum": ""
             },
             "require": {
@@ -2619,19 +2862,19 @@
                 "captainhook/captainhook": "^5.3",
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
                 "ergebnis/composer-normalize": "^2.6",
-                "fzaninotto/faker": "^1.5",
+                "fakerphp/faker": "^1.5",
                 "hamcrest/hamcrest-php": "^2",
-                "jangregor/phpstan-prophecy": "^0.6",
+                "jangregor/phpstan-prophecy": "^0.8",
                 "mockery/mockery": "^1.3",
                 "phpstan/extension-installer": "^1",
                 "phpstan/phpstan": "^0.12.32",
                 "phpstan/phpstan-mockery": "^0.12.5",
                 "phpstan/phpstan-phpunit": "^0.12.11",
-                "phpunit/phpunit": "^8.5",
+                "phpunit/phpunit": "^8.5 || ^9",
                 "psy/psysh": "^0.10.4",
                 "slevomat/coding-standard": "^6.3",
                 "squizlabs/php_codesniffer": "^3.5",
-                "vimeo/psalm": "^3.12.2"
+                "vimeo/psalm": "^4.4"
             },
             "type": "library",
             "autoload": {
@@ -2659,7 +2902,21 @@
                 "queue",
                 "set"
             ],
-            "time": "2020-09-10T20:58:17+00:00"
+            "support": {
+                "issues": "https://github.com/ramsey/collection/issues",
+                "source": "https://github.com/ramsey/collection/tree/1.1.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/ramsey",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/ramsey/collection",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-21T17:40:04+00:00"
         },
         {
             "name": "ramsey/uuid",
@@ -2740,20 +2997,31 @@
                 "identifier",
                 "uuid"
             ],
+            "support": {
+                "issues": "https://github.com/ramsey/uuid/issues",
+                "rss": "https://github.com/ramsey/uuid/releases.atom",
+                "source": "https://github.com/ramsey/uuid"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/ramsey",
+                    "type": "github"
+                }
+            ],
             "time": "2020-08-18T17:17:46+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v5.1.7",
+            "version": "v5.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "ae789a8a2ad189ce7e8216942cdb9b77319f5eb8"
+                "reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/ae789a8a2ad189ce7e8216942cdb9b77319f5eb8",
-                "reference": "ae789a8a2ad189ce7e8216942cdb9b77319f5eb8",
+                "url": "https://api.github.com/repos/symfony/console/zipball/35f039df40a3b335ebf310f244cb242b3a83ac8d",
+                "reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d",
                 "shasum": ""
             },
             "require": {
@@ -2790,11 +3058,6 @@
                 "symfony/process": ""
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Console\\": ""
@@ -2817,9 +3080,32 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Console Component",
+            "description": "Eases the creation of beautiful and testable command line interfaces",
             "homepage": "https://symfony.com",
-            "time": "2020-10-07T15:23:00+00:00"
+            "keywords": [
+                "cli",
+                "command line",
+                "console",
+                "terminal"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v5.2.6"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-03-28T09:42:18+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -2869,20 +3155,37 @@
             ],
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/master"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
             "name": "symfony/error-handler",
-            "version": "v5.1.7",
+            "version": "v5.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "5e4d8ef8d71822922d1eebd130219ae3491a5ca9"
+                "reference": "bdb7fb4188da7f4211e4b88350ba0dfdad002b03"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/5e4d8ef8d71822922d1eebd130219ae3491a5ca9",
-                "reference": "5e4d8ef8d71822922d1eebd130219ae3491a5ca9",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/bdb7fb4188da7f4211e4b88350ba0dfdad002b03",
+                "reference": "bdb7fb4188da7f4211e4b88350ba0dfdad002b03",
                 "shasum": ""
             },
             "require": {
@@ -2897,11 +3200,6 @@
                 "symfony/serializer": "^4.4|^5.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\ErrorHandler\\": ""
@@ -2924,22 +3222,39 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony ErrorHandler Component",
+            "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
-            "time": "2020-10-02T08:49:02+00:00"
+            "support": {
+                "source": "https://github.com/symfony/error-handler/tree/v5.2.6"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-03-16T09:07:47+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.1.7",
+            "version": "v5.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "d5de97d6af175a9e8131c546db054ca32842dd0f"
+                "reference": "d08d6ec121a425897951900ab692b612a61d6240"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d5de97d6af175a9e8131c546db054ca32842dd0f",
-                "reference": "d5de97d6af175a9e8131c546db054ca32842dd0f",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d08d6ec121a425897951900ab692b612a61d6240",
+                "reference": "d08d6ec121a425897951900ab692b612a61d6240",
                 "shasum": ""
             },
             "require": {
@@ -2970,11 +3285,6 @@
                 "symfony/http-kernel": ""
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\EventDispatcher\\": ""
@@ -2997,9 +3307,26 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony EventDispatcher Component",
+            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
-            "time": "2020-09-18T14:27:32+00:00"
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.2.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-02-18T17:12:37+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -3061,31 +3388,43 @@
                 "interoperability",
                 "standards"
             ],
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.1.7",
+            "version": "v5.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8"
+                "reference": "0d639a0943822626290d169965804f79400e6a04"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8",
-                "reference": "2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/0d639a0943822626290d169965804f79400e6a04",
+                "reference": "0d639a0943822626290d169965804f79400e6a04",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Finder\\": ""
@@ -3108,9 +3447,26 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Finder Component",
+            "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
-            "time": "2020-09-02T16:23:27+00:00"
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v5.2.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-02-15T18:55:04+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
@@ -3172,20 +3528,37 @@
                 "interoperability",
                 "standards"
             ],
+            "support": {
+                "source": "https://github.com/symfony/http-client-contracts/tree/v2.3.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-14T17:08:19+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.1.7",
+            "version": "v5.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "353b42e7b4fd1c898aab09a059466c9cea74039b"
+                "reference": "54499baea7f7418bce7b5ec92770fd0799e8e9bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/353b42e7b4fd1c898aab09a059466c9cea74039b",
-                "reference": "353b42e7b4fd1c898aab09a059466c9cea74039b",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/54499baea7f7418bce7b5ec92770fd0799e8e9bf",
+                "reference": "54499baea7f7418bce7b5ec92770fd0799e8e9bf",
                 "shasum": ""
             },
             "require": {
@@ -3204,11 +3577,6 @@
                 "symfony/mime": "To use the file extension guesser"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\HttpFoundation\\": ""
@@ -3231,22 +3599,39 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony HttpFoundation Component",
+            "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
-            "time": "2020-09-27T14:14:57+00:00"
+            "support": {
+                "source": "https://github.com/symfony/http-foundation/tree/v5.2.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-02-25T17:16:57+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v5.1.7",
+            "version": "v5.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "1764b87d2f10d5c9ce6e4850fe27934116d89708"
+                "reference": "f34de4c61ca46df73857f7f36b9a3805bdd7e3b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1764b87d2f10d5c9ce6e4850fe27934116d89708",
-                "reference": "1764b87d2f10d5c9ce6e4850fe27934116d89708",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f34de4c61ca46df73857f7f36b9a3805bdd7e3b2",
+                "reference": "f34de4c61ca46df73857f7f36b9a3805bdd7e3b2",
                 "shasum": ""
             },
             "require": {
@@ -3266,7 +3651,7 @@
                 "symfony/cache": "<5.0",
                 "symfony/config": "<5.0",
                 "symfony/console": "<4.4",
-                "symfony/dependency-injection": "<4.4",
+                "symfony/dependency-injection": "<5.1.8",
                 "symfony/doctrine-bridge": "<5.0",
                 "symfony/form": "<5.0",
                 "symfony/http-client": "<5.0",
@@ -3275,18 +3660,18 @@
                 "symfony/translation": "<5.0",
                 "symfony/twig-bridge": "<5.0",
                 "symfony/validator": "<5.0",
-                "twig/twig": "<2.4"
+                "twig/twig": "<2.13"
             },
             "provide": {
                 "psr/log-implementation": "1.0"
             },
             "require-dev": {
-                "psr/cache": "~1.0",
+                "psr/cache": "^1.0|^2.0|^3.0",
                 "symfony/browser-kit": "^4.4|^5.0",
                 "symfony/config": "^5.0",
                 "symfony/console": "^4.4|^5.0",
                 "symfony/css-selector": "^4.4|^5.0",
-                "symfony/dependency-injection": "^4.4|^5.0",
+                "symfony/dependency-injection": "^5.1.8",
                 "symfony/dom-crawler": "^4.4|^5.0",
                 "symfony/expression-language": "^4.4|^5.0",
                 "symfony/finder": "^4.4|^5.0",
@@ -3295,7 +3680,7 @@
                 "symfony/stopwatch": "^4.4|^5.0",
                 "symfony/translation": "^4.4|^5.0",
                 "symfony/translation-contracts": "^1.1|^2",
-                "twig/twig": "^2.4|^3.0"
+                "twig/twig": "^2.13|^3.0.4"
             },
             "suggest": {
                 "symfony/browser-kit": "",
@@ -3304,11 +3689,6 @@
                 "symfony/dependency-injection": ""
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\HttpKernel\\": ""
@@ -3331,43 +3711,63 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony HttpKernel Component",
+            "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
-            "time": "2020-10-04T07:57:28+00:00"
+            "support": {
+                "source": "https://github.com/symfony/http-kernel/tree/v5.2.6"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-03-29T05:16:58+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.1.7",
+            "version": "v5.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "4404d6545125863561721514ad9388db2661eec5"
+                "reference": "1b2092244374cbe48ae733673f2ca0818b37197b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/4404d6545125863561721514ad9388db2661eec5",
-                "reference": "4404d6545125863561721514ad9388db2661eec5",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/1b2092244374cbe48ae733673f2ca0818b37197b",
+                "reference": "1b2092244374cbe48ae733673f2ca0818b37197b",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
                 "symfony/polyfill-intl-idn": "^1.10",
                 "symfony/polyfill-mbstring": "^1.0",
                 "symfony/polyfill-php80": "^1.15"
             },
             "conflict": {
+                "egulias/email-validator": "~3.0.0",
+                "phpdocumentor/reflection-docblock": "<3.2.2",
+                "phpdocumentor/type-resolver": "<1.4.0",
                 "symfony/mailer": "<4.4"
             },
             "require-dev": {
-                "egulias/email-validator": "^2.1.10",
-                "symfony/dependency-injection": "^4.4|^5.0"
+                "egulias/email-validator": "^2.1.10|^3.1",
+                "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
+                "symfony/dependency-injection": "^4.4|^5.0",
+                "symfony/property-access": "^4.4|^5.1",
+                "symfony/property-info": "^4.4|^5.1",
+                "symfony/serializer": "^5.2"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Mime\\": ""
@@ -3390,30 +3790,47 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "A library to manipulate MIME messages",
+            "description": "Allows manipulating MIME messages",
             "homepage": "https://symfony.com",
             "keywords": [
                 "mime",
                 "mime-type"
             ],
-            "time": "2020-09-02T16:23:27+00:00"
+            "support": {
+                "source": "https://github.com/symfony/mime/tree/v5.2.6"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-03-12T13:18:39+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.18.1",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
+                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
-                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
+                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-ctype": "For best performance"
@@ -3421,7 +3838,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.22-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3458,24 +3875,41 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-07T16:49:33+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.18.1",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "b740103edbdcc39602239ee8860f0f45a8eb9aa5"
+                "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b740103edbdcc39602239ee8860f0f45a8eb9aa5",
-                "reference": "b740103edbdcc39602239ee8860f0f45a8eb9aa5",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5601e09b69f26c1828b13b6bb87cb07cddba3170",
+                "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -3483,7 +3917,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.22-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3522,26 +3956,42 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-22T09:19:47+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.18.1",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251"
+                "reference": "2d63434d922daf7da8dd863e7907e67ee3031483"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/5dcab1bc7146cf8c1beaa4502a3d9be344334251",
-                "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483",
+                "reference": "2d63434d922daf7da8dd863e7907e67ee3031483",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3",
+                "php": ">=7.1",
                 "symfony/polyfill-intl-normalizer": "^1.10",
-                "symfony/polyfill-php70": "^1.10",
                 "symfony/polyfill-php72": "^1.10"
             },
             "suggest": {
@@ -3550,7 +4000,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.22-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3593,24 +4043,41 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-08-04T06:02:08+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-22T09:19:47+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.18.1",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e"
+                "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
-                "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248",
+                "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -3618,7 +4085,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.22-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3660,24 +4127,41 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-22T09:19:47+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.18.1",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
+                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
-                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1",
+                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-mbstring": "For best performance"
@@ -3685,7 +4169,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.22-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3723,92 +4207,46 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-07-14T12:35:20+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php70",
-            "version": "v1.18.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1"
             },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
-                "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
-                "shasum": ""
-            },
-            "require": {
-                "paragonie/random_compat": "~1.0|~2.0|~9.99",
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.18-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php70\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
+            "funding": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
                 },
                 {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2021-01-22T09:19:47+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.18.1",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "639447d008615574653fb3bc60d1986d7172eaae"
+                "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae",
-                "reference": "639447d008615574653fb3bc60d1986d7172eaae",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
+                "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.22-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3845,29 +4283,46 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-07T16:49:33+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.18.1",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca"
+                "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
-                "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2",
+                "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.22-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3907,29 +4362,46 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-07T16:49:33+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.18.1",
+            "version": "v1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981"
+                "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981",
-                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91",
+                "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.8"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.22-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3973,20 +4445,37 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-07T16:49:33+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v5.1.7",
+            "version": "v5.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "d3a2e64866169586502f0cd9cab69135ad12cee9"
+                "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/d3a2e64866169586502f0cd9cab69135ad12cee9",
-                "reference": "d3a2e64866169586502f0cd9cab69135ad12cee9",
+                "url": "https://api.github.com/repos/symfony/process/zipball/313a38f09c77fbcdc1d223e57d368cea76a2fd2f",
+                "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f",
                 "shasum": ""
             },
             "require": {
@@ -3994,11 +4483,6 @@
                 "symfony/polyfill-php80": "^1.15"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Process\\": ""
@@ -4021,9 +4505,26 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Process Component",
+            "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
-            "time": "2020-09-02T16:23:27+00:00"
+            "support": {
+                "source": "https://github.com/symfony/process/tree/v5.2.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-27T10:15:41+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -4085,20 +4586,37 @@
                 "interoperability",
                 "standards"
             ],
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/master"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.1.7",
+            "version": "v5.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "4a9afe9d07bac506f75bcee8ed3ce76da5a9343e"
+                "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/4a9afe9d07bac506f75bcee8ed3ce76da5a9343e",
-                "reference": "4a9afe9d07bac506f75bcee8ed3ce76da5a9343e",
+                "url": "https://api.github.com/repos/symfony/string/zipball/ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572",
+                "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572",
                 "shasum": ""
             },
             "require": {
@@ -4116,11 +4634,6 @@
                 "symfony/var-exporter": "^4.4|^5.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\String\\": ""
@@ -4146,7 +4659,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony String component",
+            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
             "homepage": "https://symfony.com",
             "keywords": [
                 "grapheme",
@@ -4156,27 +4669,44 @@
                 "utf-8",
                 "utf8"
             ],
-            "time": "2020-09-15T12:23:47+00:00"
+            "support": {
+                "source": "https://github.com/symfony/string/tree/v5.2.6"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-03-17T17:12:15+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v5.1.7",
+            "version": "v5.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "e3cdd5119b1b5bf0698c351b8ee20fb5a4ea248b"
+                "reference": "2cc7f45d96db9adfcf89adf4401d9dfed509f4e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/e3cdd5119b1b5bf0698c351b8ee20fb5a4ea248b",
-                "reference": "e3cdd5119b1b5bf0698c351b8ee20fb5a4ea248b",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/2cc7f45d96db9adfcf89adf4401d9dfed509f4e1",
+                "reference": "2cc7f45d96db9adfcf89adf4401d9dfed509f4e1",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/polyfill-php80": "^1.15",
-                "symfony/translation-contracts": "^2"
+                "symfony/translation-contracts": "^2.3"
             },
             "conflict": {
                 "symfony/config": "<4.4",
@@ -4186,7 +4716,7 @@
                 "symfony/yaml": "<4.4"
             },
             "provide": {
-                "symfony/translation-implementation": "2.0"
+                "symfony/translation-implementation": "2.3"
             },
             "require-dev": {
                 "psr/log": "~1.0",
@@ -4205,12 +4735,10 @@
                 "symfony/yaml": ""
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
+                "files": [
+                    "Resources/functions.php"
+                ],
                 "psr-4": {
                     "Symfony\\Component\\Translation\\": ""
                 },
@@ -4232,9 +4760,26 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Translation Component",
+            "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
-            "time": "2020-09-27T03:44:28+00:00"
+            "support": {
+                "source": "https://github.com/symfony/translation/tree/v5.2.6"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-03-23T19:33:48+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -4295,20 +4840,37 @@
                 "interoperability",
                 "standards"
             ],
+            "support": {
+                "source": "https://github.com/symfony/translation-contracts/tree/v2.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-09-28T13:05:58+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v5.1.7",
+            "version": "v5.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "c976c115a0d788808f7e71834c8eb0844f678d02"
+                "reference": "89412a68ea2e675b4e44f260a5666729f77f668e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c976c115a0d788808f7e71834c8eb0844f678d02",
-                "reference": "c976c115a0d788808f7e71834c8eb0844f678d02",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/89412a68ea2e675b4e44f260a5666729f77f668e",
+                "reference": "89412a68ea2e675b4e44f260a5666729f77f668e",
                 "shasum": ""
             },
             "require": {
@@ -4324,7 +4886,7 @@
                 "ext-iconv": "*",
                 "symfony/console": "^4.4|^5.0",
                 "symfony/process": "^4.4|^5.0",
-                "twig/twig": "^2.4|^3.0"
+                "twig/twig": "^2.13|^3.0.4"
             },
             "suggest": {
                 "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
@@ -4335,11 +4897,6 @@
                 "Resources/bin/var-dump-server"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
             "autoload": {
                 "files": [
                     "Resources/functions/dump.php"
@@ -4365,26 +4922,43 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony mechanism for exploring and dumping PHP variables",
+            "description": "Provides mechanisms for walking through any arbitrary PHP variable",
             "homepage": "https://symfony.com",
             "keywords": [
                 "debug",
                 "dump"
             ],
-            "time": "2020-09-18T14:27:32+00:00"
+            "support": {
+                "source": "https://github.com/symfony/var-dumper/tree/v5.2.6"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-03-28T09:42:18+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v4.1.8",
+            "version": "v4.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "572af79d913627a9d70374d27a6f5d689a35de32"
+                "reference": "da64796370fc4eb03cc277088f6fede9fde88482"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/572af79d913627a9d70374d27a6f5d689a35de32",
-                "reference": "572af79d913627a9d70374d27a6f5d689a35de32",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/da64796370fc4eb03cc277088f6fede9fde88482",
+                "reference": "da64796370fc4eb03cc277088f6fede9fde88482",
                 "shasum": ""
             },
             "require": {
@@ -4396,7 +4970,7 @@
                 "bamarni/composer-bin-plugin": "^1.4.1",
                 "ext-filter": "*",
                 "ext-pcre": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7.27 || ^6.5.6 || ^7.0"
+                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20"
             },
             "suggest": {
                 "ext-filter": "Required to use the boolean validator.",
@@ -4435,27 +5009,41 @@
                 "env",
                 "environment"
             ],
-            "time": "2020-07-14T19:22:52+00:00"
+            "support": {
+                "issues": "https://github.com/vlucas/phpdotenv/issues",
+                "source": "https://github.com/vlucas/phpdotenv/tree/v4.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-01-20T15:11:48+00:00"
         },
         {
             "name": "voku/portable-ascii",
-            "version": "1.5.3",
+            "version": "1.5.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/voku/portable-ascii.git",
-                "reference": "25bcbf01678930251fd572891447d9e318a6e2b8"
+                "reference": "80953678b19901e5165c56752d087fc11526017c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/25bcbf01678930251fd572891447d9e318a6e2b8",
-                "reference": "25bcbf01678930251fd572891447d9e318a6e2b8",
+                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/80953678b19901e5165c56752d087fc11526017c",
+                "reference": "80953678b19901e5165c56752d087fc11526017c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.0.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~6.0 || ~7.0"
+                "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0"
             },
             "suggest": {
                 "ext-intl": "Use Intl for transliterator_transliterate() support"
@@ -4483,42 +5071,63 @@
                 "clean",
                 "php"
             ],
-            "time": "2020-07-22T23:32:04+00:00"
+            "support": {
+                "issues": "https://github.com/voku/portable-ascii/issues",
+                "source": "https://github.com/voku/portable-ascii/tree/1.5.6"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/moelleken",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/voku",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/portable-ascii",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://www.patreon.com/voku",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-11-12T00:07:28+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.3.1",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "f350df0268e904597e3bd9c4685c53e0e333feea"
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea",
-                "reference": "f350df0268e904597e3bd9c4685c53e0e333feea",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^6.0",
+                "doctrine/coding-standard": "^8.0",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.13",
-                "phpstan/phpstan-phpunit": "^0.11",
-                "phpstan/phpstan-shim": "^0.11",
-                "phpunit/phpunit": "^7.0"
+                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
+                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan-phpunit": "^0.12",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
@@ -4532,7 +5141,7 @@
                 {
                     "name": "Marco Pivetta",
                     "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
+                    "homepage": "https://ocramius.github.io/"
                 }
             ],
             "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
@@ -4541,20 +5150,38 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2020-05-29T17:27:14+00:00"
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-11-10T18:47:58+00:00"
         },
         {
             "name": "fzaninotto/faker",
-            "version": "v1.9.1",
+            "version": "v1.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "fc10d778e4b84d5bd315dad194661e091d307c6f"
+                "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/fc10d778e4b84d5bd315dad194661e091d307c6f",
-                "reference": "fc10d778e4b84d5bd315dad194661e091d307c6f",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/848d8125239d7dbf8ab25cb7f054f1a630e68c2e",
+                "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e",
                 "shasum": ""
             },
             "require": {
@@ -4591,7 +5218,12 @@
                 "faker",
                 "fixtures"
             ],
-            "time": "2019-12-12T13:22:17+00:00"
+            "support": {
+                "issues": "https://github.com/fzaninotto/Faker/issues",
+                "source": "https://github.com/fzaninotto/Faker/tree/v1.9.2"
+            },
+            "abandoned": true,
+            "time": "2020-12-11T09:56:16+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -4638,34 +5270,41 @@
             "keywords": [
                 "test"
             ],
+            "support": {
+                "issues": "https://github.com/hamcrest/hamcrest-php/issues",
+                "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1"
+            },
             "time": "2020-07-09T08:09:16+00:00"
         },
         {
             "name": "mockery/mockery",
-            "version": "1.3.3",
+            "version": "1.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "60fa2f67f6e4d3634bb4a45ff3171fa52215800d"
+                "reference": "d1339f64479af1bee0e82a0413813fe5345a54ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/60fa2f67f6e4d3634bb4a45ff3171fa52215800d",
-                "reference": "60fa2f67f6e4d3634bb4a45ff3171fa52215800d",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/d1339f64479af1bee0e82a0413813fe5345a54ea",
+                "reference": "d1339f64479af1bee0e82a0413813fe5345a54ea",
                 "shasum": ""
             },
             "require": {
                 "hamcrest/hamcrest-php": "^2.0.1",
                 "lib-pcre": ">=7.0",
-                "php": ">=5.6.0"
+                "php": "^7.3 || ^8.0"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.10|^6.5|^7.5|^8.5|^9.3"
+                "phpunit/phpunit": "^8.5 || ^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3.x-dev"
+                    "dev-master": "1.4.x-dev"
                 }
             },
             "autoload": {
@@ -4703,20 +5342,24 @@
                 "test double",
                 "testing"
             ],
-            "time": "2020-08-11T18:10:21+00:00"
+            "support": {
+                "issues": "https://github.com/mockery/mockery/issues",
+                "source": "https://github.com/mockery/mockery/tree/1.4.3"
+            },
+            "time": "2021-02-24T09:51:49+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.10.1",
+            "version": "1.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5"
+                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
-                "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
+                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
                 "shasum": ""
             },
             "require": {
@@ -4751,32 +5394,43 @@
                 "object",
                 "object graph"
             ],
-            "time": "2020-06-29T13:22:24+00:00"
+            "support": {
+                "issues": "https://github.com/myclabs/DeepCopy/issues",
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-11-13T09:40:50+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "1.0.3",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
+                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
-                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
+                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-phar": "*",
-                "phar-io/version": "^2.0",
-                "php": "^5.6 || ^7.0"
+                "ext-xmlwriter": "*",
+                "phar-io/version": "^3.0.1",
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -4806,24 +5460,28 @@
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "time": "2018-07-08T19:23:20+00:00"
+            "support": {
+                "issues": "https://github.com/phar-io/manifest/issues",
+                "source": "https://github.com/phar-io/manifest/tree/master"
+            },
+            "time": "2020-06-27T14:33:11+00:00"
         },
         {
             "name": "phar-io/version",
-            "version": "2.0.1",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
+                "reference": "bae7c545bef187884426f042434e561ab1ddb182"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
-                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182",
+                "reference": "bae7c545bef187884426f042434e561ab1ddb182",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "autoload": {
@@ -4853,7 +5511,11 @@
                 }
             ],
             "description": "Library for handling version information and constraints",
-            "time": "2018-07-08T19:19:57+00:00"
+            "support": {
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/3.1.0"
+            },
+            "time": "2021-02-23T14:00:09+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -4902,6 +5564,10 @@
                 "reflection",
                 "static analysis"
             ],
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+            },
             "time": "2020-06-27T09:03:43+00:00"
         },
         {
@@ -4954,6 +5620,10 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
+            },
             "time": "2020-09-03T19:13:55+00:00"
         },
         {
@@ -4999,20 +5669,24 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
+            },
             "time": "2020-09-17T18:55:26+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.12.1",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "8ce87516be71aae9b956f81906aaf0338e0d8a2d"
+                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/8ce87516be71aae9b956f81906aaf0338e0d8a2d",
-                "reference": "8ce87516be71aae9b956f81906aaf0338e0d8a2d",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea",
+                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea",
                 "shasum": ""
             },
             "require": {
@@ -5024,7 +5698,7 @@
             },
             "require-dev": {
                 "phpspec/phpspec": "^6.0",
-                "phpunit/phpunit": "^8.0 || ^9.0 <9.3"
+                "phpunit/phpunit": "^8.0 || ^9.0"
             },
             "type": "library",
             "extra": {
@@ -5062,29 +5736,33 @@
                 "spy",
                 "stub"
             ],
-            "time": "2020-09-29T09:10:42+00:00"
+            "support": {
+                "issues": "https://github.com/phpspec/prophecy/issues",
+                "source": "https://github.com/phpspec/prophecy/tree/1.13.0"
+            },
+            "time": "2021-03-17T13:42:18+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "7.0.10",
+            "version": "7.0.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf"
+                "reference": "bb7c9a210c72e4709cdde67f8b7362f672f2225c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f1884187926fbb755a9aaf0b3836ad3165b478bf",
-                "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/bb7c9a210c72e4709cdde67f8b7362f672f2225c",
+                "reference": "bb7c9a210c72e4709cdde67f8b7362f672f2225c",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-xmlwriter": "*",
-                "php": "^7.2",
+                "php": ">=7.2",
                 "phpunit/php-file-iterator": "^2.0.2",
                 "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^3.1.1",
+                "phpunit/php-token-stream": "^3.1.1 || ^4.0",
                 "sebastian/code-unit-reverse-lookup": "^1.0.1",
                 "sebastian/environment": "^4.2.2",
                 "sebastian/version": "^2.0.1",
@@ -5125,27 +5803,37 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2019-11-20T13:55:58+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.14"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-12-02T13:39:03+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "050bedf145a257b1ff02746c31894800e5122946"
+                "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946",
-                "reference": "050bedf145a257b1ff02746c31894800e5122946",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/4b49fb70f067272b659ef0174ff9ca40fdaa6357",
+                "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.1"
+                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
@@ -5175,7 +5863,17 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2018-09-13T20:33:42+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T08:25:21+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -5216,27 +5914,31 @@
             "keywords": [
                 "template"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+            },
             "time": "2015-06-21T13:50:34+00:00"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "2.1.2",
+            "version": "2.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "1038454804406b0b5f5f520358e78c1c2f71501e"
+                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e",
-                "reference": "1038454804406b0b5f5f520358e78c1c2f71501e",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662",
+                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0"
+                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
@@ -5265,33 +5967,43 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2019-06-07T04:22:29+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T08:20:02+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "3.1.1",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff"
+                "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/995192df77f63a59e47f025390d2d1fdf8f425ff",
-                "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3",
+                "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": "^7.1"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0"
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -5314,44 +6026,54 @@
             "keywords": [
                 "tokenizer"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
+                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "abandoned": true,
-            "time": "2019-09-17T06:23:10+00:00"
+            "time": "2020-08-04T08:28:15+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "8.5.8",
+            "version": "8.5.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997"
+                "reference": "038d4196d8e8cb405cd5e82cedfe413ad6eef9ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34c18baa6a44f1d1fbf0338907139e9dce95b997",
-                "reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/038d4196d8e8cb405cd5e82cedfe413ad6eef9ef",
+                "reference": "038d4196d8e8cb405cd5e82cedfe413ad6eef9ef",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.2.0",
+                "doctrine/instantiator": "^1.3.1",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.9.1",
-                "phar-io/manifest": "^1.0.3",
-                "phar-io/version": "^2.0.1",
-                "php": "^7.2",
-                "phpspec/prophecy": "^1.8.1",
-                "phpunit/php-code-coverage": "^7.0.7",
+                "myclabs/deep-copy": "^1.10.0",
+                "phar-io/manifest": "^2.0.1",
+                "phar-io/version": "^3.0.2",
+                "php": ">=7.2",
+                "phpspec/prophecy": "^1.10.3",
+                "phpunit/php-code-coverage": "^7.0.12",
                 "phpunit/php-file-iterator": "^2.0.2",
                 "phpunit/php-text-template": "^1.2.1",
                 "phpunit/php-timer": "^2.1.2",
                 "sebastian/comparator": "^3.0.2",
                 "sebastian/diff": "^3.0.2",
-                "sebastian/environment": "^4.2.2",
-                "sebastian/exporter": "^3.1.1",
+                "sebastian/environment": "^4.2.3",
+                "sebastian/exporter": "^3.1.2",
                 "sebastian/global-state": "^3.0.0",
                 "sebastian/object-enumerator": "^3.0.3",
                 "sebastian/resource-operations": "^2.0.1",
@@ -5398,27 +6120,41 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2020-06-22T07:06:58+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.15"
+            },
+            "funding": [
+                {
+                    "url": "https://phpunit.de/donate.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-03-17T07:27:54+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": ">=5.6"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.0"
+                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
@@ -5443,29 +6179,39 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2017-03-04T06:30:41+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T08:15:22+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "3.0.2",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
+                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
-                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758",
+                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1",
+                "php": ">=7.1",
                 "sebastian/diff": "^3.0",
                 "sebastian/exporter": "^3.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.1"
+                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
@@ -5483,6 +6229,10 @@
                 "BSD-3-Clause"
             ],
             "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
                 {
                     "name": "Jeff Welch",
                     "email": "whatthejeff@gmail.com"
@@ -5494,10 +6244,6 @@
                 {
                     "name": "Bernhard Schussek",
                     "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Provides the functionality to compare PHP values for equality",
@@ -5507,24 +6253,34 @@
                 "compare",
                 "equality"
             ],
-            "time": "2018-07-12T15:12:46+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T08:04:30+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "3.0.2",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29"
+                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
-                "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
+                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.1"
             },
             "require-dev": {
                 "phpunit/phpunit": "^7.5 || ^8.0",
@@ -5546,13 +6302,13 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
                 }
             ],
             "description": "Diff implementation",
@@ -5563,24 +6319,34 @@
                 "unidiff",
                 "unified diff"
             ],
-            "time": "2019-02-04T06:01:07+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:59:04+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "4.2.3",
+            "version": "4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368"
+                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/464c90d7bdf5ad4e8a6aea15c091fec0603d4368",
-                "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
+                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.1"
             },
             "require-dev": {
                 "phpunit/phpunit": "^7.5"
@@ -5616,24 +6382,34 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2019-11-20T08:46:58+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:53:42+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "3.1.2",
+            "version": "3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e"
+                "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e",
-                "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e",
+                "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
+                "php": ">=7.0",
                 "sebastian/recursion-context": "^3.0"
             },
             "require-dev": {
@@ -5683,24 +6459,34 @@
                 "export",
                 "exporter"
             ],
-            "time": "2019-09-14T09:02:43+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:47:53+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "3.0.0",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4"
+                "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4",
-                "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/474fb9edb7ab891665d3bfc6317f42a0a150454b",
+                "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2",
+                "php": ">=7.2",
                 "sebastian/object-reflector": "^1.1.1",
                 "sebastian/recursion-context": "^3.0"
             },
@@ -5737,24 +6523,34 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2019-02-01T05:30:01+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:43:24+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "3.0.3",
+            "version": "3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
+                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
+                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
+                "php": ">=7.0",
                 "sebastian/object-reflector": "^1.1.1",
                 "sebastian/recursion-context": "^3.0"
             },
@@ -5784,24 +6580,34 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2017-08-03T12:35:26+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:40:27+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "1.1.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "773f97c67f28de00d397be301821b06708fca0be"
+                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
-                "reference": "773f97c67f28de00d397be301821b06708fca0be",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": ">=7.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^6.0"
@@ -5829,24 +6635,34 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "time": "2017-03-29T09:07:27+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:37:18+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "3.0.0",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
+                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb",
+                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": ">=7.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^6.0"
@@ -5867,14 +6683,14 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
                 },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
                 {
                     "name": "Adam Harvey",
                     "email": "aharvey@php.net"
@@ -5882,24 +6698,34 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2017-03-03T06:23:57+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:34:24+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "2.0.1",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9"
+                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
-                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3",
+                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
@@ -5924,24 +6750,34 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2018-10-04T04:07:39+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:30:19+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "1.1.3",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3"
+                "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/3aaaa15fa71d27650d62a948be022fe3b48541a3",
-                "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0150cfbc4495ed2df3872fb31b26781e4e077eb4",
+                "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2"
+                "php": ">=7.2"
             },
             "require-dev": {
                 "phpunit/phpunit": "^8.2"
@@ -5970,7 +6806,17 @@
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
             "homepage": "https://github.com/sebastianbergmann/type",
-            "time": "2019-07-02T08:10:15+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/type/issues",
+                "source": "https://github.com/sebastianbergmann/type/tree/1.1.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:25:11+00:00"
         },
         {
             "name": "sebastian/version",
@@ -6013,6 +6859,10 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/master"
+            },
             "time": "2016-10-03T07:35:21+00:00"
         },
         {
@@ -6053,34 +6903,49 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "support": {
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/master"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
             "time": "2020-07-12T23:59:07+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.9.1",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
+                "url": "https://github.com/webmozarts/assert.git",
+                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
-                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
+                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0 || ^8.0",
+                "php": "^7.2 || ^8.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
                 "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<3.9.1"
+                "vimeo/psalm": "<4.6.1 || 4.6.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
+                "phpunit/phpunit": "^8.5.13"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.10-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Webmozart\\Assert\\": "src/"
@@ -6102,7 +6967,11 @@
                 "check",
                 "validate"
             ],
-            "time": "2020-07-08T17:02:28+00:00"
+            "support": {
+                "issues": "https://github.com/webmozarts/assert/issues",
+                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
+            },
+            "time": "2021-03-09T10:59:23+00:00"
         }
     ],
     "aliases": [],
@@ -6113,5 +6982,6 @@
     "platform": {
         "php": "^7.2.5"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "2.0.0"
 }
diff --git a/config/database.php b/config/database.php
index a613421..a893aa9 100644
--- a/config/database.php
+++ b/config/database.php
@@ -16,6 +16,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
          ],
 
         'mysql2' => [
@@ -29,6 +30,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
 
         'mysql3' => [
@@ -42,6 +44,8 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
+
         ],
 
         'mysql4' => [
@@ -55,6 +59,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
 
         'mysql5' => [
@@ -68,6 +73,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
 
         'mysql6' => [
@@ -81,6 +87,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
 
         'mysql7' => [
@@ -94,19 +101,9 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
-        'mysql8' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_8'),
-            'port'      => env('DB_PORT'),
-            'database'  => env('DB_DATABASE_8'),
-            'username'  => env('DB_USERNAME_8'),
-            'password'  => env('DB_PASSWORD_8'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
+
         'mysql9' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_9'),
@@ -118,7 +115,9 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
+
         'mysql10' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_10'),
@@ -130,7 +129,9 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
+
         'mysql11' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_11'),
@@ -142,6 +143,9 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
+
+
     ],
 ];
\ No newline at end of file

From c2fd40f4c77c1a81a208aa6cf8bd07e040359fb5 Mon Sep 17 00:00:00 2001
From: Afiq Zakwan Hamdan <afiqzakwanhamdan@gmail.com>
Date: Mon, 12 Apr 2021 08:48:57 +0800
Subject: [PATCH 10/60] connection to cawangan

---
 config/database.php | 282 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 273 insertions(+), 9 deletions(-)

diff --git a/config/database.php b/config/database.php
index a613421..153922a 100644
--- a/config/database.php
+++ b/config/database.php
@@ -21,7 +21,7 @@ return [
         'mysql2' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_2'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_2'),
             'database'  => env('DB_DATABASE_2'),
             'username'  => env('DB_USERNAME_2'),
             'password'  => env('DB_PASSWORD_2'),
@@ -34,7 +34,7 @@ return [
         'mysql3' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_3'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_3'),
             'database'  => env('DB_DATABASE_3'),
             'username'  => env('DB_USERNAME_3'),
             'password'  => env('DB_PASSWORD_3'),
@@ -47,7 +47,7 @@ return [
         'mysql4' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_4'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_4'),
             'database'  => env('DB_DATABASE_4'),
             'username'  => env('DB_USERNAME_4'),
             'password'  => env('DB_PASSWORD_4'),
@@ -60,7 +60,7 @@ return [
         'mysql5' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_5'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_5'),
             'database'  => env('DB_DATABASE_5'),
             'username'  => env('DB_USERNAME_5'),
             'password'  => env('DB_PASSWORD_5'),
@@ -73,7 +73,7 @@ return [
         'mysql6' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_6'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_6'),
             'database'  => env('DB_DATABASE_6'),
             'username'  => env('DB_USERNAME_6'),
             'password'  => env('DB_PASSWORD_6'),
@@ -86,7 +86,7 @@ return [
         'mysql7' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_7'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_7'),
             'database'  => env('DB_DATABASE_7'),
             'username'  => env('DB_USERNAME_7'),
             'password'  => env('DB_PASSWORD_7'),
@@ -98,7 +98,7 @@ return [
         'mysql8' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_8'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_8'),
             'database'  => env('DB_DATABASE_8'),
             'username'  => env('DB_USERNAME_8'),
             'password'  => env('DB_PASSWORD_8'),
@@ -122,7 +122,7 @@ return [
         'mysql10' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_10'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_10'),
             'database'  => env('DB_DATABASE_10'),
             'username'  => env('DB_USERNAME_10'),
             'password'  => env('DB_PASSWORD_10'),
@@ -134,7 +134,7 @@ return [
         'mysql11' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_11'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_11'),
             'database'  => env('DB_DATABASE_11'),
             'username'  => env('DB_USERNAME_11'),
             'password'  => env('DB_PASSWORD_11'),
@@ -143,5 +143,269 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
+        'mysql12' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_12'),
+            'port'      => env('DB_PORT_12'),
+            'database'  => env('DB_DATABASE_12'),
+            'username'  => env('DB_USERNAME_12'),
+            'password'  => env('DB_PASSWORD_12'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql13' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_13'),
+            'port'      => env('DB_PORT_13'),
+            'database'  => env('DB_DATABASE_13'),
+            'username'  => env('DB_USERNAME_13'),
+            'password'  => env('DB_PASSWORD_13'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql14' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_14'),
+            'port'      => env('DB_PORT_14'),
+            'database'  => env('DB_DATABASE_14'),
+            'username'  => env('DB_USERNAME_14'),
+            'password'  => env('DB_PASSWORD_14'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql15' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_15'),
+            'port'      => env('DB_PORT_15'),
+            'database'  => env('DB_DATABASE_15'),
+            'username'  => env('DB_USERNAME_15'),
+            'password'  => env('DB_PASSWORD_15'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql16' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_16'),
+            'port'      => env('DB_PORT_16'),
+            'database'  => env('DB_DATABASE_16'),
+            'username'  => env('DB_USERNAME_16'),
+            'password'  => env('DB_PASSWORD_16'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql17' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_17'),
+            'port'      => env('DB_PORT_17'),
+            'database'  => env('DB_DATABASE_17'),
+            'username'  => env('DB_USERNAME_17'),
+            'password'  => env('DB_PASSWORD_17'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql18' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_18'),
+            'port'      => env('DB_PORT_18'),
+            'database'  => env('DB_DATABASE_18'),
+            'username'  => env('DB_USERNAME_18'),
+            'password'  => env('DB_PASSWORD_18'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql19' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_19'),
+            'port'      => env('DB_PORT_19'),
+            'database'  => env('DB_DATABASE_19'),
+            'username'  => env('DB_USERNAME_19'),
+            'password'  => env('DB_PASSWORD_19'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql20' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_20'),
+            'port'      => env('DB_PORT_20'),
+            'database'  => env('DB_DATABASE_20'),
+            'username'  => env('DB_USERNAME_20'),
+            'password'  => env('DB_PASSWORD_20'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql21' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_21'),
+            'port'      => env('DB_PORT_21'),
+            'database'  => env('DB_DATABASE_21'),
+            'username'  => env('DB_USERNAME_21'),
+            'password'  => env('DB_PASSWORD_21'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql22' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_22'),
+            'port'      => env('DB_PORT_22'),
+            'database'  => env('DB_DATABASE_22'),
+            'username'  => env('DB_USERNAME_22'),
+            'password'  => env('DB_PASSWORD_22'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql23' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_23'),
+            'port'      => env('DB_PORT_23'),
+            'database'  => env('DB_DATABASE_23'),
+            'username'  => env('DB_USERNAME_23'),
+            'password'  => env('DB_PASSWORD_23'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql24' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_24'),
+            'port'      => env('DB_PORT_24'),
+            'database'  => env('DB_DATABASE_24'),
+            'username'  => env('DB_USERNAME_24'),
+            'password'  => env('DB_PASSWORD_24'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql25' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_25'),
+            'port'      => env('DB_PORT_25'),
+            'database'  => env('DB_DATABASE_25'),
+            'username'  => env('DB_USERNAME_25'),
+            'password'  => env('DB_PASSWORD_25'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql26' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_26'),
+            'port'      => env('DB_PORT_26'),
+            'database'  => env('DB_DATABASE_26'),
+            'username'  => env('DB_USERNAME_26'),
+            'password'  => env('DB_PASSWORD_26'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql27' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_27'),
+            'port'      => env('DB_PORT_27'),
+            'database'  => env('DB_DATABASE_27'),
+            'username'  => env('DB_USERNAME_27'),
+            'password'  => env('DB_PASSWORD_27'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql28' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_28'),
+            'port'      => env('DB_PORT_28'),
+            'database'  => env('DB_DATABASE_28'),
+            'username'  => env('DB_USERNAME_28'),
+            'password'  => env('DB_PASSWORD_28'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql29' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_29'),
+            'port'      => env('DB_PORT_29'),
+            'database'  => env('DB_DATABASE_29'),
+            'username'  => env('DB_USERNAME_29'),
+            'password'  => env('DB_PASSWORD_29'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql30' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_30'),
+            'port'      => env('DB_PORT_30'),
+            'database'  => env('DB_DATABASE_30'),
+            'username'  => env('DB_USERNAME_30'),
+            'password'  => env('DB_PASSWORD_30'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql31' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_31'),
+            'port'      => env('DB_PORT_31'),
+            'database'  => env('DB_DATABASE_31'),
+            'username'  => env('DB_USERNAME_31'),
+            'password'  => env('DB_PASSWORD_31'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql32' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_32'),
+            'port'      => env('DB_PORT_32'),
+            'database'  => env('DB_DATABASE_32'),
+            'username'  => env('DB_USERNAME_32'),
+            'password'  => env('DB_PASSWORD_32'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql33' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_33'),
+            'port'      => env('DB_PORT_33'),
+            'database'  => env('DB_DATABASE_33'),
+            'username'  => env('DB_USERNAME_33'),
+            'password'  => env('DB_PASSWORD_33'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
     ],
 ];
\ No newline at end of file

From 8a9933122fba21437755321a6448660820366655 Mon Sep 17 00:00:00 2001
From: hafifie rahman <muhdhafifie97@gmail.com>
Date: Mon, 12 Apr 2021 08:26:59 +0000
Subject: [PATCH 11/60] Delete database.php

---
 config/database.php | 151 --------------------------------------------
 1 file changed, 151 deletions(-)
 delete mode 100644 config/database.php

diff --git a/config/database.php b/config/database.php
deleted file mode 100644
index a893aa9..0000000
--- a/config/database.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-return [
-
-   'default' => 'accounts',
-
-   'connections' => [
-        'mysql' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST'),
-            'port'      => env('DB_PORT'),
-            'database'  => env('DB_DATABASE'),
-            'username'  => env('DB_USERNAME'),
-            'password'  => env('DB_PASSWORD'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
-         ],
-
-        'mysql2' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_2'),
-            'port'      => env('DB_PORT'),
-            'database'  => env('DB_DATABASE_2'),
-            'username'  => env('DB_USERNAME_2'),
-            'password'  => env('DB_PASSWORD_2'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
-        ],
-
-        'mysql3' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_3'),
-            'port'      => env('DB_PORT'),
-            'database'  => env('DB_DATABASE_3'),
-            'username'  => env('DB_USERNAME_3'),
-            'password'  => env('DB_PASSWORD_3'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
-
-        ],
-
-        'mysql4' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_4'),
-            'port'      => env('DB_PORT'),
-            'database'  => env('DB_DATABASE_4'),
-            'username'  => env('DB_USERNAME_4'),
-            'password'  => env('DB_PASSWORD_4'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
-        ],
-
-        'mysql5' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_5'),
-            'port'      => env('DB_PORT'),
-            'database'  => env('DB_DATABASE_5'),
-            'username'  => env('DB_USERNAME_5'),
-            'password'  => env('DB_PASSWORD_5'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
-        ],
-
-        'mysql6' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_6'),
-            'port'      => env('DB_PORT'),
-            'database'  => env('DB_DATABASE_6'),
-            'username'  => env('DB_USERNAME_6'),
-            'password'  => env('DB_PASSWORD_6'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
-        ],
-
-        'mysql7' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_7'),
-            'port'      => env('DB_PORT'),
-            'database'  => env('DB_DATABASE_7'),
-            'username'  => env('DB_USERNAME_7'),
-            'password'  => env('DB_PASSWORD_7'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
-        ],
-
-        'mysql9' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_9'),
-            'port'      => env('DB_PORT'),
-            'database'  => env('DB_DATABASE_9'),
-            'username'  => env('DB_USERNAME_9'),
-            'password'  => env('DB_PASSWORD_9'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
-        ],
-
-        'mysql10' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_10'),
-            'port'      => env('DB_PORT'),
-            'database'  => env('DB_DATABASE_10'),
-            'username'  => env('DB_USERNAME_10'),
-            'password'  => env('DB_PASSWORD_10'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
-        ],
-
-        'mysql11' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_11'),
-            'port'      => env('DB_PORT'),
-            'database'  => env('DB_DATABASE_11'),
-            'username'  => env('DB_USERNAME_11'),
-            'password'  => env('DB_PASSWORD_11'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
-        ],
-
-
-    ],
-];
\ No newline at end of file

From 9089e22ffdba35e8f8f40729348a3b4276e846ef Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Tue, 13 Apr 2021 12:09:18 +0800
Subject: [PATCH 12/60] serahan fix laporan

---
 app/Http/Controllers/TunaiController.php | 11 +++++++++++
 routes/web.php                           |  1 +
 2 files changed, 12 insertions(+)

diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php
index 5bc29d9..2bbc657 100644
--- a/app/Http/Controllers/TunaiController.php
+++ b/app/Http/Controllers/TunaiController.php
@@ -261,6 +261,17 @@ class TunaiController extends Controller
         return response()->json($requestteller);
     }
 
+    public function getRequestTellerLaporanSerahan($kodcaw,Request $request)
+    {
+       
+        $current = Carbon::now();
+        $current = new Carbon();
+        
+        $requestteller=RequestTeller::on('mysql7')->where([['kodcaw','=',$kodcaw],['update','=',1],['serahan','>',0],['kodlaluan','=',$request->teller],['tarikh','=',$current->toDateString()]])->get();
+
+        return response()->json($requestteller);
+    }
+
     public function getRequestTellerByDate($kodcaw,Request $request)
     {
        
diff --git a/routes/web.php b/routes/web.php
index bf08d0a..e1e379d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -246,6 +246,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //API REQUEST TELLER
     $router->post('requestTeller/{kodcaw}',['uses' => 'TunaiController@createRequestTeller']);
     $router->get('requestTeller/get/{kodcaw}',['uses' => 'TunaiController@getRequestTeller']);
+    $router->get('requestTeller/getlaporan/{kodcaw}',['uses' => 'TunaiController@getRequestTellerLaporanSerahan']);
     $router->get('requestTeller/get/{kodcaw}/date',['uses' => 'TunaiController@getRequestTellerByDate']);
     $router->put('requestTeller/update/{kodcaw}',['uses' => 'TunaiController@updateRequestTeller']);
     $router->put('requestTeller/batal/{kodcaw}',['uses' => 'TunaiController@batalRequestTeller']);

From d8cd16c0933ee9c91628ec39cda044ac2bd9f1f7 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 14 Apr 2021 00:12:11 +0800
Subject: [PATCH 13/60] fix imbang duga date

---
 app/Http/Controllers/GadaiController.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index dc1f026..ba23a9b 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1937,9 +1937,9 @@ class GadaiController extends Controller
             // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
-            if($request->tarikh > '2021-02-25')
+            if($request->tarikh > '2021-04-13')
             {
-                $request->tarikh = '2021-02-25';
+                $request->tarikh = '2021-04-13';
             }
         
             $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
@@ -1959,10 +1959,10 @@ class GadaiController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        if($request->tarikh > '2021-02-25'){
+        if($request->tarikh > '2021-04-14'){
         $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
         ->where('tagpalsu','=',0)
-        ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-02-25'],['sttebus','=','']])
+        ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-14'],['sttebus','=','']])
         // ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
         ->sum('pinjaman');
         }
@@ -1974,15 +1974,15 @@ class GadaiController extends Controller
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        $datetawarruq = new Carbon('2021-02-25');
+        $datetawarruq = new Carbon('2021-04-14');
         $daterequest = new Carbon($request->tarikh);
         $daterequest->addDays(1);
 
         $keuntungan = Gadai::on($cawangan['mysql'])
         ->where('t_gadai','<=',$request->tarikh)
-        ->where('t_gadai','>=','2021-03-14')
+        ->where('t_gadai','>=','2021-04-14')
         // ->where('sttebus','=','')
-        ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-03-14']])
+        ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
         ->whereNotNull('upah12')
         ->sum('upah12');
 
@@ -2000,7 +2000,7 @@ class GadaiController extends Controller
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        $datetawarruq = new Carbon('2021-02-25');
+        $datetawarruq = new Carbon('2021-04-14');
         $daterequest = new Carbon($request->tarikh);
         $daterequest->addDays(1);
 
@@ -2008,7 +2008,7 @@ class GadaiController extends Controller
         $current = new Carbon();
 
         $transaksi = TransaksiKeuntungan::on('mysql7')
-                    ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     ->where('db2.sttebus','=','')
                     ->where('tarikh_bayaran' ,'>=', $datetawarruq)
                     ->where('tarikh_bayaran' ,'<=', $daterequest)

From dbb0832d333f69ce692b45b66689ef054b1c0a88 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 14 Apr 2021 00:39:21 +0800
Subject: [PATCH 14/60] fix rebet tarikh

---
 app/Http/Controllers/TebusController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index b97ceb5..f14bd36 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -663,7 +663,7 @@ class TebusController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
         $rebet = Tebus::on($cawangan['mysql'])
-                ->where('t_tebus','>','2021-02-25')
+                ->where('t_tebus','>','2021-04-13')
                 ->where('t_tebus','<=',$request->tarikh)
                 ->sum('rebate');
 

From a3d2fa1dcf27c5e118f7840a251965a64b8b20f2 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 14 Apr 2021 00:57:51 +0800
Subject: [PATCH 15/60] fix keuntungan sebenar

---
 app/Http/Controllers/TebusController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index f14bd36..95c9f6b 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -507,7 +507,7 @@ class TebusController extends Controller
 
         $keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
             ->where('t_tebus','<=',$request->tarikh)
-            ->where('t_tebus','>=','2021-03-14')
+            ->where('t_tebus','>','2021-04-14')
             ->whereYear('t_tebus','=',$current->year)
             ->whereNotNull('bakiupah')
             ->sum('bakiupah');

From 54eec030c35a427c1aa97f7189083bd7a41c9875 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 14 Apr 2021 01:02:28 +0800
Subject: [PATCH 16/60] fix keuntungan sebenar pulok

---
 app/Http/Controllers/TebusController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 95c9f6b..8a153cb 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -507,7 +507,7 @@ class TebusController extends Controller
 
         $keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
             ->where('t_tebus','<=',$request->tarikh)
-            ->where('t_tebus','>','2021-04-14')
+            ->where('t_tebus','>','2021-04-13')
             ->whereYear('t_tebus','=',$current->year)
             ->whereNotNull('bakiupah')
             ->sum('bakiupah');

From 58df832f3229302f245171ac8183b7e49c373a90 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 14 Apr 2021 01:10:39 +0800
Subject: [PATCH 17/60] fix calculationbayaran

---
 app/Http/Controllers/GadaiController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index ba23a9b..f846a83 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2008,7 +2008,7 @@ class GadaiController extends Controller
         $current = new Carbon();
 
         $transaksi = TransaksiKeuntungan::on('mysql7')
-                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     ->where('db2.sttebus','=','')
                     ->where('tarikh_bayaran' ,'>=', $datetawarruq)
                     ->where('tarikh_bayaran' ,'<=', $daterequest)

From 2854e82e6772cf3d7fedc5b51c4fcb12c85fbbf8 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 14 Apr 2021 02:10:22 +0800
Subject: [PATCH 18/60] pembiayaan tawarruq

---
 app/Http/Controllers/GadaiController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index f846a83..d218e3e 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1959,10 +1959,10 @@ class GadaiController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        if($request->tarikh > '2021-04-14'){
+        if($request->tarikh > '2021-04-13'){
         $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
         ->where('tagpalsu','=',0)
-        ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-14'],['sttebus','=','']])
+        ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
         // ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
         ->sum('pinjaman');
         }

From e22fab7c5c4958870a59de22aa03e715fc89cad4 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 14 Apr 2021 03:13:13 +0800
Subject: [PATCH 19/60] merge yang lejer am

---
 app/Http/Controllers/TebusController.php      | 19 ++++++++++---------
 .../TransaksiKeuntunganController.php         | 17 +++++++++++++++++
 routes/web.php                                |  6 ++++++
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 8a153cb..049bc87 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -505,12 +505,12 @@ class TebusController extends Controller
         //     ->whereNotNull('rebate')
         //     ->sum('rebate');
 
-        $keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
-            ->where('t_tebus','<=',$request->tarikh)
-            ->where('t_tebus','>','2021-04-13')
-            ->whereYear('t_tebus','=',$current->year)
-            ->whereNotNull('bakiupah')
-            ->sum('bakiupah');
+        // $keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
+        //     ->where('t_tebus','<=',$request->tarikh)
+        //     ->where('t_tebus','>','2021-04-13')
+        //     ->whereYear('t_tebus','=',$current->year)
+        //     ->whereNotNull('bakiupah')
+        //     ->sum('bakiupah');
 
         $upahtebus = Tebus::on($cawangan['mysql'])
             ->where([['t_tebus','<=',$request->tarikh],['t_tebus','>','2013-12-31']])
@@ -530,10 +530,11 @@ class TebusController extends Controller
 
         $keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
 
-        $keuntunganselepastawarruq = $keuntunganselepastawarruqupah; 
+        // $keuntunganselepastawarruq = $keuntunganselepastawarruqupah; 
+        
+        // $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
 
-
-        $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
+        $total = $keuntungansebelumtawarruq;
 
         return response()->json($total,200);
     }
diff --git a/app/Http/Controllers/TransaksiKeuntunganController.php b/app/Http/Controllers/TransaksiKeuntunganController.php
index 7886d98..7b464c5 100644
--- a/app/Http/Controllers/TransaksiKeuntunganController.php
+++ b/app/Http/Controllers/TransaksiKeuntunganController.php
@@ -13,6 +13,23 @@ class TransaksiKeuntunganController extends Controller
         return response()->json($transaksi);
     }
 
+    public function getLatestTransaksi_Untung($norujukan)  //added byy fariz 20210413
+    {
+        $transaksi = TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id','desc')->limit(1)->get();
+        return response()->json($transaksi);
+    }
+  
+  
+    public function GetjumlahBayaranPendahuluan($norujukan)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh = $current->toDateString();
+    
+        $transaction=DB::connection('mysql7')->select( "SELECT SUM(bayaran_pembiayaan) AS total_byr_pendahuluan FROM transaksi_keuntungan  WHERE norujukan='".$norujukan."' AND  DATE( tarikh_bayaran) = '".$tarikh."'" );
+        return response()->json($transaction);
+    }
+
     public function createTransaksiKeuntungan(Request $request){
         $transaksi = TransaksiKeuntungan::on('mysql7')->create([
             'norujukan' => $request->norujukan,
diff --git a/routes/web.php b/routes/web.php
index e1e379d..e111cb3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -350,6 +350,12 @@ $router->group(['prefix'=>'api'], function () use ($router){
     
     //END IMBANG DUGA//
 
+    //ADDED LEJER AM
+
+    $router->get('latest_transaksi_untung/data/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']);  // new added 20210413
+    $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']);  // new added  20210413
+    
+
     //Komuditi Pukal
     $router->get('komuditi/check',['uses'=>'KomuditiController@checkKomuditi']);
     $router->post('komuditi/pembelian',['uses'=>'KomuditiController@beliKomuditi']);

From 94f8e8f32d98d1cab8872ac406cac4ae2ffcca33 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Thu, 15 Apr 2021 08:58:19 +0800
Subject: [PATCH 20/60] fix imbang duga

---
 app/Http/Controllers/GadaiController.php | 29 +++++++++++++++++++-----
 app/Http/Controllers/TebusController.php | 29 ++++++++++++++++++------
 app/Http/Controllers/VaultController.php | 16 +++++++++----
 3 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index d218e3e..f86772a 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1937,10 +1937,10 @@ class GadaiController extends Controller
             // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
-            if($request->tarikh > '2021-04-13')
-            {
-                $request->tarikh = '2021-04-13';
-            }
+            // if($request->tarikh > '2021-04-13')
+            // {
+            //     $request->tarikh = '2021-04-13';
+            // }
         
             $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
@@ -1948,6 +1948,12 @@ class GadaiController extends Controller
             ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
+            $gadaibaru = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',0)
+            ->where([['t_gadai','>=','2021-04-14'],['sttebus','=','']])
+            ->sum('pinjaman');
+
+            $rekod_pinjamandiberi = $rekod_pinjamandiberi - $gadaibaru;
 
         $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
 
@@ -1978,6 +1984,9 @@ class GadaiController extends Controller
         $daterequest = new Carbon($request->tarikh);
         $daterequest->addDays(1);
 
+        $current = Carbon::now();
+        $current = new Carbon();
+
         $keuntungan = Gadai::on($cawangan['mysql'])
         ->where('t_gadai','<=',$request->tarikh)
         ->where('t_gadai','>=','2021-04-14')
@@ -1987,10 +1996,18 @@ class GadaiController extends Controller
         ->sum('upah12');
 
         $transaksi = TransaksiKeuntungan::on('mysql7')
-        ->where('tarikh_bayaran' ,'>=', $datetawarruq)
-        ->where('tarikh_bayaran' ,'<=', $daterequest)
+        ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+        // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
+        ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
+        ->whereYear('tarikh_bayaran','=',$current->year)
+        ->whereNotNull('db2.hargajualan')
         ->sum('bayaran_keuntungan');
 
+        // $transaksi = TransaksiKeuntungan::on('mysql7')
+        // ->where('tarikh_bayaran' ,'>=', $datetawarruq)
+        // ->where('tarikh_bayaran' ,'<=', $daterequest)
+        // ->sum('bayaran_keuntungan');
+
         $totalkeuntungan = $keuntungan - $transaksi;
 
         return response()->json($totalkeuntungan,200);
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 049bc87..24b7f51 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -221,7 +221,6 @@ class TebusController extends Controller
         if(strpos($rebet_round,',')){
             $rebet_round = str_replace(',','',$rebet_round);
         }
-
         $rebet = (float)substr($rebet_round, 0, -1);
         
         return $rebet;
@@ -497,6 +496,16 @@ class TebusController extends Controller
         $keuntunganselepastawarruq = 0;
         $keuntungansebelumtawarruq = 0;
 
+        $daterequest = new Carbon($request->tarikh);
+        $daterequest->addDays(1);
+
+        //Keuntungan Selepas Tawarruq
+        $keuntungan = TransaksiKeuntungan::on('mysql7')
+            ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+            ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
+            ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
+            ->whereNull('db2.hargajualan')
+            ->sum('bayaran_keuntungan');
 
         // $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
         //     ->where('t_tebus','<=',$request->tarikh)
@@ -534,7 +543,7 @@ class TebusController extends Controller
         
         // $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
 
-        $total = $keuntungansebelumtawarruq;
+        $total = $keuntungansebelumtawarruq + $keuntungan;
 
         return response()->json($total,200);
     }
@@ -643,7 +652,9 @@ class TebusController extends Controller
 
     public function untungrugicalculation($kodcaw,Request $request)
     {
-        $datetawarruq = new Carbon('2021-02-25');
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        // $datetawarruq = new Carbon('2021-04-14');
         $daterequest = new Carbon($request->tarikh);
         $daterequest->addDays(1);
 
@@ -651,9 +662,11 @@ class TebusController extends Controller
         $current = new Carbon();
 
         $keuntungan = TransaksiKeuntungan::on('mysql7')
-                    ->where('tarikh_bayaran' ,'>=', $datetawarruq)
-                    ->where('tarikh_bayaran' ,'<=', $daterequest)
+                    ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
+                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
                     ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->whereNotNull('db2.hargajualan')
                     ->sum('bayaran_keuntungan');
 
         return response($keuntungan);
@@ -664,8 +677,10 @@ class TebusController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
         $rebet = Tebus::on($cawangan['mysql'])
-                ->where('t_tebus','>','2021-04-13')
-                ->where('t_tebus','<=',$request->tarikh)
+                ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
+                ->where('tebus.t_tebus','>','2021-04-13')
+                ->where('tebus.t_tebus','<=',$request->tarikh)
+                ->whereNotNull('db2.hargajualan')
                 ->sum('rebate');
 
         return response($rebet);
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index bb6392c..dacd164 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -255,13 +255,19 @@ class VaultController extends Controller
 
       $tunai = Tunai::on($cawangan['mysql'])
                ->where('kodcaw','=',$kodcaw)
-               ->where('tarikh','<=', $request->tarikh)
-               ->orderby('tarikh','desc')->first();
+               ->where('tarikh','=', $request->tarikh)
+               ->get();
 
-
-      if($tunai['baki'] != 0)
+      $total = 0;
+      foreach($tunai as $index=>$money)
       {
-         $totalbakiakhirtunai = $vault['bakiakhir'] + $tunai['baki'];
+         $total+=$money['baki'];
+      }
+
+
+      if($total != 0)
+      {
+         $totalbakiakhirtunai = $vault['bakiakhir'] + $total;
       }else
       {
          $totalbakiakhirtunai = $vault['bakiakhir'];

From 8855d0da7e40ba82bd233d19dec7c3cf8b0f58fb Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Fri, 16 Apr 2021 17:06:09 +0800
Subject: [PATCH 21/60] fix gadai imbangduga

---
 app/Http/Controllers/GadaiController.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index f86772a..8254c8f 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1937,11 +1937,6 @@ class GadaiController extends Controller
             // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
-            // if($request->tarikh > '2021-04-13')
-            // {
-            //     $request->tarikh = '2021-04-13';
-            // }
-        
             $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
             ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
@@ -1950,7 +1945,7 @@ class GadaiController extends Controller
 
             $gadaibaru = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
-            ->where([['t_gadai','>=','2021-04-14'],['sttebus','=','']])
+            ->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
             $rekod_pinjamandiberi = $rekod_pinjamandiberi - $gadaibaru;

From e350d84c27d30978d2bb5ecb3668b09f43044b49 Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Fri, 16 Apr 2021 20:52:16 +0800
Subject: [PATCH 22/60] add ubah wakil

---
 app/Http/Controllers/TebusController.php | 13 +++++++++++++
 routes/web.php                           |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 24b7f51..cbdb49d 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -436,6 +436,19 @@ class TebusController extends Controller
         return response()->json($wakil_create ,201);
     }
 
+    public function UbahWakil($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $wakil = $request->nowakil;
+
+        $update_wakil = Tebus::on($cawangan['mysql'])->where('norujukan','=',$request->norujukan)->update(array(
+            "nowakil" => $wakil
+        ));
+
+        return response()->json($update_wakil ,201);
+    }
+
     public function listhistorypenebusan($kodcaw,Request $request){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
diff --git a/routes/web.php b/routes/web.php
index e111cb3..5ae739a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -255,7 +255,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']);
     $router->get('getwakil/{kodcaw}/{icno}',['uses' => 'TebusController@getWakil']);
     $router->get('getwakil/{kodcaw}/code/{nowakil}',['uses' => 'TebusController@getWakilbycode']);
-    
+    $router->put('ubahwakil/{kodcaw}',['uses'=>'TebusController@UbahWakil']);
     $router->post('createwakil/{kodcaw}/{icno}',['uses' => 'TebusController@createWakil']);
 
     //update tagterima Tebus

From b2d1f512fb13c6afcd98d07a0146192986f52bc8 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Fri, 16 Apr 2021 23:34:58 +0800
Subject: [PATCH 23/60] buat kemaskini upah

---
 .../Controllers/TransactionController.php     | 16 ++++++
 app/Pengguna.php                              | 54 +++++++++++++++++++
 routes/web.php                                |  3 ++
 3 files changed, 73 insertions(+)
 create mode 100644 app/Pengguna.php

diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index 141bb02..da7c4c8 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -3,6 +3,9 @@
 namespace App\Http\Controllers;
 
 use App\Transaction;
+use App\Pengguna;
+use App\Cawangan;
+
 use Illuminate\Http\Request;
 
 use Carbon\Carbon;
@@ -68,4 +71,17 @@ class TransactionController extends Controller
 
         return response()->json($transaction);
     }
+
+    public function GetPengguna($kodcaw,Request $request)
+    {
+        $namateller = $request->namateller;
+
+        $namateller = 'NUR ADNIN BINTI MOHAMED';
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $pengguna=Pengguna::on($cawangan['mysql'])
+                ->where('nama','=',$namateller)->limit(1)->get();
+
+        return response()->json($pengguna);
+    }
 }
\ No newline at end of file
diff --git a/app/Pengguna.php b/app/Pengguna.php
new file mode 100644
index 0000000..a0ad7b9
--- /dev/null
+++ b/app/Pengguna.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Pengguna extends Model
+{
+    protected $table = 'pengguna';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+      'kodcaw',
+      'kodlaluan',
+      'katalaluan',
+      'taraf', 
+      'nama',
+      'kplama',
+      'kpbaru',
+      'pinjmax',
+      'limittunait',
+      'limittunaip',
+      'status',
+      't_luput',
+      'flag',
+      'created_by',
+      'last_modified_by',
+      't_daftar',
+      'date_created',
+      'pinjmaxxtra',
+      'pengganti',
+      'khazanahtemp',
+      'ppo',
+      'settingtetap',
+      'autoberat',
+      'perubatan',
+      'tagperubatan',
+      'pptetap',
+      'kktetap',
+      'mmtetap',
+      'tellertetap'
+    ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 5ae739a..45b2db8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -320,6 +320,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('jumlahBayaranOnlineAll/data/{kodcaw}',['uses'=>'TransactionController@JumlahBayaranOnline_Keseluruhan']);  //transaction kira sum  all bayaran online cawangan
     
 
+    //NAMA PENGGUNA TAMBAH KODLALUAN
+    $router->get('get/pengguna/{kodcaw}',['uses'=>'TransactionController@GetPengguna']);
+
     //IMBANG DUGA//
 
     //Dua-Dua Table

From 51825fa8aab957e4e60680dca799e73789dfd812 Mon Sep 17 00:00:00 2001
From: fariz <farizsite@yahoo.com>
Date: Sat, 17 Apr 2021 00:25:29 +0800
Subject: [PATCH 24/60] update Transaksi_Keuntungan Controller

---
 .../TransaksiKeuntunganController.php         |    2 +
 composer.lock                                 | 1202 ++---------------
 config/database.php                           |  288 +---
 routes/web.php                                |    6 +
 4 files changed, 114 insertions(+), 1384 deletions(-)

diff --git a/app/Http/Controllers/TransaksiKeuntunganController.php b/app/Http/Controllers/TransaksiKeuntunganController.php
index 7b464c5..3fb406c 100644
--- a/app/Http/Controllers/TransaksiKeuntunganController.php
+++ b/app/Http/Controllers/TransaksiKeuntunganController.php
@@ -4,6 +4,8 @@ namespace App\Http\Controllers;
 
 use App\TransaksiKeuntungan;
 use Illuminate\Http\Request;
+use Carbon\Carbon;
+use DB;
 
 class TransaksiKeuntunganController extends Controller
 {
diff --git a/composer.lock b/composer.lock
index e8abc6c..b1c187c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,35 +8,31 @@
     "packages": [
         {
             "name": "auth0/auth0-php",
-            "version": "7.7.0",
+            "version": "7.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/auth0/auth0-PHP.git",
-                "reference": "1335f7dee53c7afb8614049c05518e6b8d30eb84"
+                "reference": "29c74a3d6c7ff7c3c1d294d204ecabcb83e589e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/auth0/auth0-PHP/zipball/1335f7dee53c7afb8614049c05518e6b8d30eb84",
-                "reference": "1335f7dee53c7afb8614049c05518e6b8d30eb84",
+                "url": "https://api.github.com/repos/auth0/auth0-PHP/zipball/29c74a3d6c7ff7c3c1d294d204ecabcb83e589e1",
+                "reference": "29c74a3d6c7ff7c3c1d294d204ecabcb83e589e1",
                 "shasum": ""
             },
             "require": {
-                "auth0/php-jwt": "3.3.4",
                 "ext-json": "*",
-                "ext-openssl": "*",
-                "guzzlehttp/guzzle": "^7.2",
-                "php": "^7.3 | ^8.0",
+                "guzzlehttp/guzzle": "~6.0 | ~7.0",
+                "lcobucci/jwt": "^3.3",
+                "php": "^7.1",
                 "psr/simple-cache": "^1.0"
             },
             "require-dev": {
-                "cache/adapter-common": "^1.2",
-                "cache/array-adapter": "^1.1",
-                "cache/hierarchical-cache": "^1.1",
+                "cache/array-adapter": "^1.0",
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
-                "josegonzalez/dotenv": "^3.2",
+                "josegonzalez/dotenv": "^2.0",
                 "phpcompatibility/php-compatibility": "^8.1",
-                "phpstan/phpstan": "^0.12.64",
-                "phpunit/phpunit": "^9.3",
+                "phpunit/phpunit": "^7.0",
                 "squizlabs/php_codesniffer": "^3.2"
             },
             "type": "library",
@@ -58,79 +54,7 @@
             ],
             "description": "Auth0 PHP SDK.",
             "homepage": "https://github.com/auth0/auth0-PHP",
-            "support": {
-                "issues": "https://github.com/auth0/auth0-PHP/issues",
-                "source": "https://github.com/auth0/auth0-PHP/tree/7.7.0"
-            },
-            "time": "2021-03-19T20:04:00+00:00"
-        },
-        {
-            "name": "auth0/php-jwt",
-            "version": "3.3.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/auth0/php-jwt.git",
-                "reference": "a0daa1a728cf85230843ebb8c1183047fe493284"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/auth0/php-jwt/zipball/a0daa1a728cf85230843ebb8c1183047fe493284",
-                "reference": "a0daa1a728cf85230843ebb8c1183047fe493284",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "ext-openssl": "*",
-                "php": "^5.6 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "mikey179/vfsstream": "~1.5",
-                "phpmd/phpmd": "~2.2",
-                "phpunit/php-invoker": "~1.1",
-                "phpunit/phpunit": "^5.7 || ^7.3",
-                "squizlabs/php_codesniffer": "~2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Lcobucci\\JWT\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Luís Otávio Cobucci Oblonczyk",
-                    "email": "lcobucci@gmail.com",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A simple library to work with JSON Web Token and JSON Web Signature",
-            "keywords": [
-                "JWS",
-                "jwt"
-            ],
-            "support": {
-                "source": "https://github.com/auth0/php-jwt/tree/3.3.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/lcobucci",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/lcobucci",
-                    "type": "patreon"
-                }
-            ],
-            "time": "2021-01-04T20:39:06+00:00"
+            "time": "2020-11-16T13:00:36+00:00"
         },
         {
             "name": "brick/math",
@@ -176,16 +100,6 @@
                 "brick",
                 "math"
             ],
-            "support": {
-                "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.9.2"
-            },
-            "funding": [
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/brick/math",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-01-20T22:51:39+00:00"
         },
         {
@@ -263,24 +177,6 @@
                 "uppercase",
                 "words"
             ],
-            "support": {
-                "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.x"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-29T15:13:26+00:00"
         },
         {
@@ -343,24 +239,6 @@
                 "parser",
                 "php"
             ],
-            "support": {
-                "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/1.2.1"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-25T17:44:05+00:00"
         },
         {
@@ -415,16 +293,6 @@
                 "cron",
                 "schedule"
             ],
-            "support": {
-                "issues": "https://github.com/dragonmantank/cron-expression/issues",
-                "source": "https://github.com/dragonmantank/cron-expression/tree/v2.3.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/dragonmantank",
-                    "type": "github"
-                }
-            ],
             "time": "2020-10-13T00:52:37+00:00"
         },
         {
@@ -483,16 +351,6 @@
                 "validation",
                 "validator"
             ],
-            "support": {
-                "issues": "https://github.com/egulias/EmailValidator/issues",
-                "source": "https://github.com/egulias/EmailValidator/tree/2.1.25"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/egulias",
-                    "type": "github"
-                }
-            ],
             "time": "2020-12-29T14:50:06+00:00"
         },
         {
@@ -574,28 +432,6 @@
                 "rest",
                 "web service"
             ],
-            "support": {
-                "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.3.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/Nyholm",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/alexeyshockov",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/gmponos",
-                    "type": "github"
-                }
-            ],
             "time": "2021-03-23T11:33:13+00:00"
         },
         {
@@ -647,10 +483,6 @@
             "keywords": [
                 "promise"
             ],
-            "support": {
-                "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.4.1"
-            },
             "time": "2021-03-07T09:25:29+00:00"
         },
         {
@@ -722,10 +554,6 @@
                 "uri",
                 "url"
             ],
-            "support": {
-                "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.8.1"
-            },
             "time": "2021-03-21T16:25:00+00:00"
         },
         {
@@ -777,10 +605,6 @@
             ],
             "description": "The Illuminate Auth package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-27T15:11:37+00:00"
         },
         {
@@ -832,10 +656,6 @@
             ],
             "description": "The Illuminate Broadcasting package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-11-21T14:36:22+00:00"
         },
         {
@@ -884,10 +704,6 @@
             ],
             "description": "The Illuminate Bus package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-27T15:11:37+00:00"
         },
         {
@@ -939,10 +755,6 @@
             ],
             "description": "The Illuminate Cache package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-27T15:11:37+00:00"
         },
         {
@@ -987,10 +799,6 @@
             ],
             "description": "The Illuminate Config package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-27T15:11:37+00:00"
         },
         {
@@ -1045,10 +853,6 @@
             ],
             "description": "The Illuminate Console package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-27T19:51:21+00:00"
         },
         {
@@ -1096,10 +900,6 @@
             ],
             "description": "The Illuminate Container package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-27T16:17:28+00:00"
         },
         {
@@ -1144,10 +944,6 @@
             ],
             "description": "The Illuminate Contracts package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-12-18T14:19:44+00:00"
         },
         {
@@ -1210,10 +1006,6 @@
                 "orm",
                 "sql"
             ],
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2021-01-21T14:08:35+00:00"
         },
         {
@@ -1261,10 +1053,6 @@
             ],
             "description": "The Illuminate Encryption package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-27T15:11:37+00:00"
         },
         {
@@ -1310,10 +1098,6 @@
             ],
             "description": "The Illuminate Events package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-27T15:11:37+00:00"
         },
         {
@@ -1369,10 +1153,6 @@
             ],
             "description": "The Illuminate Filesystem package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-27T15:11:37+00:00"
         },
         {
@@ -1417,10 +1197,6 @@
             ],
             "description": "The Illuminate Hashing package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-27T15:11:37+00:00"
         },
         {
@@ -1473,10 +1249,6 @@
             ],
             "description": "The Illuminate Http package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2021-01-21T14:08:35+00:00"
         },
         {
@@ -1522,10 +1294,6 @@
             ],
             "description": "The Illuminate Log package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-27T15:11:37+00:00"
         },
         {
@@ -1571,10 +1339,6 @@
             ],
             "description": "The Illuminate Pagination package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-27T15:11:37+00:00"
         },
         {
@@ -1619,10 +1383,6 @@
             ],
             "description": "The Illuminate Pipeline package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-27T15:11:37+00:00"
         },
         {
@@ -1683,10 +1443,6 @@
             ],
             "description": "The Illuminate Queue package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-11-18T14:37:23+00:00"
         },
         {
@@ -1738,10 +1494,6 @@
             ],
             "description": "The Illuminate Session package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-27T15:11:37+00:00"
         },
         {
@@ -1804,10 +1556,6 @@
             ],
             "description": "The Illuminate Support package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-12-22T16:12:23+00:00"
         },
         {
@@ -1860,10 +1608,6 @@
             ],
             "description": "The Illuminate Testing package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-31T18:35:25+00:00"
         },
         {
@@ -1910,10 +1654,6 @@
             ],
             "description": "The Illuminate Translation package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-27T15:11:37+00:00"
         },
         {
@@ -1967,10 +1707,6 @@
             ],
             "description": "The Illuminate Validation package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2021-01-13T13:37:00+00:00"
         },
         {
@@ -2019,10 +1755,6 @@
             ],
             "description": "The Illuminate View package.",
             "homepage": "https://laravel.com",
-            "support": {
-                "issues": "https://github.com/laravel/framework/issues",
-                "source": "https://github.com/laravel/framework"
-            },
             "time": "2020-10-27T15:11:37+00:00"
         },
         {
@@ -2114,12 +1846,71 @@
                 "laravel",
                 "lumen"
             ],
-            "support": {
-                "issues": "https://github.com/laravel/lumen-framework/issues",
-                "source": "https://github.com/laravel/lumen-framework"
-            },
             "time": "2020-09-15T14:53:08+00:00"
         },
+        {
+            "name": "lcobucci/jwt",
+            "version": "3.4.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/lcobucci/jwt.git",
+                "reference": "511629a54465e89a31d3d7e4cf0935feab8b14c1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/511629a54465e89a31d3d7e4cf0935feab8b14c1",
+                "reference": "511629a54465e89a31d3d7e4cf0935feab8b14c1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "ext-openssl": "*",
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "mikey179/vfsstream": "~1.5",
+                "phpmd/phpmd": "~2.2",
+                "phpunit/php-invoker": "~1.1",
+                "phpunit/phpunit": "^5.7 || ^7.3",
+                "squizlabs/php_codesniffer": "~2.3"
+            },
+            "suggest": {
+                "lcobucci/clock": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Lcobucci\\JWT\\": "src"
+                },
+                "files": [
+                    "compat/class-aliases.php",
+                    "compat/json-exception-polyfill.php",
+                    "compat/lcobucci-clock-polyfill.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Luís Otávio Cobucci Oblonczyk",
+                    "email": "lcobucci@gmail.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A simple library to work with JSON Web Token and JSON Web Signature",
+            "keywords": [
+                "JWS",
+                "jwt"
+            ],
+            "time": "2021-02-16T09:40:01+00:00"
+        },
         {
             "name": "monolog/monolog",
             "version": "2.2.0",
@@ -2200,20 +1991,6 @@
                 "logging",
                 "psr-3"
             ],
-            "support": {
-                "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/2.2.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/Seldaek",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-12-14T13:15:25+00:00"
         },
         {
@@ -2293,20 +2070,6 @@
                 "datetime",
                 "time"
             ],
-            "support": {
-                "issues": "https://github.com/briannesbitt/Carbon/issues",
-                "source": "https://github.com/briannesbitt/Carbon"
-            },
-            "funding": [
-                {
-                    "url": "https://opencollective.com/Carbon",
-                    "type": "open_collective"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-02-24T17:30:44+00:00"
         },
         {
@@ -2353,24 +2116,20 @@
                 "router",
                 "routing"
             ],
-            "support": {
-                "issues": "https://github.com/nikic/FastRoute/issues",
-                "source": "https://github.com/nikic/FastRoute/tree/master"
-            },
             "time": "2018-02-13T20:26:39+00:00"
         },
         {
             "name": "opis/closure",
-            "version": "3.6.1",
+            "version": "3.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/opis/closure.git",
-                "reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5"
+                "reference": "06e2ebd25f2869e54a306dda991f7db58066f7f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/opis/closure/zipball/943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5",
-                "reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5",
+                "url": "https://api.github.com/repos/opis/closure/zipball/06e2ebd25f2869e54a306dda991f7db58066f7f6",
+                "reference": "06e2ebd25f2869e54a306dda991f7db58066f7f6",
                 "shasum": ""
             },
             "require": {
@@ -2418,11 +2177,7 @@
                 "serialization",
                 "serialize"
             ],
-            "support": {
-                "issues": "https://github.com/opis/closure/issues",
-                "source": "https://github.com/opis/closure/tree/3.6.1"
-            },
-            "time": "2020-11-07T02:01:34+00:00"
+            "time": "2021-04-09T13:42:10+00:00"
         },
         {
             "name": "phpoption/phpoption",
@@ -2477,20 +2232,6 @@
                 "php",
                 "type"
             ],
-            "support": {
-                "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.7.5"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-20T17:29:33+00:00"
         },
         {
@@ -2535,10 +2276,6 @@
                 "container-interop",
                 "psr"
             ],
-            "support": {
-                "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/1.1.1"
-            },
             "time": "2021-03-05T17:36:06+00:00"
         },
         {
@@ -2585,10 +2322,6 @@
                 "psr",
                 "psr-14"
             ],
-            "support": {
-                "issues": "https://github.com/php-fig/event-dispatcher/issues",
-                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
-            },
             "time": "2019-01-08T18:20:26+00:00"
         },
         {
@@ -2638,9 +2371,6 @@
                 "psr",
                 "psr-18"
             ],
-            "support": {
-                "source": "https://github.com/php-fig/http-client/tree/master"
-            },
             "time": "2020-06-29T06:28:15+00:00"
         },
         {
@@ -2691,9 +2421,6 @@
                 "request",
                 "response"
             ],
-            "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
-            },
             "time": "2016-08-06T14:39:51+00:00"
         },
         {
@@ -2741,9 +2468,6 @@
                 "psr",
                 "psr-3"
             ],
-            "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.3"
-            },
             "time": "2020-03-23T09:12:05+00:00"
         },
         {
@@ -2792,9 +2516,6 @@
                 "psr-16",
                 "simple-cache"
             ],
-            "support": {
-                "source": "https://github.com/php-fig/simple-cache/tree/master"
-            },
             "time": "2017-10-23T01:57:42+00:00"
         },
         {
@@ -2835,10 +2556,6 @@
                 }
             ],
             "description": "A polyfill for getallheaders.",
-            "support": {
-                "issues": "https://github.com/ralouphie/getallheaders/issues",
-                "source": "https://github.com/ralouphie/getallheaders/tree/develop"
-            },
             "time": "2019-03-08T08:55:37+00:00"
         },
         {
@@ -2902,20 +2619,6 @@
                 "queue",
                 "set"
             ],
-            "support": {
-                "issues": "https://github.com/ramsey/collection/issues",
-                "source": "https://github.com/ramsey/collection/tree/1.1.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/ramsey",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/ramsey/collection",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-01-21T17:40:04+00:00"
         },
         {
@@ -2997,17 +2700,6 @@
                 "identifier",
                 "uuid"
             ],
-            "support": {
-                "issues": "https://github.com/ramsey/uuid/issues",
-                "rss": "https://github.com/ramsey/uuid/releases.atom",
-                "source": "https://github.com/ramsey/uuid"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/ramsey",
-                    "type": "github"
-                }
-            ],
             "time": "2020-08-18T17:17:46+00:00"
         },
         {
@@ -3088,23 +2780,6 @@
                 "console",
                 "terminal"
             ],
-            "support": {
-                "source": "https://github.com/symfony/console/tree/v5.2.6"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-03-28T09:42:18+00:00"
         },
         {
@@ -3155,23 +2830,6 @@
             ],
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/master"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
@@ -3224,23 +2882,6 @@
             ],
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v5.2.6"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-03-16T09:07:47+00:00"
         },
         {
@@ -3309,23 +2950,6 @@
             ],
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.2.4"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-02-18T17:12:37+00:00"
         },
         {
@@ -3388,23 +3012,6 @@
                 "interoperability",
                 "standards"
             ],
-            "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.2.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
@@ -3449,23 +3056,6 @@
             ],
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.2.4"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-02-15T18:55:04+00:00"
         },
         {
@@ -3528,23 +3118,6 @@
                 "interoperability",
                 "standards"
             ],
-            "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v2.3.1"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-14T17:08:19+00:00"
         },
         {
@@ -3601,23 +3174,6 @@
             ],
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v5.2.4"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-02-25T17:16:57+00:00"
         },
         {
@@ -3713,23 +3269,6 @@
             ],
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v5.2.6"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-03-29T05:16:58+00:00"
         },
         {
@@ -3796,23 +3335,6 @@
                 "mime",
                 "mime-type"
             ],
-            "support": {
-                "source": "https://github.com/symfony/mime/tree/v5.2.6"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-03-12T13:18:39+00:00"
         },
         {
@@ -3875,23 +3397,6 @@
                 "polyfill",
                 "portable"
             ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-01-07T16:49:33+00:00"
         },
         {
@@ -3956,23 +3461,6 @@
                 "portable",
                 "shim"
             ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.1"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-01-22T09:19:47+00:00"
         },
         {
@@ -4043,23 +3531,6 @@
                 "portable",
                 "shim"
             ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.1"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-01-22T09:19:47+00:00"
         },
         {
@@ -4127,23 +3598,6 @@
                 "portable",
                 "shim"
             ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-01-22T09:19:47+00:00"
         },
         {
@@ -4207,23 +3661,6 @@
                 "portable",
                 "shim"
             ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-01-22T09:19:47+00:00"
         },
         {
@@ -4283,23 +3720,6 @@
                 "portable",
                 "shim"
             ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-01-07T16:49:33+00:00"
         },
         {
@@ -4362,23 +3782,6 @@
                 "portable",
                 "shim"
             ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-01-07T16:49:33+00:00"
         },
         {
@@ -4445,23 +3848,6 @@
                 "portable",
                 "shim"
             ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-01-07T16:49:33+00:00"
         },
         {
@@ -4507,23 +3893,6 @@
             ],
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/process/tree/v5.2.4"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-01-27T10:15:41+00:00"
         },
         {
@@ -4586,23 +3955,6 @@
                 "interoperability",
                 "standards"
             ],
-            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/master"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
@@ -4669,23 +4021,6 @@
                 "utf-8",
                 "utf8"
             ],
-            "support": {
-                "source": "https://github.com/symfony/string/tree/v5.2.6"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-03-17T17:12:15+00:00"
         },
         {
@@ -4762,23 +4097,6 @@
             ],
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/translation/tree/v5.2.6"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-03-23T19:33:48+00:00"
         },
         {
@@ -4840,23 +4158,6 @@
                 "interoperability",
                 "standards"
             ],
-            "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v2.3.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-09-28T13:05:58+00:00"
         },
         {
@@ -4928,23 +4229,6 @@
                 "debug",
                 "dump"
             ],
-            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.2.6"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-03-28T09:42:18+00:00"
         },
         {
@@ -5009,20 +4293,6 @@
                 "env",
                 "environment"
             ],
-            "support": {
-                "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/v4.2.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-01-20T15:11:48+00:00"
         },
         {
@@ -5071,32 +4341,6 @@
                 "clean",
                 "php"
             ],
-            "support": {
-                "issues": "https://github.com/voku/portable-ascii/issues",
-                "source": "https://github.com/voku/portable-ascii/tree/1.5.6"
-            },
-            "funding": [
-                {
-                    "url": "https://www.paypal.me/moelleken",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/voku",
-                    "type": "github"
-                },
-                {
-                    "url": "https://opencollective.com/portable-ascii",
-                    "type": "open_collective"
-                },
-                {
-                    "url": "https://www.patreon.com/voku",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-12T00:07:28+00:00"
         }
     ],
@@ -5150,24 +4394,6 @@
                 "constructor",
                 "instantiate"
             ],
-            "support": {
-                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-10T18:47:58+00:00"
         },
         {
@@ -5218,10 +4444,6 @@
                 "faker",
                 "fixtures"
             ],
-            "support": {
-                "issues": "https://github.com/fzaninotto/Faker/issues",
-                "source": "https://github.com/fzaninotto/Faker/tree/v1.9.2"
-            },
             "abandoned": true,
             "time": "2020-12-11T09:56:16+00:00"
         },
@@ -5270,41 +4492,34 @@
             "keywords": [
                 "test"
             ],
-            "support": {
-                "issues": "https://github.com/hamcrest/hamcrest-php/issues",
-                "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1"
-            },
             "time": "2020-07-09T08:09:16+00:00"
         },
         {
             "name": "mockery/mockery",
-            "version": "1.4.3",
+            "version": "1.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "d1339f64479af1bee0e82a0413813fe5345a54ea"
+                "reference": "31467aeb3ca3188158613322d66df81cedd86626"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/d1339f64479af1bee0e82a0413813fe5345a54ea",
-                "reference": "d1339f64479af1bee0e82a0413813fe5345a54ea",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/31467aeb3ca3188158613322d66df81cedd86626",
+                "reference": "31467aeb3ca3188158613322d66df81cedd86626",
                 "shasum": ""
             },
             "require": {
                 "hamcrest/hamcrest-php": "^2.0.1",
                 "lib-pcre": ">=7.0",
-                "php": "^7.3 || ^8.0"
-            },
-            "conflict": {
-                "phpunit/phpunit": "<8.0"
+                "php": ">=5.6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5 || ^9.3"
+                "phpunit/phpunit": "^5.7.10|^6.5|^7.5|^8.5|^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4.x-dev"
+                    "dev-master": "1.3.x-dev"
                 }
             },
             "autoload": {
@@ -5342,11 +4557,7 @@
                 "test double",
                 "testing"
             ],
-            "support": {
-                "issues": "https://github.com/mockery/mockery/issues",
-                "source": "https://github.com/mockery/mockery/tree/1.4.3"
-            },
-            "time": "2021-02-24T09:51:49+00:00"
+            "time": "2021-02-24T09:51:00+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -5394,16 +4605,6 @@
                 "object",
                 "object graph"
             ],
-            "support": {
-                "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
-            },
-            "funding": [
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-13T09:40:50+00:00"
         },
         {
@@ -5460,10 +4661,6 @@
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "support": {
-                "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/master"
-            },
             "time": "2020-06-27T14:33:11+00:00"
         },
         {
@@ -5511,10 +4708,6 @@
                 }
             ],
             "description": "Library for handling version information and constraints",
-            "support": {
-                "issues": "https://github.com/phar-io/version/issues",
-                "source": "https://github.com/phar-io/version/tree/3.1.0"
-            },
             "time": "2021-02-23T14:00:09+00:00"
         },
         {
@@ -5564,10 +4757,6 @@
                 "reflection",
                 "static analysis"
             ],
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
-            },
             "time": "2020-06-27T09:03:43+00:00"
         },
         {
@@ -5620,10 +4809,6 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
-            },
             "time": "2020-09-03T19:13:55+00:00"
         },
         {
@@ -5669,10 +4854,6 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
-            },
             "time": "2020-09-17T18:55:26+00:00"
         },
         {
@@ -5736,10 +4917,6 @@
                 "spy",
                 "stub"
             ],
-            "support": {
-                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/1.13.0"
-            },
             "time": "2021-03-17T13:42:18+00:00"
         },
         {
@@ -5803,16 +4980,6 @@
                 "testing",
                 "xunit"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.14"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-12-02T13:39:03+00:00"
         },
         {
@@ -5863,16 +5030,6 @@
                 "filesystem",
                 "iterator"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T08:25:21+00:00"
         },
         {
@@ -5914,10 +5071,6 @@
             "keywords": [
                 "template"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
-            },
             "time": "2015-06-21T13:50:34+00:00"
         },
         {
@@ -5967,43 +5120,33 @@
             "keywords": [
                 "timer"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T08:20:02+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "4.0.4",
+            "version": "3.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3"
+                "reference": "472b687829041c24b25f475e14c2f38a09edf1c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3",
-                "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/472b687829041c24b25f475e14c2f38a09edf1c2",
+                "reference": "472b687829041c24b25f475e14c2f38a09edf1c2",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": "^7.3 || ^8.0"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -6026,18 +5169,8 @@
             "keywords": [
                 "tokenizer"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
-                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "abandoned": true,
-            "time": "2020-08-04T08:28:15+00:00"
+            "time": "2020-11-30T08:38:46+00:00"
         },
         {
             "name": "phpunit/phpunit",
@@ -6120,20 +5253,6 @@
                 "testing",
                 "xunit"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.15"
-            },
-            "funding": [
-                {
-                    "url": "https://phpunit.de/donate.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2021-03-17T07:27:54+00:00"
         },
         {
@@ -6179,16 +5298,6 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T08:15:22+00:00"
         },
         {
@@ -6253,16 +5362,6 @@
                 "compare",
                 "equality"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T08:04:30+00:00"
         },
         {
@@ -6319,16 +5418,6 @@
                 "unidiff",
                 "unified diff"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:59:04+00:00"
         },
         {
@@ -6382,16 +5471,6 @@
                 "environment",
                 "hhvm"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:53:42+00:00"
         },
         {
@@ -6459,16 +5538,6 @@
                 "export",
                 "exporter"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:47:53+00:00"
         },
         {
@@ -6523,16 +5592,6 @@
             "keywords": [
                 "global state"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:43:24+00:00"
         },
         {
@@ -6580,16 +5639,6 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:40:27+00:00"
         },
         {
@@ -6635,16 +5684,6 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:37:18+00:00"
         },
         {
@@ -6698,16 +5737,6 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:34:24+00:00"
         },
         {
@@ -6750,16 +5779,6 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:30:19+00:00"
         },
         {
@@ -6806,16 +5825,6 @@
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
             "homepage": "https://github.com/sebastianbergmann/type",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/1.1.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:25:11+00:00"
         },
         {
@@ -6859,10 +5868,6 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/master"
-            },
             "time": "2016-10-03T07:35:21+00:00"
         },
         {
@@ -6903,16 +5908,6 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "support": {
-                "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/master"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/theseer",
-                    "type": "github"
-                }
-            ],
             "time": "2020-07-12T23:59:07+00:00"
         },
         {
@@ -6967,10 +5962,6 @@
                 "check",
                 "validate"
             ],
-            "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
-            },
             "time": "2021-03-09T10:59:23+00:00"
         }
     ],
@@ -6982,6 +5973,5 @@
     "platform": {
         "php": "^7.2.5"
     },
-    "platform-dev": [],
-    "plugin-api-version": "2.0.0"
+    "platform-dev": []
 }
diff --git a/config/database.php b/config/database.php
index 5bbaca8..ad35752 100644
--- a/config/database.php
+++ b/config/database.php
@@ -21,7 +21,7 @@ return [
         'mysql2' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_2'),
-            'port'      => env('DB_PORT_2'),
+            'port'      => env('DB_PORT'),
             'database'  => env('DB_DATABASE_2'),
             'username'  => env('DB_USERNAME_2'),
             'password'  => env('DB_PASSWORD_2'),
@@ -34,7 +34,7 @@ return [
         'mysql3' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_3'),
-            'port'      => env('DB_PORT_3'),
+            'port'      => env('DB_PORT'),
             'database'  => env('DB_DATABASE_3'),
             'username'  => env('DB_USERNAME_3'),
             'password'  => env('DB_PASSWORD_3'),
@@ -42,13 +42,12 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-
         ],
 
         'mysql4' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_4'),
-            'port'      => env('DB_PORT_4'),
+            'port'      => env('DB_PORT'),
             'database'  => env('DB_DATABASE_4'),
             'username'  => env('DB_USERNAME_4'),
             'password'  => env('DB_PASSWORD_4'),
@@ -61,7 +60,7 @@ return [
         'mysql5' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_5'),
-            'port'      => env('DB_PORT_5'),
+            'port'      => env('DB_PORT'),
             'database'  => env('DB_DATABASE_5'),
             'username'  => env('DB_USERNAME_5'),
             'password'  => env('DB_PASSWORD_5'),
@@ -74,7 +73,7 @@ return [
         'mysql6' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_6'),
-            'port'      => env('DB_PORT_6'),
+            'port'      => env('DB_PORT'),
             'database'  => env('DB_DATABASE_6'),
             'username'  => env('DB_USERNAME_6'),
             'password'  => env('DB_PASSWORD_6'),
@@ -87,7 +86,7 @@ return [
         'mysql7' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_7'),
-            'port'      => env('DB_PORT_7'),
+            'port'      => env('DB_PORT'),
             'database'  => env('DB_DATABASE_7'),
             'username'  => env('DB_USERNAME_7'),
             'password'  => env('DB_PASSWORD_7'),
@@ -96,11 +95,10 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-
         'mysql8' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_8'),
-            'port'      => env('DB_PORT_8'),
+            'port'      => env('DB_PORT'),
             'database'  => env('DB_DATABASE_8'),
             'username'  => env('DB_USERNAME_8'),
             'password'  => env('DB_PASSWORD_8'),
@@ -121,11 +119,10 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-
         'mysql10' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_10'),
-            'port'      => env('DB_PORT_10'),
+            'port'      => env('DB_PORT'),
             'database'  => env('DB_DATABASE_10'),
             'username'  => env('DB_USERNAME_10'),
             'password'  => env('DB_PASSWORD_10'),
@@ -134,11 +131,10 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-
         'mysql11' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_11'),
-            'port'      => env('DB_PORT_11'),
+            'port'      => env('DB_PORT'),
             'database'  => env('DB_DATABASE_11'),
             'username'  => env('DB_USERNAME_11'),
             'password'  => env('DB_PASSWORD_11'),
@@ -147,269 +143,5 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-        'mysql12' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_12'),
-            'port'      => env('DB_PORT_12'),
-            'database'  => env('DB_DATABASE_12'),
-            'username'  => env('DB_USERNAME_12'),
-            'password'  => env('DB_PASSWORD_12'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql13' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_13'),
-            'port'      => env('DB_PORT_13'),
-            'database'  => env('DB_DATABASE_13'),
-            'username'  => env('DB_USERNAME_13'),
-            'password'  => env('DB_PASSWORD_13'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql14' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_14'),
-            'port'      => env('DB_PORT_14'),
-            'database'  => env('DB_DATABASE_14'),
-            'username'  => env('DB_USERNAME_14'),
-            'password'  => env('DB_PASSWORD_14'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql15' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_15'),
-            'port'      => env('DB_PORT_15'),
-            'database'  => env('DB_DATABASE_15'),
-            'username'  => env('DB_USERNAME_15'),
-            'password'  => env('DB_PASSWORD_15'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql16' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_16'),
-            'port'      => env('DB_PORT_16'),
-            'database'  => env('DB_DATABASE_16'),
-            'username'  => env('DB_USERNAME_16'),
-            'password'  => env('DB_PASSWORD_16'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql17' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_17'),
-            'port'      => env('DB_PORT_17'),
-            'database'  => env('DB_DATABASE_17'),
-            'username'  => env('DB_USERNAME_17'),
-            'password'  => env('DB_PASSWORD_17'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql18' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_18'),
-            'port'      => env('DB_PORT_18'),
-            'database'  => env('DB_DATABASE_18'),
-            'username'  => env('DB_USERNAME_18'),
-            'password'  => env('DB_PASSWORD_18'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql19' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_19'),
-            'port'      => env('DB_PORT_19'),
-            'database'  => env('DB_DATABASE_19'),
-            'username'  => env('DB_USERNAME_19'),
-            'password'  => env('DB_PASSWORD_19'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql20' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_20'),
-            'port'      => env('DB_PORT_20'),
-            'database'  => env('DB_DATABASE_20'),
-            'username'  => env('DB_USERNAME_20'),
-            'password'  => env('DB_PASSWORD_20'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql21' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_21'),
-            'port'      => env('DB_PORT_21'),
-            'database'  => env('DB_DATABASE_21'),
-            'username'  => env('DB_USERNAME_21'),
-            'password'  => env('DB_PASSWORD_21'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql22' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_22'),
-            'port'      => env('DB_PORT_22'),
-            'database'  => env('DB_DATABASE_22'),
-            'username'  => env('DB_USERNAME_22'),
-            'password'  => env('DB_PASSWORD_22'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql23' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_23'),
-            'port'      => env('DB_PORT_23'),
-            'database'  => env('DB_DATABASE_23'),
-            'username'  => env('DB_USERNAME_23'),
-            'password'  => env('DB_PASSWORD_23'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql24' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_24'),
-            'port'      => env('DB_PORT_24'),
-            'database'  => env('DB_DATABASE_24'),
-            'username'  => env('DB_USERNAME_24'),
-            'password'  => env('DB_PASSWORD_24'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql25' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_25'),
-            'port'      => env('DB_PORT_25'),
-            'database'  => env('DB_DATABASE_25'),
-            'username'  => env('DB_USERNAME_25'),
-            'password'  => env('DB_PASSWORD_25'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql26' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_26'),
-            'port'      => env('DB_PORT_26'),
-            'database'  => env('DB_DATABASE_26'),
-            'username'  => env('DB_USERNAME_26'),
-            'password'  => env('DB_PASSWORD_26'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql27' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_27'),
-            'port'      => env('DB_PORT_27'),
-            'database'  => env('DB_DATABASE_27'),
-            'username'  => env('DB_USERNAME_27'),
-            'password'  => env('DB_PASSWORD_27'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql28' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_28'),
-            'port'      => env('DB_PORT_28'),
-            'database'  => env('DB_DATABASE_28'),
-            'username'  => env('DB_USERNAME_28'),
-            'password'  => env('DB_PASSWORD_28'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql29' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_29'),
-            'port'      => env('DB_PORT_29'),
-            'database'  => env('DB_DATABASE_29'),
-            'username'  => env('DB_USERNAME_29'),
-            'password'  => env('DB_PASSWORD_29'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql30' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_30'),
-            'port'      => env('DB_PORT_30'),
-            'database'  => env('DB_DATABASE_30'),
-            'username'  => env('DB_USERNAME_30'),
-            'password'  => env('DB_PASSWORD_30'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql31' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_31'),
-            'port'      => env('DB_PORT_31'),
-            'database'  => env('DB_DATABASE_31'),
-            'username'  => env('DB_USERNAME_31'),
-            'password'  => env('DB_PASSWORD_31'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql32' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_32'),
-            'port'      => env('DB_PORT_32'),
-            'database'  => env('DB_DATABASE_32'),
-            'username'  => env('DB_USERNAME_32'),
-            'password'  => env('DB_PASSWORD_32'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
-        'mysql33' => [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST_33'),
-            'port'      => env('DB_PORT_33'),
-            'database'  => env('DB_DATABASE_33'),
-            'username'  => env('DB_USERNAME_33'),
-            'password'  => env('DB_PASSWORD_33'),
-            'charset'   => 'utf8',
-            'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
-            'strict'    => false,
-        ],
     ],
-];
\ No newline at end of file
+];
diff --git a/routes/web.php b/routes/web.php
index e111cb3..7040730 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -164,6 +164,12 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('transaksi_keuntungan',['uses'=>'TransaksiKeuntunganController@createTransaksiKeuntungan']);
 
 
+    $router->get('latest_transaksi_untung/data/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']);  // new added 20210413
+    $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']);  // new added  20210413
+
+
+
+
     //OTP API
     $router->post('otp/generateotp/{nokp}',['uses'=>'OtpController@createOtp']);
     $router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']);

From 957d3c82a27e2b189e276dc0beaac7da2b0d9ff4 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Sun, 18 Apr 2021 16:13:42 +0800
Subject: [PATCH 25/60] fix skit2

---
 app/Http/Controllers/TebusController.php      | 31 +++++++++++++++++++
 .../Controllers/TransactionController.php     |  2 --
 routes/web.php                                |  6 ++--
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index cbdb49d..8e292b7 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -470,6 +470,37 @@ class TebusController extends Controller
         return response()->json($listadvansur,200);
     }
 
+    public function SenaraiAdvansur($kodcaw,Request $request){
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $listadvansur = Advansur::on($cawangan['mysql'])
+        ->where('teller','=',$request->kodlaluan)
+        ->where('tarikh','=',$current->toDateString())
+        ->orderBy('tarikh','desc')
+        ->get();
+
+        return response()->json($listadvansur,200);
+    }
+
+    public function getAdvansurByKodlaluan($kodcaw,Request $request)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $listadvansur = Advansur::on($cawangan['mysql'])
+            ->where('teller','=',$request->kodlaluan)
+            ->where('tarikh','=',$current->toDateString())
+            ->sum('upahdibayar');
+
+        return response()->json($listadvansur,200);
+    }
+
     public function createAdvansur($kodcaw,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index da7c4c8..b333220 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -76,8 +76,6 @@ class TransactionController extends Controller
     {
         $namateller = $request->namateller;
 
-        $namateller = 'NUR ADNIN BINTI MOHAMED';
-
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $pengguna=Pengguna::on($cawangan['mysql'])
                 ->where('nama','=',$namateller)->limit(1)->get();
diff --git a/routes/web.php b/routes/web.php
index 45b2db8..239b588 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -177,9 +177,11 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->put('online/transaction',['uses'=>'TransactionOnlineController@updateStatus']);
     
 
-    //ANSURAN API
+    //ANSURAN UPAH API
     $router->get('ansuran/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong
-    $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']); 
+    $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']);
+    $router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']);
+    $router->get('ansuranupah/{kodcaw}',['uses'=>'TebusController@getAdvansurByKodlaluan']);
     $router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']);
 
     //LAPORAN API

From 1f9b8bbea98ca4c22df3a440839a5231c216f54d Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Mon, 19 Apr 2021 00:19:14 +0800
Subject: [PATCH 26/60] baiki backdate imbangduga

---
 app/Http/Controllers/GadaiController.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 8254c8f..ec53c06 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1939,16 +1939,16 @@ class GadaiController extends Controller
 
             $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
-            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
+            ->where([['t_gadai','<=','2021-04-13'],['sttebus','=','']])
+            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']])
             ->sum('pinjaman');
 
-            $gadaibaru = Gadai::on($cawangan['mysql'])
-            ->where('tagpalsu','=',0)
-            ->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]])
-            ->sum('pinjaman');
+            // $gadaibaru = Gadai::on($cawangan['mysql'])
+            // ->where('tagpalsu','=',0)
+            // ->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]])
+            // ->sum('pinjaman');
 
-            $rekod_pinjamandiberi = $rekod_pinjamandiberi - $gadaibaru;
+            // $rekod_pinjamandiberi;
 
         $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
 
@@ -1962,10 +1962,12 @@ class GadaiController extends Controller
 
         if($request->tarikh > '2021-04-13'){
         $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
-        ->where('tagpalsu','=',0)
-        ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
-        // ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
-        ->sum('pinjaman');
+            ->where('tagpalsu','=',0)
+            // ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=',''],['t_update','<=',$request->tarikh]])
+            ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
+            // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
+            ->sum('pinjaman');
         }
 
         return response()->json($rekod_pinjamandiberi);

From 8d347d19b003ae07d5958ad27f818c6462c63b74 Mon Sep 17 00:00:00 2001
From: fariz <farizsite@yahoo.com>
Date: Mon, 19 Apr 2021 08:37:42 +0800
Subject: [PATCH 27/60] transaksi_keuntungan new function added

---
 app/Http/Controllers/TransaksiKeuntunganController.php | 2 +-
 routes/web.php                                         | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/Http/Controllers/TransaksiKeuntunganController.php b/app/Http/Controllers/TransaksiKeuntunganController.php
index 3fb406c..0d5ee92 100644
--- a/app/Http/Controllers/TransaksiKeuntunganController.php
+++ b/app/Http/Controllers/TransaksiKeuntunganController.php
@@ -35,7 +35,7 @@ class TransaksiKeuntunganController extends Controller
     public function createTransaksiKeuntungan(Request $request){
         $transaksi = TransaksiKeuntungan::on('mysql7')->create([
             'norujukan' => $request->norujukan,
-            'bayaran_keuntungan' => $request->bayaran_keuntungan,
+            'bayaran_keuntungan' =>$request->bayaran_keuntungan,
             'tarikh_bayaran'=> $request->tarikh_bayaran,
             'tempoh'=> $request->tempoh,
             'kodcaw'=> $request->kodcaw
diff --git a/routes/web.php b/routes/web.php
index 7040730..dec8dc1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -168,8 +168,6 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']);  // new added  20210413
 
 
-
-
     //OTP API
     $router->post('otp/generateotp/{nokp}',['uses'=>'OtpController@createOtp']);
     $router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']);

From c1ca79dce2368bdd5725671193528e6c9cae94cf Mon Sep 17 00:00:00 2001
From: fariz <farizsite@yahoo.com>
Date: Mon, 19 Apr 2021 09:47:25 +0800
Subject: [PATCH 28/60] added to 33 branch db

---
 config/database.php | 274 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 274 insertions(+)

diff --git a/config/database.php b/config/database.php
index ad35752..2af8a17 100644
--- a/config/database.php
+++ b/config/database.php
@@ -143,5 +143,279 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
+
+
+        'mysql12' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_12'),
+            'port'      => env('DB_PORT_12'),
+            'database'  => env('DB_DATABASE_12'),
+            'username'  => env('DB_USERNAME_12'),
+            'password'  => env('DB_PASSWORD_12'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+
+
+        'mysql13' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_13'),
+            'port'      => env('DB_PORT_13'),
+            'database'  => env('DB_DATABASE_13'),
+            'username'  => env('DB_USERNAME_13'),
+            'password'  => env('DB_PASSWORD_13'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql14' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_14'),
+            'port'      => env('DB_PORT_14'),
+            'database'  => env('DB_DATABASE_14'),
+            'username'  => env('DB_USERNAME_14'),
+            'password'  => env('DB_PASSWORD_14'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql15' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_15'),
+            'port'      => env('DB_PORT_15'),
+            'database'  => env('DB_DATABASE_15'),
+            'username'  => env('DB_USERNAME_15'),
+            'password'  => env('DB_PASSWORD_15'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql16' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_16'),
+            'port'      => env('DB_PORT_16'),
+            'database'  => env('DB_DATABASE_16'),
+            'username'  => env('DB_USERNAME_16'),
+            'password'  => env('DB_PASSWORD_16'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql17' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_17'),
+            'port'      => env('DB_PORT_17'),
+            'database'  => env('DB_DATABASE_17'),
+            'username'  => env('DB_USERNAME_17'),
+            'password'  => env('DB_PASSWORD_17'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql18' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_18'),
+            'port'      => env('DB_PORT_18'),
+            'database'  => env('DB_DATABASE_18'),
+            'username'  => env('DB_USERNAME_18'),
+            'password'  => env('DB_PASSWORD_18'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql19' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_19'),
+            'port'      => env('DB_PORT_19'),
+            'database'  => env('DB_DATABASE_19'),
+            'username'  => env('DB_USERNAME_19'),
+            'password'  => env('DB_PASSWORD_19'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql20' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_20'),
+            'port'      => env('DB_PORT_20'),
+            'database'  => env('DB_DATABASE_20'),
+            'username'  => env('DB_USERNAME_20'),
+            'password'  => env('DB_PASSWORD_20'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql21' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_21'),
+            'port'      => env('DB_PORT_21'),
+            'database'  => env('DB_DATABASE_21'),
+            'username'  => env('DB_USERNAME_21'),
+            'password'  => env('DB_PASSWORD_21'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql22' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_22'),
+            'port'      => env('DB_PORT_22'),
+            'database'  => env('DB_DATABASE_22'),
+            'username'  => env('DB_USERNAME_22'),
+            'password'  => env('DB_PASSWORD_22'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql23' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_23'),
+            'port'      => env('DB_PORT_23'),
+            'database'  => env('DB_DATABASE_23'),
+            'username'  => env('DB_USERNAME_23'),
+            'password'  => env('DB_PASSWORD_23'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql24' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_24'),
+            'port'      => env('DB_PORT_24'),
+            'database'  => env('DB_DATABASE_24'),
+            'username'  => env('DB_USERNAME_24'),
+            'password'  => env('DB_PASSWORD_24'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql25' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_25'),
+            'port'      => env('DB_PORT_25'),
+            'database'  => env('DB_DATABASE_25'),
+            'username'  => env('DB_USERNAME_25'),
+            'password'  => env('DB_PASSWORD_25'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql26' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_26'),
+            'port'      => env('DB_PORT_26'),
+            'database'  => env('DB_DATABASE_26'),
+            'username'  => env('DB_USERNAME_26'),
+            'password'  => env('DB_PASSWORD_26'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql27' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_27'),
+            'port'      => env('DB_PORT_27'),
+            'database'  => env('DB_DATABASE_27'),
+            'username'  => env('DB_USERNAME_27'),
+            'password'  => env('DB_PASSWORD_27'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql28' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_28'),
+            'port'      => env('DB_PORT_28'),
+            'database'  => env('DB_DATABASE_28'),
+            'username'  => env('DB_USERNAME_28'),
+            'password'  => env('DB_PASSWORD_28'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql29' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_29'),
+            'port'      => env('DB_PORT_29'),
+            'database'  => env('DB_DATABASE_29'),
+            'username'  => env('DB_USERNAME_29'),
+            'password'  => env('DB_PASSWORD_29'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql30' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_30'),
+            'port'      => env('DB_PORT_30'),
+            'database'  => env('DB_DATABASE_30'),
+            'username'  => env('DB_USERNAME_30'),
+            'password'  => env('DB_PASSWORD_30'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql31' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_31'),
+            'port'      => env('DB_PORT_31'),
+            'database'  => env('DB_DATABASE_31'),
+            'username'  => env('DB_USERNAME_31'),
+            'password'  => env('DB_PASSWORD_31'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+
+
+        'mysql32' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_32'),
+            'port'      => env('DB_PORT_32'),
+            'database'  => env('DB_DATABASE_32'),
+            'username'  => env('DB_USERNAME_32'),
+            'password'  => env('DB_PASSWORD_32'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+        'mysql33' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_33'),
+            'port'      => env('DB_PORT_33'),
+            'database'  => env('DB_DATABASE_33'),
+            'username'  => env('DB_USERNAME_33'),
+            'password'  => env('DB_PASSWORD_33'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
+
+
+
     ],
 ];
+

From aab122dc8a4b4c83febf6a157a0f4bfc3366740f Mon Sep 17 00:00:00 2001
From: fariz <farizsite@yahoo.com>
Date: Mon, 19 Apr 2021 10:02:31 +0800
Subject: [PATCH 29/60] edit config/database.php

---
 config/database.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/database.php b/config/database.php
index 2af8a17..5374bf8 100644
--- a/config/database.php
+++ b/config/database.php
@@ -21,7 +21,7 @@ return [
         'mysql2' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_2'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_2'),
             'database'  => env('DB_DATABASE_2'),
             'username'  => env('DB_USERNAME_2'),
             'password'  => env('DB_PASSWORD_2'),
@@ -34,7 +34,7 @@ return [
         'mysql3' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_3'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_3'),
             'database'  => env('DB_DATABASE_3'),
             'username'  => env('DB_USERNAME_3'),
             'password'  => env('DB_PASSWORD_3'),
@@ -47,7 +47,7 @@ return [
         'mysql4' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_4'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_4'),
             'database'  => env('DB_DATABASE_4'),
             'username'  => env('DB_USERNAME_4'),
             'password'  => env('DB_PASSWORD_4'),
@@ -60,7 +60,7 @@ return [
         'mysql5' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_5'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_5'),
             'database'  => env('DB_DATABASE_5'),
             'username'  => env('DB_USERNAME_5'),
             'password'  => env('DB_PASSWORD_5'),
@@ -73,7 +73,7 @@ return [
         'mysql6' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_6'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_6'),
             'database'  => env('DB_DATABASE_6'),
             'username'  => env('DB_USERNAME_6'),
             'password'  => env('DB_PASSWORD_6'),
@@ -86,7 +86,7 @@ return [
         'mysql7' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_7'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_7'),
             'database'  => env('DB_DATABASE_7'),
             'username'  => env('DB_USERNAME_7'),
             'password'  => env('DB_PASSWORD_7'),
@@ -98,7 +98,7 @@ return [
         'mysql8' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_8'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_8'),
             'database'  => env('DB_DATABASE_8'),
             'username'  => env('DB_USERNAME_8'),
             'password'  => env('DB_PASSWORD_8'),
@@ -110,7 +110,7 @@ return [
         'mysql9' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_9'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_9'),
             'database'  => env('DB_DATABASE_9'),
             'username'  => env('DB_USERNAME_9'),
             'password'  => env('DB_PASSWORD_9'),
@@ -122,7 +122,7 @@ return [
         'mysql10' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_10'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_10'),
             'database'  => env('DB_DATABASE_10'),
             'username'  => env('DB_USERNAME_10'),
             'password'  => env('DB_PASSWORD_10'),
@@ -134,7 +134,7 @@ return [
         'mysql11' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_11'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_11'),
             'database'  => env('DB_DATABASE_11'),
             'username'  => env('DB_USERNAME_11'),
             'password'  => env('DB_PASSWORD_11'),

From 101a52b525a4dc9e39502707c7acc4a639048457 Mon Sep 17 00:00:00 2001
From: Afiq Zakwan Hamdan <afiqzakwanhamdan@gmail.com>
Date: Tue, 20 Apr 2021 14:07:53 +0800
Subject: [PATCH 30/60] reducing method

---
 app/Http/Controllers/GadaiController.php | 23 ++++++++++++
 app/Http/Controllers/TebusController.php | 45 ++++++++++++++++++++----
 app/TransaksiKeuntungan.php              |  2 +-
 3 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 8254c8f..61dccc8 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -272,6 +272,25 @@ class GadaiController extends Controller
         return $upah_semasa;
     }
 
+    public function kiraUpahRebet($kodcaw,$norujukan){
+        $cawangan = Cawangan::on('mysql7')
+                    ->where('kodcaw','=',$kodcaw)
+                    ->first();
+
+        $gadai_data = Gadai::on($cawangan['mysql'])
+                    ->where('norujukan','=',$norujukan)
+                    ->first();
+
+        $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
+
+        $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+
+        $upah_rebet_round = number_format($upahrebet_raw,2);
+        $upah_rebet = (float)substr($upah_rebet_round, 0, -1);
+
+        return $upah_rebet;
+    }
+
     public function updateGadaiMarhunOnline($kodcaw,$norujukan,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
@@ -280,6 +299,7 @@ class GadaiController extends Controller
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
         $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
+        $upahrebet = $this->kiraUpahRebet($kodcaw,$norujukan);
         
         $total_bayaran_prev = Transaction::on('mysql7')->where([['norujukan','=',$norujukan],['trans_type','=','A']])->sum('duit_masuk');
 
@@ -312,6 +332,7 @@ class GadaiController extends Controller
             'norujukan' => $norujukan,
             'bayaran_keuntungan' => $upahsemasa,
             'bayaran_pembiayaan' => $baki_bayaran,
+            'keuntungan_rebet'=> $upahrebet,
             'tarikh_bayaran'=> $current,
             'kodcaw'=> $kodcaw
         ]);
@@ -333,6 +354,7 @@ class GadaiController extends Controller
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
         $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
+        $upahrebet = $this->kiraUpahRebet($kodcaw,$norujukan);
 
         $total_bayaran_prev = Transaction::on('mysql7')->where([['norujukan','=',$norujukan],['trans_type','=','A']])->sum('duit_masuk');
 
@@ -365,6 +387,7 @@ class GadaiController extends Controller
             'norujukan' => $norujukan,
             'bayaran_keuntungan' => $upahsemasa,
             'bayaran_pembiayaan' => $baki_bayaran,
+            'keuntungan_rebet'=> $upahrebet,
             'tarikh_bayaran'=> $current,
             'kodcaw'=> $kodcaw
         ]);
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 24b7f51..e410463 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -60,6 +60,25 @@ class TebusController extends Controller
         return $upah_semasa;
     }
 
+    public function kiraUpahRebet($kodcaw,$norujukan){
+        $cawangan = Cawangan::on('mysql7')
+                    ->where('kodcaw','=',$kodcaw)
+                    ->first();
+
+        $gadai_data = Gadai::on($cawangan['mysql'])
+                    ->where('norujukan','=',$norujukan)
+                    ->first();
+
+        $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
+
+        $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+
+        $upah_rebet_round = number_format($upahrebet_raw,2);
+        $upah_rebet = (float)substr($upah_rebet_round, 0, -1);
+
+        return $upah_rebet;
+    }
+
     public function upahTawarruq($kodcaw,$norujukan){
         
         $upah_semasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
@@ -133,16 +152,24 @@ class TebusController extends Controller
         $gadai_data = Gadai::on($cawangan['mysql'])
                     ->where('norujukan','=',$norujukan)
                     ->first();
-        // dd($gadai_data);
+
+        $upahtelahbayar = Advansur::on($cawangan['mysql'])
+                        ->where('norujukan','=',$norujukan)
+                        ->sum('upahdibayar');
+
         $upah_asal = $gadai_data['nilaimarhun'] / 100 * $gadai_data['kadarupah'];
         $margin_pinjaman = $gadai_data['pinjaman'] / $gadai_data['nilaimarhun'] * 100;
         $margin_kadarupah = 80;
         $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
         
         $upah_sebenar = $upah_asal - $rebet;
-
-        $upah_semasa = bcdiv(round($upah_sebenar * $gadai_data['jbg'],2),1,1);
-        $upah_semasa = (float)number_format($upah_semasa,2);
+        $upahsemasa = $upah_sebenar * $gadai_data['jbg'];
+        $upah_semasa = bcdiv(round($upahsemasa,2),1,1);
+        $upah_semasa = number_format($upah_semasa,2);
+        if(strpos($upah_semasa,',')){
+            $upah_semasa = str_replace(',','',$upah_semasa);
+        }
+        $upah_semasa = (float)$upah_semasa - $upahtelahbayar;
 
         return response()->json($upah_semasa);
     }
@@ -155,7 +182,7 @@ class TebusController extends Controller
         $gadai_data = Gadai::on($cawangan['mysql'])
                     ->where('norujukan','=',$norujukan)
                     ->first();
-        // dd($gadai_data);
+
         $upah_asal = $gadai_data['nilaimarhun'] / 100 * $gadai_data['kadarupah'];
         $margin_pinjaman = $gadai_data['pinjaman'] / $gadai_data['nilaimarhun'] * 100;
         $margin_kadarupah = 80;
@@ -212,9 +239,13 @@ class TebusController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
-        $bln_tebus_awl = 12 - $gadai_data['tempoh'];
+        $transaction_keuntungan = TransaksiKeuntungan::on('mysql7')
+                    ->where('norujukan','=',$norujukan)
+                    ->sum('keuntungan_rebet');
+        
+        $upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan);
 
-        $rebet_raw = $bln_tebus_awl * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
+        $rebet_raw =$gadai_data['upah12'] - $transaction_keuntungan - $upah_rebet;
 
         $rebet_round = number_format($rebet_raw,2);
 
diff --git a/app/TransaksiKeuntungan.php b/app/TransaksiKeuntungan.php
index 57bbca1..691485b 100644
--- a/app/TransaksiKeuntungan.php
+++ b/app/TransaksiKeuntungan.php
@@ -14,7 +14,7 @@ class TransaksiKeuntungan extends Model
      * @var array
      */
     protected $fillable = [
-      'norujukan','bayaran_keuntungan','tarikh_bayaran','kodcaw','bayaran_pembiayaan'
+      'norujukan','bayaran_keuntungan','tarikh_bayaran','kodcaw','bayaran_pembiayaan','keuntungan_rebet'
     ];
 
     /**

From db2968682896094f969b15daafbca1b8b6e41158 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Tue, 20 Apr 2021 14:13:59 +0800
Subject: [PATCH 31/60] add ansuran lejer am

---
 app/Http/Controllers/TransactionController.php | 14 ++++++++++++++
 routes/web.php                                 |  5 +++++
 2 files changed, 19 insertions(+)

diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index b333220..ecd4283 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -9,6 +9,7 @@ use App\Cawangan;
 use Illuminate\Http\Request;
 
 use Carbon\Carbon;
+use DB;
 
 class TransactionController extends Controller
 {
@@ -82,4 +83,17 @@ class TransactionController extends Controller
 
         return response()->json($pengguna);
     }
+
+    public function getSumBayaran_Ansuran($kodcaw,$norujukan)
+    {
+
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh = $current->toDateString();
+
+        $transaction=DB::connection('mysql7')->select("SELECT  SUM(duit_masuk) AS cash_in  FROM transaction WHERE DATE(created_at)='".$tarikh."' AND kodcaw='".$kodcaw."' AND norujukan ='".$norujukan."'" );     
+
+        return response()->json($transaction);
+
+    }
 }
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 387344a..081e3ae 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -355,6 +355,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //-- Untung Rugi --//
     $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar
+
+
     
     
     //END IMBANG DUGA//
@@ -363,6 +365,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     $router->get('latest_transaksi_untung/data/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']);  // new added 20210413
     $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']);  // new added  20210413
+
+    //-- Ansuran GLEJER --//
+    $router->get('ansuranByrKaunter/{kodcaw}/{norujukan}',['uses'=>'TransactionController@getSumBayaran_Ansuran']);
     
 
     //Komuditi Pukal

From cbf21fca233a33b7d851e55f20a2e9773fcbc8a2 Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Tue, 20 Apr 2021 21:43:57 +0800
Subject: [PATCH 32/60] fix dashboard

---
 app/Http/Controllers/GadaiController.php | 38 +++++++++++++++++++-----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index c385231..70285d0 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -581,18 +581,40 @@ class GadaiController extends Controller
         //Gadai Terkumpul
         $gadai = Gadai::on($cawangan['mysql'])
         ->where('sttebus','=','')
+        ->whereNull('hargajualan')
         ->whereYear('t_gadai','=',$current->year)
-        ->orderBy('t_gadai','desc')
         ->sum('pinjaman');
 
-        //Tebus Terkumpul
-        $tebus = Tebus::on($cawangan['mysql'])
-        ->where('jenistebus','=','T')
-        ->whereYear('t_tebus','=',$current->year)
-        ->orderBy('t_tebus','desc')
+        $gadaitawarruq = Gadai::on($cawangan['mysql'])
+        ->where('sttebus','=','')
+        ->whereNotNull('hargajualan')
+        ->whereYear('t_gadai','=',$current->year)
         ->sum('pinjaman');
 
-        //Upah Terkumpul
+        // //Tebus Terkumpul
+        // $tebus = Tebus::on($cawangan['mysql'])
+        // ->where('jenistebus','=','T')
+        // ->whereNull('hargajualan')
+        // ->whereYear('t_tebus','=',$current->year)
+        // ->sum('pinjaman');
+
+        // $tebustawarruq = Tebus::on($cawangan['mysql'])
+        // ->where('jenistebus','=','T')
+        // ->whereNotNull('hargajualan')
+        // ->whereYear('t_tebus','=',$current->year)
+        // ->sum('pinjaman');
+
+        $tebus = Gadai::on($cawangan['mysql'])
+        ->where('sttebus','=','T')
+        ->whereNull('hargajualan')
+        ->whereYear('t_gadai','=',$current->year)
+        ->sum('pinjaman');
+
+        $tebustawarruq = Gadai::on($cawangan['mysql'])
+        ->where('sttebus','=','T')
+        ->whereNotNull('hargajualan')
+        ->whereYear('t_gadai','=',$current->year)
+        ->sum('pinjaman');
 
 
         //Variasi
@@ -605,7 +627,7 @@ class GadaiController extends Controller
         ->orderBy('t_gadai','desc')
         ->sum('pinjaman');
 
-        array_push($array_dashboard,["gadai" => $gadai,"tebus" => $tebus, "variasi" => $variasi, "outstanding" => $outstanding]);
+        array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $outstanding]);
 
         return response()->json($array_dashboard);
     }

From 173932f599a96f04d6273107d8d40c62fed8d5eb Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 21 Apr 2021 01:32:33 +0800
Subject: [PATCH 33/60] gadai dlu

---
 app/Http/Controllers/GadaiController.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 70285d0..1735b3d 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1439,7 +1439,8 @@ class GadaiController extends Controller
                      $totalkeluar = $keluar - $tebus['addpinjaman'];
                      $totalmasuk = $masuk - $tebus['bakiupah'];
          
-                     $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
+                    //  $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
+                    $bakiakhir = $baki - $totalkeluar + $totalmasuk;
          
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -1453,7 +1454,8 @@ class GadaiController extends Controller
          
                      $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
                      $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
-                     $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
+                    //  $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
+                    $bakiakhir = ($baki - $totalmasuk) + $totalkeluar;
 
                     //  dd($totalmasuk,$totalkeluar,$bakiakhir);
          
@@ -1483,7 +1485,10 @@ class GadaiController extends Controller
 
                 }else{
 
-                    $bakiakhir = $bakiakhir - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
+                    $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
+                     $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
+
+                    $bakiakhir = ($bakiakhir - $totalmasuk) + $totalkeluar;
 
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -1581,7 +1586,8 @@ class GadaiController extends Controller
             {
                 $totalmasuk = $masuk - $tebus[0]['bakipjm'];
 
-                $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
+                // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
+                $bakiakhir = $baki - $totalmasuk;
 
                 $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                 update(array(

From 4e5e06a753837a1cd2377ed35367622f94629626 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 21 Apr 2021 11:44:12 +0800
Subject: [PATCH 34/60] fix batal

---
 app/Http/Controllers/GadaiController.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 1735b3d..3bb56ad 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1436,11 +1436,11 @@ class GadaiController extends Controller
                 if($tebus['jenistebus'] == 'P')
                 {
 
-                     $totalkeluar = $keluar - $tebus['addpinjaman'];
-                     $totalmasuk = $masuk - $tebus['bakiupah'];
+                     $totalkeluar = $keluar - ($tebus['addpinjaman'] + $tebus['pinjaman']);
+                     $totalmasuk = $masuk - ($tebus['bakiupah'] + $tebus['pinjaman']);
          
                     //  $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
-                    $bakiakhir = $baki - $totalkeluar + $totalmasuk;
+                    $bakiakhir = $baki - $tebus['bakiupah'] + $tebus['addpinjaman'];
          
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -1455,7 +1455,9 @@ class GadaiController extends Controller
                      $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
                      $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
                     //  $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
-                    $bakiakhir = ($baki - $totalmasuk) + $totalkeluar;
+
+                    if($tebus['jenistebus'] == 'S')
+                        $bakiakhir = $baki - $tebus['bakipjm'];
 
                     //  dd($totalmasuk,$totalkeluar,$bakiakhir);
          
@@ -1486,9 +1488,10 @@ class GadaiController extends Controller
                 }else{
 
                     $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
-                     $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
+                    $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
 
-                    $bakiakhir = ($bakiakhir - $totalmasuk) + $totalkeluar;
+                    if($tebus['jenistebus'] == 'S')
+                        $bakiakhir = ($bakiakhir - $tebus['bakipjm']);
 
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -1587,7 +1590,7 @@ class GadaiController extends Controller
                 $totalmasuk = $masuk - $tebus[0]['bakipjm'];
 
                 // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
-                $bakiakhir = $baki - $totalmasuk;
+                $bakiakhir = $baki - $tebus[0]['bakipjm'];
 
                 $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                 update(array(

From 39fecbe62fb8c022ecbbf0ec94c743cc3d29603f Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 21 Apr 2021 15:53:36 +0800
Subject: [PATCH 35/60] database arrahn

---
 app/Http/Controllers/GadaiController.php | 64 +++++++++++++++++++++++-
 app/Http/Controllers/TebusController.php |  6 +--
 routes/web.php                           |  2 +
 3 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 3bb56ad..c27bb84 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2047,7 +2047,7 @@ class GadaiController extends Controller
         ->sum('upah12');
 
         $transaksi = TransaksiKeuntungan::on('mysql7')
-        ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+        ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
         // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
         ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
         ->whereYear('tarikh_bayaran','=',$current->year)
@@ -2076,7 +2076,7 @@ class GadaiController extends Controller
         $current = new Carbon();
 
         $transaksi = TransaksiKeuntungan::on('mysql7')
-                    ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     ->where('db2.sttebus','=','')
                     ->where('tarikh_bayaran' ,'>=', $datetawarruq)
                     ->where('tarikh_bayaran' ,'<=', $daterequest)
@@ -2085,4 +2085,64 @@ class GadaiController extends Controller
         return response($transaksi);
     }
 
+    public function LaporanAuditAktif($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $rekodaudit = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',0)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
+            ->get();
+
+        $totalrekod = 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');
+
+        $totalberat = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',0)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
+            ->sum('berat');
+
+        $totalnilaimarhun = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',0)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
+            ->sum('nilaimarhun');
+
+        $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' =>  $totalnilaimarhun];
+
+        return response()->json($arrayrekod,200);
+    }
+
+    public function LaporanAuditTakAktif($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+
+        $arrayrekodemaspalsu = [];
+
+        $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',1)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->get();
+
+
+        dd($rekod_emaspalsu);
+
+        $total = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',1)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
+            ->sum('pinjaman');
+
+        array_push($arrayrekodemaspalsu,["rekod" => $rekod_emaspalsu, "total" => $total]);
+
+        dd($arrayrekodemaspalsu);
+        return response()->json();
+    }
+
 }
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 103a082..ce032e6 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -576,7 +576,7 @@ class TebusController extends Controller
 
         //Keuntungan Selepas Tawarruq
         $keuntungan = TransaksiKeuntungan::on('mysql7')
-            ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+            ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
             ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
             ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
             ->whereNull('db2.hargajualan')
@@ -737,7 +737,7 @@ class TebusController extends Controller
         $current = new Carbon();
 
         $keuntungan = TransaksiKeuntungan::on('mysql7')
-                    ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
                     ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
                     ->whereYear('tarikh_bayaran','=',$current->year)
@@ -752,7 +752,7 @@ class TebusController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
         $rebet = Tebus::on($cawangan['mysql'])
-                ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
+                ->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
                 ->where('tebus.t_tebus','>','2021-04-13')
                 ->where('tebus.t_tebus','<=',$request->tarikh)
                 ->whereNotNull('db2.hargajualan')
diff --git a/routes/web.php b/routes/web.php
index 081e3ae..b223bdc 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -190,6 +190,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //LAPORAN API
     $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok
+    $router->get('stokaudit/aktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditAktif']); //laporan stokaudit Aktif
+    $router->get('stokaudit/takaktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditTakAktif']); //laporan stokaudit Tak Aktif
     $router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); //laporan lelongan
     $router->get('gadai/aging/test/{kodcaw}/{tarikh}/{num}',['uses'=>'GadaiController@carian_AgingBulanan']);
     $router->get('gadai/aging/lebih12bulan/{kodcaw}/{tarikh}', ['uses'=>'GadaiController@carian_agingLebih12_Bulan']);

From fc44f5dee07af9680371b95def63f86b6235b24b Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Thu, 22 Apr 2021 09:00:23 +0800
Subject: [PATCH 36/60] laporan aktif

---
 app/Http/Controllers/GadaiController.php | 30 ++++++++++++++----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index c27bb84..c709384 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2122,27 +2122,33 @@ class GadaiController extends Controller
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-
-        $arrayrekodemaspalsu = [];
-
-        $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
+        $rekodaudit = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',1)
             ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
             ->get();
 
-
-        dd($rekod_emaspalsu);
-
-        $total = Gadai::on($cawangan['mysql'])
+        $totalrekod = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',1)
             ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
-        array_push($arrayrekodemaspalsu,["rekod" => $rekod_emaspalsu, "total" => $total]);
+        $totalberat = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',1)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
+            ->sum('berat');
 
-        dd($arrayrekodemaspalsu);
-        return response()->json();
+        $totalnilaimarhun = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',1)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
+            ->sum('nilaimarhun');
+
+        $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' =>  $totalnilaimarhun];
+
+        return response()->json($arrayrekod,200);
     }
 
 }

From 43d9206713454e76275f12c39b408db0114b8212 Mon Sep 17 00:00:00 2001
From: Afiq Zakwan Hamdan <afiqzakwanhamdan@gmail.com>
Date: Thu, 22 Apr 2021 14:12:26 +0800
Subject: [PATCH 37/60] rlm

---
 app/Http/Controllers/TebusController.php | 40 +++++++++++++++++++-----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index ce032e6..b99a2c7 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -128,20 +128,42 @@ class TebusController extends Controller
         $gadai_data = Gadai::on($cawangan['mysql'])
                     ->where('norujukan','=',$norujukan)
                     ->first();
-        // dd($gadai_data);
+
+        $upah_semasa = $this->kiraUpahNotTawarruq($kodcaw,$norujukan);
+
+        $harga_tebus = $upah_semasa + $gadai_data['pinjaman'];
+
+        return response()->json($harga_tebus);
+    }
+
+    public function kiraUpahNotTawarruq($kodcaw,$norujukan){
+        $cawangan = Cawangan::on('mysql7')
+                    ->where('kodcaw','=',$kodcaw)
+                    ->first();
+
+        $gadai_data = Gadai::on($cawangan['mysql'])
+                    ->where('norujukan','=',$norujukan)
+                    ->first();
+
+        $upahtelahbayar = Advansur::on($cawangan['mysql'])
+                        ->where('norujukan','=',$norujukan)
+                        ->sum('upahdibayar');
+
         $upah_asal = $gadai_data['nilaimarhun'] / 100 * $gadai_data['kadarupah'];
         $margin_pinjaman = $gadai_data['pinjaman'] / $gadai_data['nilaimarhun'] * 100;
         $margin_kadarupah = 80;
         $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
         
         $upah_sebenar = $upah_asal - $rebet;
+        $upahsemasa = $upah_sebenar * $gadai_data['jbg'];
+        $upah_semasa = bcdiv(round($upahsemasa,2),1,1);
+        $upah_semasa = number_format($upah_semasa,2);
+        if(strpos($upah_semasa,',')){
+            $upah_semasa = str_replace(',','',$upah_semasa);
+        }
+        $upah_semasa = (float)$upah_semasa - $upahtelahbayar;
 
-        $upah_semasa = bcdiv(round($upah_sebenar * $gadai_data['jbg'],2),1,1);
-        $upah_semasa = (float)number_format($upah_semasa,2);
-
-        $harga_tebus = $upah_semasa + $gadai_data['pinjaman'];
-
-        return response()->json($harga_tebus);
+        return $upah_semasa;
     }
 
     public function upahNotTawarruq($kodcaw,$norujukan){
@@ -282,6 +304,8 @@ class TebusController extends Controller
             't_update' => $current->toDateString(),
         ));
 
+        $upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan);
+
         $create_tebus = Tebus::on($cawangan['mysql'])->create([
             'kodcaw'=> $kodcaw,
             'norujukan'=> $norujukan,
@@ -325,6 +349,8 @@ class TebusController extends Controller
         $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
             'norujukan' => $norujukan,
             'bayaran_keuntungan' => $request->bakiupah,
+            'bayaran_pembiayaan' => $gadai['bakipjm'],
+            'keuntungan_rebet' => $upah_rebet,
             'tarikh_bayaran'=> $current,
             'kodcaw'=> $kodcaw
         ]);

From 7bf66c7a04a315c4be3da491ed7558f4959652e2 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Thu, 22 Apr 2021 14:26:39 +0800
Subject: [PATCH 38/60] reducing method

---
 app/Http/Controllers/TebusController.php | 22 ++++++++++++++++++++--
 routes/web.php                           |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index ce032e6..b96cde6 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -733,18 +733,36 @@ class TebusController extends Controller
         $daterequest = new Carbon($request->tarikh);
         $daterequest->addDays(1);
 
+        $dateSM = new Carbon('2021-04-21');
+        $dateSM->addDays(1);
+
+        $dateRM = new Carbon('2021-04-22');
+        $dateRM->addDays(1);
+
         $current = Carbon::now();
         $current = new Carbon();
 
         $keuntungan = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
-                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
+                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM)
                     ->whereYear('tarikh_bayaran','=',$current->year)
                     ->whereNotNull('db2.hargajualan')
                     ->sum('bayaran_keuntungan');
 
-        return response($keuntungan);
+        $keuntunganreducing = TransaksiKeuntungan::on('mysql7')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
+                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
+                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $dateRM)
+                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->whereNotNull('db2.hargajualan')
+                    ->sum('bayaran_keuntungan');
+
+
+        $total = $keuntungan + $keuntunganreducing;
+
+        return response($total);
     }
 
     public function RebetCalculation($kodcaw,Request $request)
diff --git a/routes/web.php b/routes/web.php
index b223bdc..ff3e100 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -357,7 +357,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //-- Untung Rugi --//
     $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar
-
+    
 
     
     

From 045b984a084ff02d1fa5ec5440cdc3cc0faabcfd Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Thu, 22 Apr 2021 14:29:43 +0800
Subject: [PATCH 39/60] fix reducing v2

---
 app/Http/Controllers/TebusController.php | 2 +-
 routes/web.php                           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index b96cde6..029a3d3 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -757,7 +757,7 @@ class TebusController extends Controller
                     ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $dateRM)
                     ->whereYear('tarikh_bayaran','=',$current->year)
                     ->whereNotNull('db2.hargajualan')
-                    ->sum('bayaran_keuntungan');
+                    ->sum('keuntungan_rebet');
 
 
         $total = $keuntungan + $keuntunganreducing;
diff --git a/routes/web.php b/routes/web.php
index ff3e100..97b13a2 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -191,7 +191,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //LAPORAN API
     $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok
     $router->get('stokaudit/aktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditAktif']); //laporan stokaudit Aktif
-    $router->get('stokaudit/takaktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditTakAktif']); //laporan stokaudit Tak Aktif
+    $router->get('stokaudit/takaktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditTakAktif']); //laporan takaktif
     $router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); //laporan lelongan
     $router->get('gadai/aging/test/{kodcaw}/{tarikh}/{num}',['uses'=>'GadaiController@carian_AgingBulanan']);
     $router->get('gadai/aging/lebih12bulan/{kodcaw}/{tarikh}', ['uses'=>'GadaiController@carian_agingLebih12_Bulan']);
@@ -357,7 +357,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //-- Untung Rugi --//
     $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar
-    
+
 
     
     

From e4bb2b1fb6eca7d4e35e15f0fe398b83012d8ff8 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Thu, 22 Apr 2021 14:36:57 +0800
Subject: [PATCH 40/60] fix last keuntungan_rebet

---
 app/Http/Controllers/TebusController.php |  5 ----
 config/database.php                      | 33 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 029a3d3..e88bae1 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -736,9 +736,6 @@ class TebusController extends Controller
         $dateSM = new Carbon('2021-04-21');
         $dateSM->addDays(1);
 
-        $dateRM = new Carbon('2021-04-22');
-        $dateRM->addDays(1);
-
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -754,12 +751,10 @@ class TebusController extends Controller
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
                     ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
-                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $dateRM)
                     ->whereYear('tarikh_bayaran','=',$current->year)
                     ->whereNotNull('db2.hargajualan')
                     ->sum('keuntungan_rebet');
 
-
         $total = $keuntungan + $keuntunganreducing;
 
         return response($total);
diff --git a/config/database.php b/config/database.php
index 5b38847..e940807 100644
--- a/config/database.php
+++ b/config/database.php
@@ -16,6 +16,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
          ],
         'mysql2' => [
             'driver'    => 'mysql',
@@ -28,6 +29,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql3' => [
             'driver'    => 'mysql',
@@ -40,6 +42,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql4' => [
             'driver'    => 'mysql',
@@ -52,6 +55,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql5' => [
             'driver'    => 'mysql',
@@ -64,6 +68,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
 
         'mysql6' => [
@@ -77,6 +82,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
 
         'mysql7' => [
@@ -90,6 +96,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql8' => [
             'driver'    => 'mysql',
@@ -102,6 +109,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql9' => [
             'driver'    => 'mysql',
@@ -114,6 +122,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql10' => [
             'driver'    => 'mysql',
@@ -126,6 +135,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql11' => [
             'driver'    => 'mysql',
@@ -138,6 +148,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql12' => [
             'driver'    => 'mysql',
@@ -150,6 +161,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql13' => [
             'driver'    => 'mysql',
@@ -162,6 +174,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql14' => [
             'driver'    => 'mysql',
@@ -174,6 +187,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql15' => [
             'driver'    => 'mysql',
@@ -186,6 +200,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql16' => [
             'driver'    => 'mysql',
@@ -198,6 +213,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql17' => [
             'driver'    => 'mysql',
@@ -210,6 +226,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql18' => [
             'driver'    => 'mysql',
@@ -222,6 +239,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql19' => [
             'driver'    => 'mysql',
@@ -234,6 +252,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql20' => [
             'driver'    => 'mysql',
@@ -246,6 +265,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql21' => [
             'driver'    => 'mysql',
@@ -258,6 +278,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql22' => [
             'driver'    => 'mysql',
@@ -270,6 +291,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql23' => [
             'driver'    => 'mysql',
@@ -282,6 +304,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql24' => [
             'driver'    => 'mysql',
@@ -294,6 +317,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql25' => [
             'driver'    => 'mysql',
@@ -306,6 +330,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql26' => [
             'driver'    => 'mysql',
@@ -318,6 +343,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql27' => [
             'driver'    => 'mysql',
@@ -330,6 +356,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql28' => [
             'driver'    => 'mysql',
@@ -342,6 +369,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql29' => [
             'driver'    => 'mysql',
@@ -354,6 +382,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql30' => [
             'driver'    => 'mysql',
@@ -366,6 +395,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql31' => [
             'driver'    => 'mysql',
@@ -378,6 +408,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql32' => [
             'driver'    => 'mysql',
@@ -390,6 +421,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql33' => [
             'driver'    => 'mysql',
@@ -402,6 +434,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
     ],
 ];

From 50c4a5ffba83d64fbb82b8d9010e27ac9d1e5c35 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Thu, 22 Apr 2021 14:41:54 +0800
Subject: [PATCH 41/60] config

---
 config/database.php | 43 ++++++++++---------------------------------
 1 file changed, 10 insertions(+), 33 deletions(-)

diff --git a/config/database.php b/config/database.php
index e940807..da7a044 100644
--- a/config/database.php
+++ b/config/database.php
@@ -16,7 +16,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
          ],
         'mysql2' => [
             'driver'    => 'mysql',
@@ -29,7 +28,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql3' => [
             'driver'    => 'mysql',
@@ -42,7 +40,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql4' => [
             'driver'    => 'mysql',
@@ -55,7 +52,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql5' => [
             'driver'    => 'mysql',
@@ -68,7 +64,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
+
         ],
 
         'mysql6' => [
@@ -82,7 +78,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
+
         ],
 
         'mysql7' => [
@@ -96,7 +92,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql8' => [
             'driver'    => 'mysql',
@@ -109,7 +104,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
+
         ],
         'mysql9' => [
             'driver'    => 'mysql',
@@ -122,7 +117,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql10' => [
             'driver'    => 'mysql',
@@ -135,7 +129,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql11' => [
             'driver'    => 'mysql',
@@ -148,7 +141,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
+
         ],
         'mysql12' => [
             'driver'    => 'mysql',
@@ -161,7 +154,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql13' => [
             'driver'    => 'mysql',
@@ -174,7 +166,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql14' => [
             'driver'    => 'mysql',
@@ -187,7 +178,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
+
         ],
         'mysql15' => [
             'driver'    => 'mysql',
@@ -200,7 +191,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql16' => [
             'driver'    => 'mysql',
@@ -213,7 +203,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
+
         ],
         'mysql17' => [
             'driver'    => 'mysql',
@@ -226,7 +216,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql18' => [
             'driver'    => 'mysql',
@@ -239,7 +228,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql19' => [
             'driver'    => 'mysql',
@@ -252,7 +240,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql20' => [
             'driver'    => 'mysql',
@@ -265,7 +252,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql21' => [
             'driver'    => 'mysql',
@@ -278,7 +264,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
+
         ],
         'mysql22' => [
             'driver'    => 'mysql',
@@ -291,7 +277,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql23' => [
             'driver'    => 'mysql',
@@ -304,7 +289,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
+
         ],
         'mysql24' => [
             'driver'    => 'mysql',
@@ -317,7 +302,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
+
         ],
         'mysql25' => [
             'driver'    => 'mysql',
@@ -330,7 +315,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql26' => [
             'driver'    => 'mysql',
@@ -343,7 +327,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql27' => [
             'driver'    => 'mysql',
@@ -356,7 +339,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
+
         ],
         'mysql28' => [
             'driver'    => 'mysql',
@@ -369,7 +352,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql29' => [
             'driver'    => 'mysql',
@@ -382,7 +364,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql30' => [
             'driver'    => 'mysql',
@@ -395,7 +376,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql31' => [
             'driver'    => 'mysql',
@@ -408,7 +388,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql32' => [
             'driver'    => 'mysql',
@@ -421,7 +400,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql33' => [
             'driver'    => 'mysql',
@@ -434,7 +412,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
     ],
 ];

From ed8995b05d1b3549c74d15f364e48e8c8c9294ac Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Thu, 22 Apr 2021 16:02:06 +0800
Subject: [PATCH 42/60] tunai di tangan

---
 app/Http/Controllers/TebusController.php | 15 +++++++++++++++
 routes/web.php                           |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index e88bae1..607f9d9 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -517,6 +517,21 @@ class TebusController extends Controller
         return response()->json($listadvansur,200);
     }
 
+    public function advansurharini($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)
+        ->sum('upahdibayar');
+
+        return response()->json($listadvansur,200);
+
+    }
+
     public function getAdvansurByKodlaluan($kodcaw,Request $request)
     {
         $current = Carbon::now();
diff --git a/routes/web.php b/routes/web.php
index 97b13a2..ad29cf0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -186,8 +186,10 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']);
     $router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']);
     $router->get('ansuranupah/{kodcaw}',['uses'=>'TebusController@getAdvansurByKodlaluan']);
+    $router->get('advansurharini/{kodcaw}',['uses'=>'TebusController@advansurharini']);
     $router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']);
 
+
     //LAPORAN API
     $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok
     $router->get('stokaudit/aktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditAktif']); //laporan stokaudit Aktif

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 43/60] 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 114f8a11188483bf1430f682481deb802c689ae3 Mon Sep 17 00:00:00 2001
From: Afiq Zakwan Hamdan <afiqzakwanhamdan@gmail.com>
Date: Tue, 27 Apr 2021 16:07:16 +0800
Subject: [PATCH 44/60] fix update jbg

---
 app/Http/Controllers/GadaiController.php | 49 +++++++++++++++++++++++-
 routes/web.php                           |  1 +
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index c709384..02c9d08 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2151,4 +2151,51 @@ class GadaiController extends Controller
         return response()->json($arrayrekod,200);
     }
 
-}
+    public function updateJBGsemasa(){
+        $cawangan = Cawangan::on('mysql7')->get();
+        $current = Carbon::now();
+        foreach($cawangan as $cawangan_mysql){
+            $all_gadai = Gadai::on($cawangan_mysql['mysql'])->whereNotIn('sttebus',['L','T'])->get();
+            foreach($all_gadai as $gadai){
+                if($gadai['t_update'] == null){
+                    $tarikh_update = Carbon::parse($gadai['t_gadai'].' '. $gadai['masa']);
+                }else{
+                    $tarikh_update = Carbon::parse($gadai['t_update'].' 00:00:00' );
+                }
+                $tarikh_gadai = Carbon::parse($gadai['t_gadai'].' '. $gadai['masa']);
+
+                $diff_gadai = date_diff($tarikh_gadai,$current);
+                $year_gadai = $diff_gadai->format("%y") * 12;
+                $month_gadai = $diff_gadai->format("%m");
+                $days_gadai = $diff_gadai->format("%d");
+                $days_gadai = $days_gadai + 1;
+
+                if($days_gadai >= 1 && $days_gadai <= 15){
+                    $extensivemonth_gadai = 0.5;
+                }
+                else if($days_gadai >= 16){
+                    $extensivemonth_gadai = 1;
+                }
+                $tempoh_gadai = $year_gadai + $month_gadai + $extensivemonth_gadai;
+
+                $diff = date_diff($tarikh_update,$current);
+                $year = $diff->format("%y") * 12;
+                $month = $diff->format("%m");
+                $days = $diff->format("%d");
+                $days = $days + 1;
+                if($days >= 1 && $days <= 15){
+                    $extensivemonth = 0.5;
+                }
+                else if($days >= 16){
+                    $extensivemonth = 1;
+                }
+                $tempoh_update = $year + $month + $extensivemonth;
+                Gadai::on($cawangan_mysql['mysql'])->where('norujukan','=',$gadai['norujukan'])->update(array(
+                    'jbg' => $tempoh_update,
+                    'tempoh' => $tempoh_gadai
+                ));
+            }
+        }
+        return response()->json('successful',200);
+    }
+}
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index ad29cf0..83f43c0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -76,6 +76,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     $router->get('check/sag',['uses'=>'GadaiController@checkNorujukan']);
 
+    $router->get('updatejbgsemasa',['uses'=>'GadaiController@updateJBGsemasa']);
 
     //Tebus API
     $router->get('tebustawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusTawarruq']);

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 45/60] 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 d5765574676a2d60d7266bebfadb1d1ffb2b0120 Mon Sep 17 00:00:00 2001
From: Afiq Zakwan Hamdan <afiqzakwanhamdan@gmail.com>
Date: Fri, 30 Apr 2021 17:43:46 +0800
Subject: [PATCH 46/60] advansur

---
 app/Advansur.php                         |  2 +-
 app/Http/Controllers/TebusController.php | 13 ++++++++++++-
 routes/web.php                           |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/Advansur.php b/app/Advansur.php
index 74a863f..88fdd43 100644
--- a/app/Advansur.php
+++ b/app/Advansur.php
@@ -23,7 +23,7 @@ class Advansur extends Model
         'kadarupah',
         'glcode',
         'upahsebenar',
-        'upahdibayar',
+        'upahDibayar',
         'teller',
         'prkod',
         'jbg',
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index e27af16..07d12d4 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -527,6 +527,17 @@ class TebusController extends Controller
         return response()->json($listadvansur,200);
     }
 
+    public function getAdvansurUpah($kodcaw,$norujukan){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $listadvansur = Advansur::on($cawangan['mysql'])
+        ->where('norujukan','=',$norujukan)
+        ->orderBy('tarikh','desc')
+        ->first();
+
+        return response()->json($listadvansur,200);
+    }
+
     public function SenaraiAdvansur($kodcaw,Request $request){
 
         $current = Carbon::now();
@@ -589,7 +600,7 @@ class TebusController extends Controller
             'kadarupah' => $request->kadarupah,
             'glcode' => $request->glcode,
             'upahsebenar' => $request->upahsebenar,
-            'upahdibayar' => $request->upahdibayar,
+            'upahDibayar' => $request->upahdibayar,
             'teller' => $request->teller,
             'prkod' => $request->prkod,
             'jbg' => $request->jbg,
diff --git a/routes/web.php b/routes/web.php
index 83f43c0..d175f03 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -189,6 +189,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('ansuranupah/{kodcaw}',['uses'=>'TebusController@getAdvansurByKodlaluan']);
     $router->get('advansurharini/{kodcaw}',['uses'=>'TebusController@advansurharini']);
     $router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']);
+    $router->get('advansur/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansurUpah']);
 
 
     //LAPORAN API

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 47/60] 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 48/60] 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 49/60] 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 50/60] 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 51/60] 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 52/60] 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,

From c9fe61ebbb130c34e8d8f249f8d151f92bcb894c Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Fri, 7 May 2021 12:47:12 +0800
Subject: [PATCH 53/60] fix imbang duga skit

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

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 7498b05..7f8e5bd 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2178,6 +2178,8 @@ class GadaiController extends Controller
             ->where('tagpalsu','=',0)
             ->where([['t_gadai','<=','2021-04-13'],['sttebus','=','']])
             ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']])
+            // ->where([['hargajualan','=','NULL'],['sttebus','=','']])
+            // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['hargajualan','=','NULL']])
             ->sum('pinjaman');
 
             // $gadaibaru = Gadai::on($cawangan['mysql'])
@@ -2197,15 +2199,16 @@ class GadaiController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        if($request->tarikh > '2021-04-13'){
+        // if($request->tarikh > '2021-04-13'){
         $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
             // ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=',''],['t_update','<=',$request->tarikh]])
             ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
             // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
-            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
+            // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['hargajualan','<>','null']])
             ->sum('pinjaman');
-        }
+        // }
 
         return response()->json($rekod_pinjamandiberi);
     }
@@ -2223,7 +2226,8 @@ class GadaiController extends Controller
 
         $keuntungan = Gadai::on($cawangan['mysql'])
         ->where('t_gadai','<=',$request->tarikh)
-        ->where('t_gadai','>=','2021-04-14')
+        // ->where('t_gadai','>=','2021-04-14')
+        ->where('hargajualan','<>','null')
         // ->where('sttebus','=','')
         ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
         ->whereNotNull('upah12')
@@ -2261,7 +2265,8 @@ class GadaiController extends Controller
         $transaksi = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     ->where('db2.sttebus','=','')
-                    ->where('tarikh_bayaran' ,'>=', $datetawarruq)
+                    // ->where('tarikh_bayaran' ,'>=', $datetawarruq)
+                    ->where('db2.hargajualan','<>','null')
                     ->where('tarikh_bayaran' ,'<=', $daterequest)
                     ->sum('bayaran_pembiayaan');
 
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index efda1e5..418a456 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -864,7 +864,7 @@ class TebusController extends Controller
 
         $rebet = Tebus::on($cawangan['mysql'])
                 ->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
-                ->where('tebus.t_tebus','>','2021-04-13')
+                // ->where('tebus.t_tebus','>','2021-04-13')
                 ->where('tebus.t_tebus','<=',$request->tarikh)
                 ->whereNotNull('db2.hargajualan')
                 ->sum('rebate');

From 0ab4c4966a873a12c8931a34c5e3d1824753059d Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Fri, 7 May 2021 16:52:04 +0800
Subject: [PATCH 54/60] fix wcy dan kb2

---
 app/Http/Controllers/GadaiController.php  | 19 +++++++---
 app/Http/Controllers/LelongController.php | 42 +++++++++++++++--------
 app/Http/Controllers/TebusController.php  |  4 +--
 app/Http/Controllers/TunaiController.php  |  2 +-
 4 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 7f8e5bd..a3bff0f 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2168,6 +2168,17 @@ class GadaiController extends Controller
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
+        $tarikhtawarruq = '';
+
+        switch ($kodcaw) {
+            case 'KB2':
+                $tarikhtawarruq = '2021-04-13';
+              break;
+            case 'WCY':
+                $tarikhtawarruq = '2021-05-04';
+              break;
+          }
+
         $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',1)
             ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
@@ -2176,10 +2187,8 @@ class GadaiController extends Controller
 
             $rekod_pinjamandiberi = 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']])
-            // ->where([['hargajualan','=','NULL'],['sttebus','=','']])
-            // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['hargajualan','=','NULL']])
+            ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
+            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$tarikhtawarruq]])
             ->sum('pinjaman');
 
             // $gadaibaru = Gadai::on($cawangan['mysql'])
@@ -2203,7 +2212,7 @@ class GadaiController extends Controller
         $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
             // ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=',''],['t_update','<=',$request->tarikh]])
-            ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=',''],['hargajualan','<>','NULL']])
             // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
             ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['hargajualan','<>','null']])
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 0f5cc64..142f011 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -142,33 +142,45 @@ class LelongController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
 
-        $bakilelonglama = imbangdugalama::on($cawangan['mysql'])
-            ->sum('baki_lelong');
+        // $bakilelonglama = imbangdugalama::on($cawangan['mysql'])
+        //     ->sum('baki_lelong');
 
-        $rugilelonglama = imbangdugalama::on($cawangan['mysql'])
-            ->sum('rugi_lelong');
+        // $rugilelonglama = imbangdugalama::on($cawangan['mysql'])
+        //     ->sum('rugi_lelong');
 
 
-        if($request->tarikh <= '2021-02-25')
+        if($kodcaw == 'KB2')
         {
-            $bakilelong = Lelong::on($cawangan['mysql'])
-            ->where('t_jual','<=',$request->tarikh)
-            ->where(function($query) use ($tarikhbaru){
-                $query->whereNull('trkhtuntut')
-                      ->orWhere('trkhtuntut','>',$tarikhbaru);
-            })
-            ->where('baki','>=',0)
-            ->sum('baki');
+            if($request->tarikh <= '2021-02-25')
+            {
+                $bakilelong = Lelong::on($cawangan['mysql'])
+                ->where('t_jual','<=',$request->tarikh)
+                ->where(function($query) use ($tarikhbaru){
+                    $query->whereNull('trkhtuntut')
+                        ->orWhere('trkhtuntut','>',$tarikhbaru);
+                })
+                ->where('baki','>=',0)
+                ->sum('baki');
+            }else{
+                $bakilelong = Lelong::on($cawangan['mysql'])
+                ->where('t_jual','<=',$request->tarikh)
+                ->where(function($query) use ($tarikhbaru){
+                    $query->whereNull('trkhtuntut')
+                        ->orWhere('trkhtuntut','>','2021-02-25');
+                })
+                ->where('baki','>=',0)
+                ->sum('baki');
+            } 
         }else{
             $bakilelong = Lelong::on($cawangan['mysql'])
             ->where('t_jual','<=',$request->tarikh)
             ->where(function($query) use ($tarikhbaru){
                 $query->whereNull('trkhtuntut')
-                      ->orWhere('trkhtuntut','>','2021-02-25');
+                    ->orWhere('trkhtuntut','>',$tarikhbaru);
             })
             ->where('baki','>=',0)
             ->sum('baki');
-        } 
+        }
        
 
 
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 418a456..5f2d8ba 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -355,7 +355,6 @@ class TebusController extends Controller
             'kodcaw'=> $kodcaw
         ]);
 
-        
         if($request->jenistebus == 'P'){
             $baki_hargajualan = $gadai['bakihargajualan'] - $request->bakiupah;
             $transaction = Transaction::on('mysql7')->create([
@@ -866,8 +865,9 @@ class TebusController extends Controller
                 ->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
                 // ->where('tebus.t_tebus','>','2021-04-13')
                 ->where('tebus.t_tebus','<=',$request->tarikh)
+                ->where('db2.hargajualan','>','0') // tambahan 2021-05-07
                 ->whereNotNull('db2.hargajualan')
-                ->sum('rebate');
+                ->sum('rebate');      
 
         return response($rebet);
     }
diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php
index 2bbc657..be6f87d 100644
--- a/app/Http/Controllers/TunaiController.php
+++ b/app/Http/Controllers/TunaiController.php
@@ -85,7 +85,7 @@ class TunaiController extends Controller
         $current = new Carbon();
        
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
-        $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
+        $updatetunai = Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
         update(array(
              'keluar'=>$request->keluar,
               'masuk'=>$request->masuk,

From 9601a2c50026c8ecdf022b8fbf1b0c4a76efeb78 Mon Sep 17 00:00:00 2001
From: "e.arrahn" <e.arrahn@gmail.com>
Date: Fri, 7 May 2021 16:59:48 +0800
Subject: [PATCH 55/60] production

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

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 7498b05..aff9ae0 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2337,6 +2337,7 @@ class GadaiController extends Controller
     public function updateJBGsemasa(){
         $cawangan = Cawangan::on('mysql7')->get();
         $current = Carbon::now();
+
         foreach($cawangan as $cawangan_mysql){
             $all_gadai = Gadai::on($cawangan_mysql['mysql'])->whereNotIn('sttebus',['L','T'])->get();
             foreach($all_gadai as $gadai){
@@ -2345,7 +2346,7 @@ class GadaiController extends Controller
                 }else{
                     $tarikh_update = Carbon::parse($gadai['t_update'].' 00:00:00' );
                 }
-                $tarikh_gadai = Carbon::parse($gadai['t_gadai'].' '. $gadai['masa']);
+                $tarikh_gadai = Carbon::parse($gadai['t_gadai']. ' 00:00:00');
 
                 $diff_gadai = date_diff($tarikh_gadai,$current);
                 $year_gadai = $diff_gadai->format("%y") * 12;
@@ -2381,4 +2382,4 @@ class GadaiController extends Controller
         }
         return response()->json('successful',200);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index efda1e5..7534388 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -831,7 +831,7 @@ class TebusController extends Controller
         $daterequest = new Carbon($request->tarikh);
         $daterequest->addDays(1);
 
-        $dateSM = new Carbon('2021-04-21');
+        $dateSM = new Carbon('2021-04-24');
         $dateSM->addDays(1);
 
         $current = Carbon::now();
@@ -840,6 +840,7 @@ class TebusController extends Controller
         $keuntungan = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
+		    ->where('transaksi_keuntungan.tarikh_bayaran', '<=', $daterequest)
                     ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM)
                     ->whereYear('tarikh_bayaran','=',$current->year)
                     ->whereNotNull('db2.hargajualan')
@@ -849,6 +850,7 @@ class TebusController extends Controller
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
                     ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
+		    ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
                     ->whereYear('tarikh_bayaran','=',$current->year)
                     ->whereNotNull('db2.hargajualan')
                     ->sum('keuntungan_rebet');

From 6f1acea367dcc6bb43e721fc8ec468e4a9b7a6b8 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Sun, 9 May 2021 20:26:53 +0800
Subject: [PATCH 56/60] fix laporan ansuran

---
 app/Http/Controllers/GadaiController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 95e6023..cce08db 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -899,6 +899,7 @@ class GadaiController extends Controller
                     $join->on('transaction.norujukan', '=', 'trans.norujukan');
                     $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
                 })
+                ->where('transaction.kodcaw','=',$kodcaw)
                 ->where('transaction.trans_type','=','A')
                 ->whereDate('transaction.created_at','=',$dateans)
                 ->get();

From 6542467a48aea5d74d402eaf14ab097a4ad2b042 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Tue, 11 May 2021 12:53:05 +0800
Subject: [PATCH 57/60] laporan imbang duga 1stop

---
 app/Http/Controllers/GadaiController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index cce08db..38d1a59 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2178,6 +2178,9 @@ class GadaiController extends Controller
             case 'WCY':
                 $tarikhtawarruq = '2021-05-04';
               break;
+            case '1STOP':
+                $tarikhtawarruq = '2021-05-09';
+            break;
           }
 
         $rekod_emaspalsu = Gadai::on($cawangan['mysql'])

From 597e2be0f933835a9d1fb09a1ef98bd30df68786 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 12 May 2021 17:44:11 +0800
Subject: [PATCH 58/60] pelanggan

---
 app/Http/Controllers/CustomerController.php | 31 +++++++++++++++++++++
 app/Http/Controllers/GadaiController.php    |  8 ++----
 routes/web.php                              |  1 +
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php
index 24de4c8..36a4f3d 100644
--- a/app/Http/Controllers/CustomerController.php
+++ b/app/Http/Controllers/CustomerController.php
@@ -397,6 +397,37 @@ class CustomerController extends Controller
         return response()->json($customer_update, 200);
     }
 
+    public function customerUpdateKhazanah($nokp,Request $request){
+        $cawangan_all = Cawangan::on('mysql7')->get();
+        foreach($cawangan_all as $index=>$cawangan){
+            $customer = Customer::on($cawangan['mysql'])
+            ->where('kplama','=',$nokp)
+            ->orWhere('kpbaru','=',$nokp)
+            ->first();
+            if($customer != null){
+                $poskod = Poskod::on('mysql7')->where('poskod','=',$request->poskod)->first();
+
+                $customer_update = Customer::on($cawangan['mysql'])
+                ->where('kplama','=',$nokp)
+                ->orWhere('kpbaru','=',$nokp)
+                ->update(array(
+                    'telefon' => $request->telefon1,
+                    'telefon2' => $request->telefon2,
+                    'kodbank' => $request->kodbank,
+                    'noakaun' => $request->noakaun,
+                    'nota' => $request->nota,
+                    'nama' => $request->nama,
+                    'alamat1' => $request->alamat,
+                    'poskod' => $request->poskod,
+                    'koddaerah' => $poskod['koddaerah'],
+                    'kodnegeri' => $poskod['kodnegeri']
+                ));
+            }
+        }
+        
+        return response()->json($customer_update, 200);
+    }
+
     public function listNorujukanMobile($nokp){
         $cawangan_all = Cawangan::on('mysql7')->get();
         $array_norujukan = [];
diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 38d1a59..f607009 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -925,11 +925,6 @@ class GadaiController extends Controller
 
         $array_kawalanstok = [];
 
-
-        $kawalanstoklama = KawalanStokLama::on($cawangan['mysql'])
-                            ->get();
-
-
         ////////////
         ///GADAI////
         ///////////
@@ -1083,6 +1078,9 @@ class GadaiController extends Controller
 
         if($kodcaw == 'KB2')
         {
+            $kawalanstoklama = KawalanStokLama::on($cawangan['mysql'])
+                            ->get();
+                            
             foreach($kawalanstoklama as $indexgad => $gadaikawalanstok)
             {
                 //Gadai 
diff --git a/routes/web.php b/routes/web.php
index 13c97dd..ff98e11 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -29,6 +29,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->delete('customers/{kodcaw}/{nokp}', ['uses' => 'CustomerController@delete']);
     $router->put('customers/update/{nokp}', ['uses' => 'CustomerController@customerUpdate']);
     $router->put('customers/update/kaunter/{nokp}', ['uses' => 'CustomerController@customerUpdateKaunter']);
+    $router->put('customers/update/khazanah/{nokp}', ['uses' => 'CustomerController@customerUpdateKhazanah']);
     $router->get('customers/laporan/{kodcaw}/{tarikh}',['uses'=>'CustomerController@getLaporanCustomers']);
     $router->get('customers/latest/{kodcaw}',['uses'=>'CustomerController@getLatestCustomer']);
 

From 33d19d9fe5419dee4c5507205469492872920bc3 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 19 May 2021 16:35:33 +0800
Subject: [PATCH 59/60] fix imbang duga jelawat

---
 app/Http/Controllers/DaerahController.php  |  9 ++++
 app/Http/Controllers/GadaiController.php   | 15 ++++--
 app/Http/Controllers/LaporanController.php | 38 +++++++++++++--
 app/Http/Controllers/NegeriController.php  | 10 ++++
 app/Http/Controllers/PolisController.php   | 57 ++++++++++++++++++++++
 app/Http/Controllers/VaultController.php   | 56 ++++++++++++++-------
 app/Polis.php                              | 37 ++++++++++++++
 routes/web.php                             |  9 ++++
 8 files changed, 207 insertions(+), 24 deletions(-)
 create mode 100644 app/Http/Controllers/PolisController.php
 create mode 100644 app/Polis.php

diff --git a/app/Http/Controllers/DaerahController.php b/app/Http/Controllers/DaerahController.php
index f1e3d19..56c4b80 100644
--- a/app/Http/Controllers/DaerahController.php
+++ b/app/Http/Controllers/DaerahController.php
@@ -14,4 +14,13 @@ class DaerahController extends Controller
                     ->first();
         return response()->json($daerah);
     }
+
+    public function showOneNegeri($kodnegeri)
+    {
+        $daerah = Daerah::on('mysql7')
+                    ->where('kodnegeri','=',$kodnegeri)
+                    ->get();
+                    
+        return response()->json($daerah);
+    }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index f607009..b8d5134 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1148,6 +1148,7 @@ class GadaiController extends Controller
                     ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
                     ->where('trans.created_at','<',$daterequest)
                     ->where('trans.trans_type','=','A')
+                    ->where('db2.sttebus','=','')
                     ->whereBetween('nilaimarhun', [1, 400.99])
                     ->groupBy('trans.id')
                     ->get();
@@ -1162,6 +1163,7 @@ class GadaiController extends Controller
                     // ->where('trans.created_at','=',$daterequest)
                     ->whereDate('trans.created_at','=',$tarikh)
                     ->where('trans.trans_type','=','A')
+                    ->where('db2.sttebus','=','')
                     ->whereBetween('nilaimarhun', [1, 400.99])
                     ->groupBy('trans.id')
                     ->get();
@@ -1175,6 +1177,7 @@ class GadaiController extends Controller
                     ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
                     ->where('trans.created_at','<',$daterequest)
                     ->where('trans.trans_type','=','A')
+                    ->where('db2.sttebus','=','')
                     ->whereBetween('nilaimarhun', [401, 2000.99])
                     ->groupBy('trans.id')
                     ->get();
@@ -1188,6 +1191,7 @@ class GadaiController extends Controller
                     ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
                     ->whereDate('trans.created_at','=',$tarikh)
                     ->where('trans.trans_type','=','A')
+                    ->where('db2.sttebus','=','')
                     ->whereBetween('nilaimarhun', [401, 2000.99])
                     ->groupBy('trans.id')
                     ->get();
@@ -1201,6 +1205,7 @@ class GadaiController extends Controller
                     ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
                     ->where('trans.created_at','<',$daterequest)
                     ->where('trans.trans_type','=','A')
+                    ->where('db2.sttebus','=','')
                     ->whereBetween('nilaimarhun', [2001, 100000])
                     ->groupBy('trans.id')
                     ->get();
@@ -1214,6 +1219,7 @@ class GadaiController extends Controller
                     ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
                     ->whereDate('trans.created_at','=',$tarikh)
                     ->where('trans.trans_type','=','A')
+                    ->where('db2.sttebus','=','')
                     ->whereBetween('nilaimarhun', [2001, 100000])
                     ->groupBy('trans.id')
                     ->get();
@@ -2179,6 +2185,9 @@ class GadaiController extends Controller
             case '1STOP':
                 $tarikhtawarruq = '2021-05-09';
             break;
+            case '020301';
+                $tarikhtawarruq = '2021-05-19';
+            break;
           }
 
         $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
@@ -2275,10 +2284,8 @@ class GadaiController extends Controller
 
         $transaksi = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-                    ->where('db2.sttebus','=','')
-                    // ->where('tarikh_bayaran' ,'>=', $datetawarruq)
-                    ->where('db2.hargajualan','<>','null')
-                    ->where('tarikh_bayaran' ,'<=', $daterequest)
+                    ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]])
+                    ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]])
                     ->sum('bayaran_pembiayaan');
 
         return response($transaksi);
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 3d5e762..0c35076 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -16,6 +16,7 @@ use App\Advansur;
 use App\Vault;
 use App\Tunai;
 use App\Denominasi;
+use App\Hapuskira;
 
 use Carbon\Carbon;
 
@@ -119,8 +120,17 @@ class LaporanController extends Controller
                 ->sum('pinjaman');
             }
 
-        $outstandingimbangduga = floatval($rekodkoop) + floatval($rekodtawarruq);
+        $daterequest = new Carbon($request->tarikh);
+        $daterequest->addDays(1);
 
+        $bayaranpendahuluan = TransaksiKeuntungan::on('mysql7')
+            ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+            ->where('db2.sttebus','=','')
+            ->where('db2.hargajualan','<>','null')
+            ->where('tarikh_bayaran' ,'<=', $daterequest)
+            ->sum('bayaran_pembiayaan');
+
+        $outstandingimbangduga = floatval($rekodkoop) + floatval($rekodtawarruq) - floatval($bayaranpendahuluan);
    
         /* Stok Audit */
 
@@ -129,10 +139,19 @@ class LaporanController extends Controller
                     ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
                     ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
 
-        $stokauditpembiayaan = $stokaudit->sum('pinjaman');
+        $stokauditget = $stokaudit->get();         
         $stokauditnilaimarhun = $stokaudit->sum('nilaimarhun'); 
         $stokauditcount = $stokaudit->count(); 
 
+        $totalstokaudit = 0;
+        foreach($stokauditget as $index1=>$stokA)
+        {
+            if($stokA['hargajualan'] == null)
+                $totalstokaudit += $stokA['pinjaman'];
+            else
+                $totalstokaudit += $stokA['bakipjm'];
+        }
+
 
         /* Kawalan Stok */
 
@@ -207,7 +226,7 @@ class LaporanController extends Controller
             'total_keuntungan'=>floatval($total_keuntungan),
             'petibesi_sistem'=>$petibesi_sistem,
             'petibesi_deno'=>$petibesi_deno,
-            'stokauditpembiayaan'=>$stokauditpembiayaan,
+            'stokauditpembiayaan'=>$totalstokaudit,
             'stokauditnilaimarhun'=>$stokauditnilaimarhun,
             'stokauditcount'=>$stokauditcount,
             'petibesiimbangduga'=>$totalbakiakhirtunai,
@@ -217,4 +236,17 @@ class LaporanController extends Controller
             
         return response()->json($laporan_harian);
     }
+
+
+    public function CalcHapusKira($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $hapuskira = HapusKira::on($cawangan['mysql'])
+                        ->where('kodcaw','=',$kodcaw)
+                        ->where('tarikh','<',$request->tarikh)
+                        ->sum('amaun');
+
+        return response()->json($hapuskira);
+    }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/NegeriController.php b/app/Http/Controllers/NegeriController.php
index 22e2534..c060b92 100644
--- a/app/Http/Controllers/NegeriController.php
+++ b/app/Http/Controllers/NegeriController.php
@@ -14,4 +14,14 @@ class NegeriController extends Controller
                     ->first();
         return response()->json($negeri);
     }
+
+    public function NegeriListAll()
+    {
+        $negeri = Negeri::on('mysql7')
+                    ->where('kodnegeri','<>','17')
+                    ->where('kodnegeri','<>','00')
+                    ->get();
+
+        return response()->json($negeri);
+    }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/PolisController.php b/app/Http/Controllers/PolisController.php
new file mode 100644
index 0000000..5f92ddb
--- /dev/null
+++ b/app/Http/Controllers/PolisController.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Polis;
+use App\Cawangan;
+use Illuminate\Http\Request;
+
+use Carbon\Carbon;
+
+class PolisController extends Controller
+{
+    public function getPolis(Request $request){
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $polis = Polis::on($cawangan['mysql'])
+                 ->where('norujukan','=',$request->norujukan)
+                 ->get();
+        
+        return response()->json($polis);
+    }
+
+    public function PolischangeTebus(Request $request){
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $polis = Polis::on($cawangan['mysql'])
+                 ->where('norujukan','=',$request->norujukan)
+                 ->update(['tebus' => $request->tebus]);
+        
+        return response()->json($polis);
+    }
+
+    public function createPolis(Request $request)
+    {
+        $harini = Carbon::now();
+        $harini = new Carbon;
+  
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+        
+        $polis = Polis::on($cawangan['mysql'])
+                 ->create([ 
+                    'tarikh' => $harini->toDateString(),
+                    'kodcaw' => $request->kodcaw,
+                    'norujukan' => $request->norujukan,
+                    'komen1' => $request->komen1,
+                    'komen2' => $request->komen2,
+                    'tebus' => 0,
+                    'teller' => $request->teller,
+                    'caj' => 0.00
+        ]);
+        
+        return response()->json($polis);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index dacd164..2d2d4dc 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -321,29 +321,50 @@ class VaultController extends Controller
 
 
       //Sebelum Tawarruq
+      if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP')
+      {
+         $serahanpkb = GlDetail::on($cawangan['mysql'])
+            ->where('dtacct','=',$serahanpkb)
+            ->where('tarikh','<=', $request->tarikh)
+            ->where('tarikh','>','2013-12-31')
+            ->sum('amaun');
 
-      $serahanpkb = GlDetail::on($cawangan['mysql'])
-         ->where('dtacct','=',$serahanpkb)
-         ->where('tarikh','<=', $request->tarikh)
-         ->where('tarikh','>','2013-12-31')
-         ->sum('amaun');
+         $serahanJMC = GlDetail::on($cawangan['mysql'])
+            ->where('dtacct','=',$serahanjmc)
+            ->where('tarikh','<=', $request->tarikh)
+            ->where('tarikh','>','2013-12-31')
+            ->sum('amaun');
 
-      $serahanJMC = GlDetail::on($cawangan['mysql'])
-         ->where('dtacct','=',$serahanjmc)
-         ->where('tarikh','<=', $request->tarikh)
-         ->where('tarikh','>','2013-12-31')
-         ->sum('amaun');
+         $serahanpkblama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('serahan_pkb');
 
-      $serahanpkblama = imbangdugalama::on($cawangan['mysql'])
-         ->sum('serahan_pkb');
+         $serahanjmclama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('serahan_jmc');
 
-      $serahanjmclama = imbangdugalama::on($cawangan['mysql'])
-         ->sum('serahan_jmc');
+         $totaljmc = $serahanJMC + $serahanjmclama;
+         $totalpkb = $serahanpkb + $serahanpkblama;
 
-      $totaljmc = $serahanJMC + $serahanjmclama;
-      $totalpkb = $serahanpkb + $serahanpkblama;
+         $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb;
+      }else{
 
-      $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb;
+         if($kodcaw == '020301')
+            $serahanbaru = '1000/030';
+         else
+            $serahanbaru = '1000/026';
+
+         $serahanpkb = GlDetail::on($cawangan['mysql'])
+            ->where('dtacct','=',$serahanpkb)
+            ->where('tarikh','<=', $request->tarikh)
+            ->sum('amaun');
+
+         $serahanJMC = GlDetail::on($cawangan['mysql'])
+            ->where('dtacct','=',$serahanbaru)
+            ->where('tarikh','<=', $request->tarikh)
+            ->sum('amaun');
+
+         $totalserahan = $serahanpkbTawarruq + $serahanpkb + $serahanJMC;
+      }
+     
 
 
       //Selepas Tawarruq
@@ -375,6 +396,7 @@ class VaultController extends Controller
 
       $pindahkekpkb = GlCode::on($cawangan['mysql'])
       ->where('glcode','=',$serahankoperasi)
+      ->orWhere('glcode','=',)
       ->sum('amaun');
 
       $arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb];
diff --git a/app/Polis.php b/app/Polis.php
new file mode 100644
index 0000000..c705d76
--- /dev/null
+++ b/app/Polis.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Polis extends Model
+{
+    protected $table = 'polis';
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'tarikh',
+        'kodcaw',
+        'norujukan',
+        'komen1',
+        'komen2',
+        'tebus',
+        'recno',
+        'teller',
+        'caj'
+    ];
+
+    
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index ff98e11..dfeb456 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -145,9 +145,11 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //Negeri API
     $router->get('negeri/{kodnegeri}',['uses'=>'NegeriController@showOneNegeri']);
+    $router->get('negeri/',['uses'=>'NegeriController@NegeriListAll']);
 
     //Daerah API
     $router->get('daerah/{koddaerah}',['uses'=>'DaerahController@showOneDaerah']);
+    $router->get('daerahkodnegeri/{kodnegeri}',['uses'=>'DaerahController@showOneNegeri']);
 
     //Bank API
     $router->get('bank',['uses'=>'BankController@showAllBank']);
@@ -193,6 +195,11 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']);
     $router->get('advansur/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansurUpah']);
 
+    //POLIS API
+    $router->get('polis/get/',['uses'=>'PolisController@getPolis']); 
+    $router->put('polis/put/',['uses'=>'PolisController@PolischangeTebus']); 
+    $router->post('polis/create/',['uses'=>'PolisController@createPolis']);
+
 
     //LAPORAN API
     $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok
@@ -361,6 +368,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('KeuntunganSebenar/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenar']); //Keuntungan Sebenar
     $router->get('UntungRugiTerkumpul/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun
     $router->get('cajperkhidmatanterkumpul/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun
+    $router->get('CalculationHapusKira/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); //Hapus Kira
+
 
     //-- Untung Rugi --//
     $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar

From 82708b046c9c7c1e6238f1b5f1193afddb3ccb7f Mon Sep 17 00:00:00 2001
From: "e.arrahn" <e.arrahn@gmail.com>
Date: Wed, 19 May 2021 16:39:23 +0800
Subject: [PATCH 60/60] daripada server

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

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 38d1a59..d005710 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -926,10 +926,6 @@ class GadaiController extends Controller
         $array_kawalanstok = [];
 
 
-        $kawalanstoklama = KawalanStokLama::on($cawangan['mysql'])
-                            ->get();
-
-
         ////////////
         ///GADAI////
         ///////////
@@ -1083,6 +1079,10 @@ class GadaiController extends Controller
 
         if($kodcaw == 'KB2')
         {
+
+		$kawalanstoklama = KawalanStokLama::on($cawangan['mysql'])
+                            ->get();
+
             foreach($kawalanstoklama as $indexgad => $gadaikawalanstok)
             {
                 //Gadai 
@@ -2181,6 +2181,9 @@ class GadaiController extends Controller
             case '1STOP':
                 $tarikhtawarruq = '2021-05-09';
             break;
+	    case '020301';
+                $tarikhtawarruq = '2021-05-19';
+            break;
           }
 
         $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
@@ -2277,10 +2280,8 @@ class GadaiController extends Controller
 
         $transaksi = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-                    ->where('db2.sttebus','=','')
-                    // ->where('tarikh_bayaran' ,'>=', $datetawarruq)
-                    ->where('db2.hargajualan','<>','null')
-                    ->where('tarikh_bayaran' ,'<=', $daterequest)
+                    ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]])
+                    ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]])
                     ->sum('bayaran_pembiayaan');
 
         return response($transaksi);
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 7734ed3..9795d8a 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -155,7 +155,7 @@ class TebusController extends Controller
         $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
         
         $upah_sebenar = $upah_asal - $rebet;
-        $upahsemasa = $upah_sebenar * $gadai_data['jbg'];
+        $upahsemasa = $upah_sebenar * $gadai_data['tempoh'];
         $upah_semasa = bcdiv(round($upahsemasa,2),1,1);
         $upah_semasa = number_format($upah_semasa,2);
         if(strpos($upah_semasa,',')){
@@ -185,7 +185,7 @@ class TebusController extends Controller
         $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
         
         $upah_sebenar = $upah_asal - $rebet;
-        $upahsemasa = $upah_sebenar * $gadai_data['jbg'];
+        $upahsemasa = $upah_sebenar * $gadai_data['tempoh'];
         $upah_semasa = bcdiv(round($upahsemasa,2),1,1);
         $upah_semasa = number_format($upah_semasa,2);
         if(strpos($upah_semasa,',')){