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);