diff --git a/app/Bajet.php b/app/Bajet.php
new file mode 100644
index 0000000..e6d6b0b
--- /dev/null
+++ b/app/Bajet.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Bajet extends Model
+{
+    protected $table = 'bajet';
+    protected $connection = 'mysql7';
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    // protected $fillable = [
+        
+    // ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}
\ No newline at end of file
diff --git a/app/BajetTahunan.php b/app/BajetTahunan.php
new file mode 100644
index 0000000..42dd507
--- /dev/null
+++ b/app/BajetTahunan.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class BajetTahunan extends Model
+{
+    protected $table = 'bajettahunan';
+    protected $connection = 'mysql7';
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    // protected $fillable = [
+        
+    // ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
new file mode 100644
index 0000000..557be53
--- /dev/null
+++ b/app/Http/Controllers/AdminPageController.php
@@ -0,0 +1,1445 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Cawangan;
+use App\Customer;
+use App\Transaction;
+use App\Gadai;
+use App\Lelong;
+use App\Tebus;
+use App\Vault;
+use App\Gldetail;
+use App\Panjar;
+use App\TransactionOnline;
+use App\Tunai;
+use App\AddTunai;
+use App\TuntutBaki;
+use App\Advansur;
+use App\TransaksiKeuntungan;
+use App\Bajet;
+use App\BajetTahunan;
+use App\Blacklist;
+
+
+use DB;
+use Carbon\Carbon;
+
+use Illuminate\Http\Request;
+
+class AdminPageController extends Controller
+{
+
+    public function showAllCawangans()
+    {
+        return response()->json(Cawangan::on('mysql7')->get());
+    }
+
+    public function showOneCustomer($id){
+        $customer = Customer::on('mysql7')
+        ->where('id','=',$id)
+        ->first();
+
+        return response()->json($customer);
+    }
+
+    public function TunaiPaginateforAdmin($kodcaw,Request $request)
+    {
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $tunai=Tunai::on($cawangan['mysql'])
+        ->where([['kodcaw','=',$kodcaw],['tarikh','<=',$current->toDateString()],['kodlaluan','=',$request->kodlaluan]])
+        ->orderBy('tarikh','desc')
+        ->paginate(5);
+        
+        return response()->json($tunai);
+
+    }
+
+    public function getTarikhTunai($kodcaw,Request $request)
+    {
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $tunai=Tunai::on($cawangan['mysql'])
+        ->where([['kodcaw','=',$kodcaw],['tarikh','=',$request->tarikh],['kodlaluan','=',$request->kodlaluan]])
+        ->orderBy('tarikh','desc')
+        ->first();
+
+        return response()->json($tunai);
+
+    }
+
+    public function getAddTunaiDateKodlaluan($kodcaw,Request $request)
+    {
+       
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $addtunai=AddTunai::on($cawangan['mysql'])->where([['kodcaw','=',$kodcaw],['kodlaluan','=',$request->kodlaluan],['tarikh','=',$request->tarikh]])->get();
+        return response()->json($addtunai);
+    }
+
+    public function SenaraiAdvansurTarikh($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','=',$request->tarikh)
+        ->orderBy('tarikh','desc')
+        ->get();
+
+        return response()->json($listadvansur,200);
+    }
+
+    public function showTuntutBakiTarikhTeller($kodcaw,Request $request){
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $tuntutbaki = TuntutBaki::on($cawangan['mysql'])
+            ->where('tarikh','=', $request->tarikh)
+            ->where('teller','=', $request->teller)
+            ->get();
+
+        return response()->json($tuntutbaki,200);
+    }
+
+    public function LelonganTarikh($kodcaw,Request $request)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $lelong = Lelong::on($cawangan['mysql'])
+        ->whereNotNull('t_jual')
+        ->where('t_jual','=', $request->tarikh)
+        ->sum('hargajual');
+
+        return response()->json($lelong,200);
+    }
+    
+
+    public function PetiBesiPaginateforAdmin($kodcaw,Request $request)
+    {
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $vault=Vault::on($cawangan['mysql'])
+                ->where('kodcaw','=',$kodcaw)
+                ->orderby('tarikh','desc')
+                ->paginate(5);
+     
+        return response()->json($vault);
+    }
+
+    public function TahunanGadai(Request $request)
+    {
+            
+        $current = Carbon::now();
+        $current = new Carbon();
+        
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $arrayGadai = [];
+        $bajetgroup = BajetTahunan::on('mysql7')
+                ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
+                ->where('bajettahunan.kodcaw','=', $request->kodcaw)
+                ->where('jenisbajet','=','Gadai')
+                ->whereYear('bajettahunan.tahun', '=', $current->year)
+                ->sum('nilaibajet');
+
+        $gadai = Gadai::on($cawangan['mysql'])
+                ->selectRaw('SUM(pinjaman) AS totalpinjaman')
+                ->whereYear('t_gadai',$current->year)
+                ->sum('pinjaman');
+
+                
+        array_push($arrayGadai,['bajet' => $bajetgroup,'total' => $gadai]);
+
+        return response()->json($arrayGadai);
+    }
+
+    public function TahunanTebus(Request $request)
+    {    
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+        
+        $arrayTebus = [];
+
+        $bajetgroup = BajetTahunan::on('mysql7')
+                ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
+                ->where('bajettahunan.kodcaw','=', $request->kodcaw)
+                ->where('jenisbajet','=','Penebusan')
+                ->whereYear('bajettahunan.tahun', '=', $current->year)
+                ->sum('nilaibajet');
+
+        $tebus = Gadai::on($cawangan['mysql'])
+                ->whereYear('t_update',$current->year)
+                ->where('sttebus','=','T')
+                ->sum('pinjaman');
+
+                
+        array_push($arrayTebus,['bajet' => $bajetgroup,'total' => $tebus]);
+
+        return response()->json($arrayTebus);
+    }
+
+    public function TahunanKeuntungan(Request $request)
+    {
+            
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+        
+        $arrayKeuntungan = [];
+
+        $monthly = Carbon::now();
+        $monthly = new Carbon();
+
+        $monthly_date = $monthly->startOfMonth()->subMonths(11)->toDateString();
+
+        $bajetgroup = BajetTahunan::on('mysql7')
+                ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
+                ->where('bajettahunan.kodcaw','=', $request->kodcaw)
+                ->where('jenisbajet','=','Keuntungan')
+                ->whereYear('bajettahunan.tahun', '=', $current->year)
+                ->sum('nilaibajet');   
+
+        $lelongupahsimpan = Lelong::on($cawangan['mysql'])
+                    ->selectRaw('SUM(bakiupah) AS totalupahlelong')
+                    ->addSelect(DB::connection($cawangan['mysql'])
+                    ->raw('DATE_FORMAT(t_jual, "%Y-%m") as t_jual'))
+                    ->groupBy(DB::connection($cawangan['mysql'])
+                    ->raw("DATE_FORMAT(t_jual,'%Y%m')"))
+                    ->whereYear('t_jual',$current->year)
+                    ->where([['t_jual','<=',$current->toDateString()],['t_jual','>=',$monthly_date]])
+                    ->orderBy('t_jual','asc')
+                    ->get();
+
+        $totallelong = 0;
+        foreach($lelongupahsimpan as $index=>$lelong)
+        {
+                $totallelong += $lelong['totalupahlelong'];
+        }
+
+
+        $tebus = Tebus::on($cawangan['mysql'])
+                    ->selectRaw('SUM(bakiupah) AS totalupahsimpan')
+                    ->addSelect(DB::connection($cawangan['mysql'])
+                    ->raw('DATE_FORMAT(t_tebus, "%Y-%m") as t_tebus'))
+                    ->groupBy(DB::connection($cawangan['mysql'])
+                    ->raw("DATE_FORMAT(t_tebus,'%Y%m')"))
+                    ->whereYear('t_tebus',$current->year)
+                    ->where([['jenistebus','=','T'],['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$monthly_date]])
+                    ->orWhere([['jenistebus','=','A'],['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$monthly_date]])
+                    ->orderBy('t_tebus','asc')
+                    ->get();
+
+        $totaltebus = 0;
+        foreach($tebus as $index=>$teb)
+        {
+                $totaltebus += $teb['totalupahsimpan'];
+        }
+
+
+        $total = $totaltebus + $totallelong;
+        
+        // $total = $lelongupahsimpan + $tebus;
+
+        array_push($arrayKeuntungan,['bajet' => $bajetgroup,'total' => $total]);
+
+        return response()->json($arrayKeuntungan);
+
+    }
+
+    public function PembiayaanBulanan(Request $request){
+
+        $current = Carbon::now();
+        $current = new Carbon();
+        $monthly = Carbon::now();
+        $monthly = new Carbon();
+        $monthly_array = Carbon::now();
+        $monthly_array = new Carbon();
+
+        $monthly_date = $monthly->startOfMonth()->subMonths(11)->toDateString();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $arraybulanan = [];
+        $array_totalup = [];
+
+        for($i=0;$i<12;$i++){
+              
+                    switch($i+1){
+                        case 1: $namabulan = 'Jan';
+                                $tarikh = $current->year . '-' . '01';
+                                break;
+                        case 2: $namabulan = 'Feb';
+                                $tarikh = $current->year . '-' . '02';
+                                break;
+                        case 3: $namabulan = 'Mac';
+                                $tarikh = $current->year . '-' . '03';
+                                break;
+                        case 4: $namabulan = 'Apr';
+                                $tarikh = $current->year . '-' . '04';
+                                break;
+                        case 5: $namabulan = 'Mei';
+                                $tarikh = $current->year . '-' . '05';
+                                break;
+                        case 6: $namabulan = 'Jun';
+                                $tarikh = $current->year . '-' . '06';
+                                break;
+                        case 7: $namabulan = 'Jul';
+                                $tarikh = $current->year . '-' . '07';
+
+                                break;
+                        case 8: $namabulan = 'Aug';
+                                $tarikh = $current->year . '-' . '08';
+
+                                break;
+                        case 9: $namabulan = 'Sep';
+                                $tarikh = $current->year . '-' . '09';
+
+                                break;
+                        case 10: $namabulan = 'Okt';
+                                $tarikh = $current->year . '-' . '10';
+
+                                break;
+                        case 11: $namabulan = 'Nov';
+                                $tarikh = $current->year . '-' . '11';
+
+                                break;
+                        case 12: $namabulan = 'Dis';
+                                $tarikh = $current->year . '-' . '12';
+                                break;
+                                                    
+                    }
+                    array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'pembiayaan'=>0,'bajetgadai'=> 0]);
+        }
+
+
+        // $bajetgadai = [2259500,2259500,2582280,2582280,2905070,3066460,2582280,2582280,2743680,2743680,2905070,3066460];
+        $bajetgadai = [];
+
+        $bajetgroup = BajetTahunan::on('mysql7')
+            ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
+            ->where('bajettahunan.kodcaw','=', $request->kodcaw)
+            ->where('jenisbajet','=','Gadai')
+            ->whereYear('bajettahunan.tahun', '=', $current->year)
+            ->get();
+
+        foreach($bajetgroup as $index1=>$bj)
+        {
+            array_push($bajetgadai,floatval($bj['nilaibajet']));
+        }
+
+        $arrayPembiayaan = array();
+        $goals = [['name' => 'Expected','value' => 200000,'strokeHeight' => 5, 'strokeColor' => '#e74c3c']];
+
+          
+            $gadai = Gadai::on($cawangan['mysql'])
+                        ->selectRaw('SUM(pinjaman) AS totalpinjaman')
+                        ->addSelect(DB::connection($cawangan['mysql'])
+                        ->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai'))
+                        ->groupBy(DB::connection($cawangan['mysql'])
+                        ->raw("DATE_FORMAT(t_gadai,'%Y%m')"))
+                        ->whereYear('t_gadai',$current->year)
+                        ->where([['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$monthly_date]])
+                        ->orderBy('t_gadai','asc')
+                        ->get();
+
+            foreach($array_totalup as $array_index=>$totalup){
+                foreach($gadai as $indexgadai=>$gadai_detail){
+                    if($totalup['tarikh'] == $gadai_detail['t_gadai']){
+                        $total_gadai = $totalup['pembiayaan'];
+                        $total_gadai += $gadai_detail['totalpinjaman'];
+                    }
+                }
+                $goals[0]['value'] = (sizeof($bajetgadai) > 0) ? $bajetgadai[$array_index] : 0;
+                array_push($arrayPembiayaan,['x' => $array_totalup[$array_index]['namabulan'],'y' => $total_gadai,'goals' => (array) $goals]);
+                $total_gadai = 0;
+               
+            }
+            
+        return response()->json($arrayPembiayaan);
+    }
+
+    public function BilanganGadaianBulanan(Request $request){
+
+        $current = Carbon::now();
+        $current = new Carbon();
+        $monthly = Carbon::now();
+        $monthly = new Carbon();
+        $monthly_array = Carbon::now();
+        $monthly_array = new Carbon();
+
+        $monthly_date = $monthly->startOfMonth()->subMonths(11)->toDateString();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $arraybulanan = [];
+        $array_totalup = [];
+
+        for($i=0;$i<12;$i++){
+
+                    switch($i+1){
+                        case 1: $namabulan = 'Jan';
+                                $tarikh = $current->year . '-' . '01';
+                                break;
+                        case 2: $namabulan = 'Feb';
+                                $tarikh = $current->year . '-' . '02';
+                                break;
+                        case 3: $namabulan = 'Mac';
+                                $tarikh = $current->year . '-' . '03';
+                                break;
+                        case 4: $namabulan = 'Apr';
+                                $tarikh = $current->year . '-' . '04';
+                                break;
+                        case 5: $namabulan = 'Mei';
+                                $tarikh = $current->year . '-' . '05';
+                                break;
+                        case 6: $namabulan = 'Jun';
+                                $tarikh = $current->year . '-' . '06';
+                                break;
+                        case 7: $namabulan = 'Jul';
+                                $tarikh = $current->year . '-' . '07';
+
+                                break;
+                        case 8: $namabulan = 'Aug';
+                                $tarikh = $current->year . '-' . '08';
+
+                                break;
+                        case 9: $namabulan = 'Sep';
+                                $tarikh = $current->year . '-' . '09';
+
+                                break;
+                        case 10: $namabulan = 'Okt';
+                                $tarikh = $current->year . '-' . '10';
+
+                                break;
+                        case 11: $namabulan = 'Nov';
+                                $tarikh = $current->year . '-' . '11';
+
+                                break;
+                        case 12: $namabulan = 'Dis';
+                                $tarikh = $current->year . '-' . '12';
+                                break;
+                                                    
+                    }
+                    array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'bilgadai'=>0,'bajetgadai'=> 0]);
+        }
+
+
+        // $bajetgadai = [300,700,500,300,400,360,470,860,400,432,444,654];
+        $bajetgadai = [];
+
+        $bajetgroup = BajetTahunan::on('mysql7')
+            ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
+            ->where('bajettahunan.kodcaw','=', $request->kodcaw)
+            ->where('jenisbajet','=','Bilangan-Gadai')
+            ->whereYear('bajettahunan.tahun', '=', $current->year)
+            ->get();
+
+        foreach($bajetgroup as $index1=>$bj)
+        {
+            array_push($bajetgadai,floatval($bj['nilaibajet']));
+        }
+
+        $arrayPembiayaan = array();
+        $goals = [['name' => 'Expected','value' => 200000,'strokeHeight' => 5, 'strokeColor' => '#e74c3c']];
+
+          
+            $gadai = Gadai::on($cawangan['mysql'])
+                        ->selectRaw('COUNT(*) AS bilangangadai')
+                        ->addSelect(DB::connection($cawangan['mysql'])
+                        ->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai'))
+                        ->groupBy(DB::connection($cawangan['mysql'])
+                        ->raw("DATE_FORMAT(t_gadai,'%Y%m')"))
+                        ->whereYear('t_gadai',$current->year)
+                        ->where([['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$monthly_date]])
+                        ->orderBy('t_gadai','asc')
+                        ->get();
+
+        $total_gadai = 0;
+
+            foreach($array_totalup as $array_index=>$totalup){
+                foreach($gadai as $indexgadai=>$gadai_detail){
+                    if($totalup['tarikh'] == $gadai_detail['t_gadai']){
+                        $total_gadai = $totalup['bilgadai'];
+                        $total_gadai += $gadai_detail['bilangangadai'];
+                    }
+                }
+                $goals[0]['value'] = (sizeof($bajetgadai) > 0) ? $bajetgadai[$array_index] : 0;
+                array_push($arrayPembiayaan,['x' => $array_totalup[$array_index]['namabulan'],'y' => $total_gadai,'goals' => (array) $goals]);
+                $total_gadai = 0;
+               
+            }
+            
+        return response()->json($arrayPembiayaan);
+    }
+
+    public function PenebusanBulanan(Request $request)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+        $monthly = Carbon::now();
+        $monthly = new Carbon();
+        $monthly_array = Carbon::now();
+        $monthly_array = new Carbon();
+
+        $monthly_date = $monthly->startOfMonth()->subMonths(11)->toDateString();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $arraybulanan = [];
+        $array_totalup = [];
+
+        for($i=0;$i<12;$i++){
+               
+                    switch($i+1){
+                        case 1: $namabulan = 'Jan';
+                                $tarikh = $current->year . '-' . '01';
+                                break;
+                        case 2: $namabulan = 'Feb';
+                                $tarikh = $current->year . '-' . '02';
+                                break;
+                        case 3: $namabulan = 'Mac';
+                                $tarikh = $current->year . '-' . '03';
+                                break;
+                        case 4: $namabulan = 'Apr';
+                                $tarikh = $current->year . '-' . '04';
+                                break;
+                        case 5: $namabulan = 'Mei';
+                                $tarikh = $current->year . '-' . '05';
+                                break;
+                        case 6: $namabulan = 'Jun';
+                                $tarikh = $current->year . '-' . '06';
+                                break;
+                        case 7: $namabulan = 'Jul';
+                                $tarikh = $current->year . '-' . '07';
+
+                                break;
+                        case 8: $namabulan = 'Aug';
+                                $tarikh = $current->year . '-' . '08';
+
+                                break;
+                        case 9: $namabulan = 'Sep';
+                                $tarikh = $current->year . '-' . '09';
+
+                                break;
+                        case 10: $namabulan = 'Okt';
+                                $tarikh = $current->year . '-' . '10';
+
+                                break;
+                        case 11: $namabulan = 'Nov';
+                                $tarikh = $current->year . '-' . '11';
+
+                                break;
+                        case 12: $namabulan = 'Dis';
+                                $tarikh = $current->year . '-' . '12';
+                                break;
+                                                    
+                    }
+                    array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'penebusan'=>0,'bajettebus' => 0]);
+        }
+
+        // $bajettebus = [2040110,2040110,2331560,2331560,2623000,2768720,2331560,2331560,2331560,2477280,2477280,2623000];
+        $bajettebus = [];
+        $bajetgroup = BajetTahunan::on('mysql7')
+            ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
+            ->where('bajettahunan.kodcaw','=', $request->kodcaw)
+            ->where('jenisbajet','=','Penebusan')
+            ->whereYear('bajettahunan.tahun', '=', $current->year)
+            ->get();
+
+        foreach($bajetgroup as $index1=>$bj)
+        {
+            array_push($bajettebus,floatval($bj['nilaibajet']));
+        }
+
+
+
+        $arrayPenyelesaian = array();
+        $goals = [['name' => 'Expected','value' => 200000,'strokeHeight' => 5, 'strokeColor' => '#e74c3c']];
+
+
+        $tebus = Gadai::on($cawangan['mysql'])
+                        ->selectRaw('SUM(pinjaman) AS totalpinjaman')
+                        ->addSelect(DB::connection($cawangan['mysql'])
+                        ->raw('DATE_FORMAT(t_update, "%Y-%m") as t_update'))
+                        ->groupBy(DB::connection($cawangan['mysql'])
+                        ->raw("DATE_FORMAT(t_update,'%Y%m')"))
+                        ->whereYear('t_update',$current->year)
+                        ->where([['sttebus','=','T'],['t_update','<=',$current->toDateString()],['t_update','>=',$monthly_date]])
+                        ->orderBy('t_update','asc')
+                        ->get();
+
+        $total_tebus = 0;
+        foreach($array_totalup as $array_index=>$totalup){
+            foreach($tebus as $indextebus=>$tebus_detail){
+                if($totalup['tarikh'] == $tebus_detail['t_update']){
+                    $total_tebus = $totalup['penebusan'];
+                    $total_tebus += $tebus_detail['totalpinjaman'];
+                    $array_totalup[$array_index]['penebusan'] = $total_tebus;
+                    $array_totalup[$array_index]['bajettebus'] = (sizeof($bajettebus) > 0) ? $bajettebus[$array_index] : 0;
+                }
+            }
+            $goals[0]['value'] = (sizeof($bajettebus) > 0) ? $bajettebus[$array_index] : 0;
+            array_push($arrayPenyelesaian,['x' => $array_totalup[$array_index]['namabulan'],'y' => $total_tebus,'goals' => (array) $goals]);
+            $total_tebus = 0;
+
+        }
+
+        return response()->json($arrayPenyelesaian);
+
+    }
+
+    public function BilanganPenebusanBulanan(Request $request)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+        $monthly = Carbon::now();
+        $monthly = new Carbon();
+        $monthly_array = Carbon::now();
+        $monthly_array = new Carbon();
+
+        $monthly_date = $monthly->startOfMonth()->subMonths(11)->toDateString();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $arraybulanan = [];
+        $array_totalup = [];
+
+        for($i=0;$i<12;$i++){
+
+                    switch($i+1){
+                        case 1: $namabulan = 'Jan';
+                                $tarikh = $current->year . '-' . '01';
+                                break;
+                        case 2: $namabulan = 'Feb';
+                                $tarikh = $current->year . '-' . '02';
+                                break;
+                        case 3: $namabulan = 'Mac';
+                                $tarikh = $current->year . '-' . '03';
+                                break;
+                        case 4: $namabulan = 'Apr';
+                                $tarikh = $current->year . '-' . '04';
+                                break;
+                        case 5: $namabulan = 'Mei';
+                                $tarikh = $current->year . '-' . '05';
+                                break;
+                        case 6: $namabulan = 'Jun';
+                                $tarikh = $current->year . '-' . '06';
+                                break;
+                        case 7: $namabulan = 'Jul';
+                                $tarikh = $current->year . '-' . '07';
+
+                                break;
+                        case 8: $namabulan = 'Aug';
+                                $tarikh = $current->year . '-' . '08';
+
+                                break;
+                        case 9: $namabulan = 'Sep';
+                                $tarikh = $current->year . '-' . '09';
+
+                                break;
+                        case 10: $namabulan = 'Okt';
+                                $tarikh = $current->year . '-' . '10';
+
+                                break;
+                        case 11: $namabulan = 'Nov';
+                                $tarikh = $current->year . '-' . '11';
+
+                                break;
+                        case 12: $namabulan = 'Dis';
+                                $tarikh = $current->year . '-' . '12';
+                                break;
+                                                    
+                    }
+                    array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'bilpenebusan'=>0,'bajettebus' => 0]);
+        }
+
+
+
+        // $bajettebus = [600,540,520,510,540,607,650,300,400,500,800,200];
+        $bajettebus = [];
+        $bajetgroup = BajetTahunan::on('mysql7')
+            ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
+            ->where('bajettahunan.kodcaw','=', $request->kodcaw)
+            ->where('jenisbajet','=','Bilangan-Tebus')
+            ->whereYear('bajettahunan.tahun', '=', $current->year)
+            ->get();
+
+        foreach($bajetgroup as $index1=>$bj)
+        {
+            array_push($bajettebus,floatval($bj['nilaibajet']));
+        }
+
+
+
+        $arrayPenyelesaian = array();
+        $goals = [['name' => 'Expected','value' => 200000,'strokeHeight' => 5, 'strokeColor' => '#e74c3c']];
+
+
+        $tebus = Gadai::on($cawangan['mysql'])
+                        ->selectRaw('COUNT(*) AS bilangantebus')
+                        ->addSelect(DB::connection($cawangan['mysql'])
+                        ->raw('DATE_FORMAT(t_update, "%Y-%m") as t_update'))
+                        ->groupBy(DB::connection($cawangan['mysql'])
+                        ->raw("DATE_FORMAT(t_update,'%Y%m')"))
+                        ->whereYear('t_update',$current->year)
+                        ->where([['sttebus','=','T'],['t_update','<=',$current->toDateString()],['t_update','>=',$monthly_date]])
+                        ->orderBy('t_update','asc')
+                        ->get();
+
+        $total_tebus = 0;
+        foreach($array_totalup as $array_index=>$totalup){
+            foreach($tebus as $indextebus=>$tebus_detail){
+                if($totalup['tarikh'] == $tebus_detail['t_update']){
+                    $total_tebus = $totalup['bilpenebusan'];
+                    $total_tebus += $tebus_detail['bilangantebus'];
+                    $array_totalup[$array_index]['bilpenebusan'] = $total_tebus;
+                    $array_totalup[$array_index]['bajettebus'] = (sizeof($bajettebus) > 0) ? $bajettebus[$array_index] : 0;
+                }
+            }
+            $goals[0]['value'] = (sizeof($bajettebus) > 0) ? $bajettebus[$array_index] : 0;
+            array_push($arrayPenyelesaian,['x' => $array_totalup[$array_index]['namabulan'],'y' => $total_tebus,'goals' => (array) $goals]);
+            $total_tebus = 0;
+
+        }
+
+        return response()->json($arrayPenyelesaian);
+
+    }
+
+    public function KeuntunganBulanan(Request $request){
+        $current = Carbon::now();
+        $current = new Carbon();
+        $monthly = Carbon::now();
+        $monthly = new Carbon();
+        $monthly_array = Carbon::now();
+        $monthly_array = new Carbon();
+
+        $monthly_date = $monthly->startOfMonth()->subMonths(11)->toDateString();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $arraybulanan = [];
+        $array_totalup = [];
+
+        for($i=0;$i<12;$i++){
+            
+
+                    switch($i+1){
+                        case 1: $namabulan = 'Jan';
+                                $tarikh = $current->year . '-' . '01';
+                                break;
+                        case 2: $namabulan = 'Feb';
+                                $tarikh = $current->year . '-' . '02';
+                                break;
+                        case 3: $namabulan = 'Mac';
+                                $tarikh = $current->year . '-' . '03';
+                                break;
+                        case 4: $namabulan = 'Apr';
+                                $tarikh = $current->year . '-' . '04';
+                                break;
+                        case 5: $namabulan = 'Mei';
+                                $tarikh = $current->year . '-' . '05';
+                                break;
+                        case 6: $namabulan = 'Jun';
+                                $tarikh = $current->year . '-' . '06';
+                                break;
+                        case 7: $namabulan = 'Jul';
+                                $tarikh = $current->year . '-' . '07';
+
+                                break;
+                        case 8: $namabulan = 'Aug';
+                                $tarikh = $current->year . '-' . '08';
+
+                                break;
+                        case 9: $namabulan = 'Sep';
+                                $tarikh = $current->year . '-' . '09';
+
+                                break;
+                        case 10: $namabulan = 'Okt';
+                                $tarikh = $current->year . '-' . '10';
+
+                                break;
+                        case 11: $namabulan = 'Nov';
+                                $tarikh = $current->year . '-' . '11';
+
+                                break;
+                        case 12: $namabulan = 'Dis';
+                                $tarikh = $current->year . '-' . '12';
+                                break;
+                                                    
+                    }
+                    array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'keuntungan'=>0,'bajetkeuntungan' => 0]);
+        }
+
+        // $bajetkeuntungan = [236850,224390,211920,211920,199460,199460,236850,224390,199460,199460,114520,174520];
+        // $bajetkeuntungan = array_reverse($bajetkeuntungan);
+
+        $bajetkeuntungan = [];
+        
+        $bajetgroup = BajetTahunan::on('mysql7')
+            ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
+            ->where('bajettahunan.kodcaw','=', $request->kodcaw)
+            ->where('jenisbajet','=','Keuntungan')
+            ->whereYear('bajettahunan.tahun', '=', $current->year)
+            ->get();
+
+        foreach($bajetgroup as $index1=>$bj)
+        {
+            array_push($bajetkeuntungan,floatval($bj['nilaibajet']));
+        }
+
+
+        $arrayKeuntungan = array();
+        $goals = [['name' => 'Expected','value' => 0,'strokeHeight' => 5, 'strokeColor' => '#e74c3c']];
+
+
+        
+        $lelongupahsimpan = Lelong::on($cawangan['mysql'])
+                    ->selectRaw('SUM(bakiupah) AS totalupahlelong')
+                    ->addSelect(DB::connection($cawangan['mysql'])
+                    ->raw('DATE_FORMAT(t_jual, "%Y-%m") as t_jual'))
+                    ->groupBy(DB::connection($cawangan['mysql'])
+                    ->raw("DATE_FORMAT(t_jual,'%Y%m')"))
+                    ->whereYear('t_jual',$current->year)
+                    ->where([['t_jual','<=',$current->toDateString()],['t_jual','>=',$monthly_date]])
+                    ->orderBy('t_jual','asc')
+                    ->get();
+
+
+        $tebus = Tebus::on($cawangan['mysql'])
+                    ->selectRaw('SUM(bakiupah) AS totalupahsimpan')
+                    ->addSelect(DB::connection($cawangan['mysql'])
+                    ->raw('DATE_FORMAT(t_tebus, "%Y-%m") as t_tebus'))
+                    ->groupBy(DB::connection($cawangan['mysql'])
+                    ->raw("DATE_FORMAT(t_tebus,'%Y%m')"))
+                    ->whereYear('t_tebus',$current->year)
+                    ->where([['jenistebus','=','T'],['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$monthly_date]])
+                    ->orWhere([['jenistebus','=','A'],['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$monthly_date]])
+                    ->orderBy('t_tebus','asc')
+                    ->get();
+
+
+        foreach($array_totalup as $array_index=>$totalup){
+            foreach($lelongupahsimpan as $indexlelong=>$lelong_detail){
+                if($totalup['tarikh'] == $lelong_detail['t_jual']){
+                    $total_lelong = $totalup['keuntungan'];
+                    $total_lelong += $lelong_detail['totalupahlelong'];
+                    $array_totalup[$array_index]['keuntungan'] = $total_lelong;
+                }
+            }
+
+            foreach($tebus as $indextebus=>$tebus_detail){
+                if($totalup['tarikh'] == $tebus_detail['t_tebus']){
+                    $total_tebus = $array_totalup[$array_index]['keuntungan'];
+                    $total_tebus += $tebus_detail['totalupahsimpan'];
+                    $array_totalup[$array_index]['keuntungan'] = $total_tebus;
+                    $array_totalup[$array_index]['bajetkeuntungan'] = (sizeof($bajetkeuntungan) > 0) ? $bajetkeuntungan[$array_index] : 0;
+                }
+            }
+            $goals[0]['value'] = (sizeof($bajetkeuntungan) > 0) ? $bajetkeuntungan[$array_index] : 0;
+            array_push($arrayKeuntungan,['x' => $array_totalup[$array_index]['namabulan'],'y' => $array_totalup[$array_index]['keuntungan'],'goals' => (array) $goals]);
+        }
+        return response()->json($arrayKeuntungan);
+    }
+
+    public function showAllGadaiToday(Request $request){
+        
+        $cawangan_all = Cawangan::on('mysql7')->get();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $harini = $current->toDateString();
+        $gadaiToday = 0;
+        $gadaiLastweek = 0;
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $monthly = Carbon::now();
+        $monthly = new Carbon();
+        
+        $monthly_date = $monthly->startOfMonth()->toDateString();
+
+        $gadailatest = Gadai::on($cawangan['mysql'])
+                ->where([['t_gadai','>=',$monthly_date],['t_gadai','<=',$harini],['hargajualan','<>','NULL']])
+                ->whereYear('t_gadai',$current->year)
+                ->orderBy('t_gadai','asc')
+                ->sum('pinjaman');
+
+        switch($current->month){
+            case 1: $bulan = 'Januari';
+                    break;  
+            case 2: $bulan = 'Februari';
+                    break;
+            case 3: $bulan = 'March';
+                    break;
+            case 4: $bulan = 'April';
+                    break;
+            case 5: $bulan = 'Mei';
+                    break;
+            case 6: $bulan = 'Jun';
+                    break;
+            case 7: $bulan = 'Julai';
+                    break;
+            case 8: $bulan = 'Ogos';
+                    break;
+            case 9: $bulan = 'September';
+                    break;
+            case 10: $bulan = 'Oktober';
+                    break;
+            case 11: $bulan = 'November';
+                    break;
+            case 12: $bulan = 'Disember';
+                    break;
+        }
+
+
+        $bajetcollection = BajetTahunan::on('mysql7')
+                ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
+                ->where('bajettahunan.kodcaw','=', $request->kodcaw)
+                ->where('bajettahunan.jenisbajet','=','Gadai')
+                ->where('bajet.bulan','=',$bulan)
+                ->whereYear('bajettahunan.tahun', '=', $current->year)
+                ->first();
+
+        if($bajetcollection)
+        {
+                $bajetharian = floatval($bajetcollection->nilaibajet) / 26;
+
+                $cummulativegadaian = floatval($bajetcollection->nilaibajet) - floatval($gadailatest);
+                $percentcum = ((floatval($gadailatest) - floatval($bajetcollection->nilaibajet)) / floatval($bajetcollection->nilaibajet)) * 100;
+        }else{
+                $bajetharian = 0;
+                $cummulativegadaian = 0;
+                $percentcum = 0;
+        }
+       
+
+
+        $gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$harini)->sum('pinjaman');
+        // $gadai_last_week = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$lastweek)->sum('pinjaman');
+        // $gadaiLastweek += $gadai_last_week;
+        $gadaiToday += $gadai;
+        
+        $diffGadaiPercent = 0;
+
+        if($bajetcollection)
+                $diffGadaiPercent = (($gadaiToday - $bajetharian)/$bajetharian)*100;
+        else
+                $diffGadaiPercent = 0;
+
+        $dataGadai = [];
+        array_push($dataGadai,['gadaiToday'=>$gadaiToday,'percentDiff'=>$diffGadaiPercent,'bajetharian' => $bajetharian,'bulan' => $bulan,'percentcum' => abs(round($percentcum)),'remaining' => $cummulativegadaian]);
+
+        return response()->json($dataGadai);
+
+    }
+
+    public function showAllTebusToday(Request $request){
+
+        $cawangan_all = Cawangan::on('mysql7')->get();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $harini = $current->toDateString();
+        $tebusToday = 0;
+        $tebusLastWeek = 0;
+        
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $monthly = Carbon::now();
+        $monthly = new Carbon();
+        
+
+        $monthly_date = $monthly->startOfMonth()->toDateString();
+
+
+        $tebuslatest = Gadai::on($cawangan['mysql'])
+                ->whereYear('t_update',$current->year)
+                ->where([['sttebus','=','T'],['t_update','<=',$harini],['t_update','>=',$monthly_date]])
+                ->orderBy('t_update','asc')
+                ->sum('pinjaman');
+
+        switch($current->month){
+            case 1: $bulan = 'Januari';
+                    break;  
+            case 2: $bulan = 'Februari';
+                    break;
+            case 3: $bulan = 'March';
+                    break;
+            case 4: $bulan = 'April';
+                    break;
+            case 5: $bulan = 'Mei';
+                    break;
+            case 6: $bulan = 'Jun';
+                    break;
+            case 7: $bulan = 'Julai';
+                    break;
+            case 8: $bulan = 'Ogos';
+                    break;
+            case 9: $bulan = 'September';
+                    break;
+            case 10: $bulan = 'Oktober';
+                    break;
+            case 11: $bulan = 'November';
+                    break;
+            case 12: $bulan = 'Disember';
+                    break;
+        }
+
+        $bajetcollection = BajetTahunan::on('mysql7')
+                ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
+                ->where('bajettahunan.kodcaw','=', $request->kodcaw)
+                ->where('bajettahunan.jenisbajet','=','Penebusan')
+                ->where('bajet.bulan','=',$bulan)
+                ->whereYear('bajettahunan.tahun', '=', $current->year)
+                ->first();
+
+
+        if($bajetcollection)
+        {
+                $bajetharian = floatval($bajetcollection->nilaibajet) / 26;
+
+                $cummulativepenebusan = floatval($bajetcollection->nilaibajet) - floatval($tebuslatest);
+                $percentcum = ((floatval($tebuslatest) - floatval($bajetcollection->nilaibajet)) / floatval($bajetcollection->nilaibajet)) * 100;
+        }else{
+                $bajetharian = 0;
+                $cummulativepenebusan = 0;
+                $percentcum = 0;
+        }
+
+
+        $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakipjm');
+        
+        $tebusToday += $tebus;
+        
+        $diffTebusPercent = 0;
+        
+        if($bajetcollection)
+                $diffTebusPercent = (($tebusToday - $bajetharian)/$bajetharian)*100;
+        else
+                $diffTebusPercent = 0;
+                
+        $dataTebus = [];
+        array_push($dataTebus,['tebusToday'=>$tebusToday,'percentDiff'=>$diffTebusPercent,'bajetharian' => $bajetharian,'bulan' => $bulan,'percentcum' => abs(round($percentcum)),'remaining' => $cummulativepenebusan]);
+        return response()->json($dataTebus);
+    }
+
+    public function showAllUpahToday(Request $request){
+
+        $cawangan_all = Cawangan::on('mysql7')->get();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $harini = $current->toDateString();
+        $upahToday = 0;
+        $upahLastWeek = 0;
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $monthly = Carbon::now();
+        $monthly = new Carbon();
+        $monthly_date = $monthly->startOfMonth()->toDateString();
+        
+        $lelongupahsimpan = Lelong::on($cawangan['mysql'])
+                    ->selectRaw('SUM(bakiupah) AS totalupahlelong')
+                    ->whereYear('t_jual',$current->year)
+                    ->where([['t_jual','<=',$harini],['t_jual','>=',$monthly_date]])
+                    ->orderBy('t_jual','asc')
+                    ->sum('bakiupah');
+
+
+        $tebus = Tebus::on($cawangan['mysql'])
+                    ->selectRaw('SUM(bakiupah) AS totalupahsimpan')
+                    ->whereYear('t_tebus',$current->year)
+                    ->where([['jenistebus','=','T'],['t_tebus','<=',$harini],['t_tebus','>=',$monthly_date]])
+                    ->orWhere([['jenistebus','=','A'],['t_tebus','<=',$harini],['t_tebus','>=',$monthly_date]])
+                    ->orderBy('t_tebus','asc')
+                    ->sum('bakiupah');
+
+        $upahlatest = $lelongupahsimpan + $tebus;
+
+        switch($current->month){
+            case 1: $bulan = 'Januari';
+                    break;  
+            case 2: $bulan = 'Februari';
+                    break;
+            case 3: $bulan = 'March';
+                    break;
+            case 4: $bulan = 'April';
+                    break;
+            case 5: $bulan = 'Mei';
+                    break;
+            case 6: $bulan = 'Jun';
+                    break;
+            case 7: $bulan = 'Julai';
+                    break;
+            case 8: $bulan = 'Ogos';
+                    break;
+            case 9: $bulan = 'September';
+                    break;
+            case 10: $bulan = 'Oktober';
+                    break;
+            case 11: $bulan = 'November';
+                    break;
+            case 12: $bulan = 'Disember';
+                    break;
+        }
+
+
+        $bajetcollection = BajetTahunan::on('mysql7')
+                ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
+                ->where('bajettahunan.kodcaw','=', $request->kodcaw)
+                ->where('bajettahunan.jenisbajet','=','Keuntungan')
+                ->where('bajet.bulan','=',$bulan)
+                ->whereYear('bajettahunan.tahun', '=', $current->year)
+                ->first();
+
+        if($bajetcollection)
+        {
+                $bajetharian = floatval($bajetcollection->nilaibajet) / 26;
+
+                $cummulativekeuntungan = floatval($bajetcollection->nilaibajet) - floatval($upahlatest);
+                $percentcum = ((floatval($upahlatest) - floatval($bajetcollection->nilaibajet)) / floatval($bajetcollection->nilaibajet)) * 100;
+        }else{
+                $bajetharian = 0;
+                $cummulativekeuntungan = 0;
+                $percentcum = 0;
+        }
+     
+       
+        $upah_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakiupah');
+        $upah_today = Advansur::on($cawangan['mysql'])->where('tarikh',$harini)->sum('upahDibayar');
+        
+        $upahToday = $upahToday + $upah_tebus_today + $upah_today;
+        
+        $ansuran_today = TransaksiKeuntungan::on('mysql7')->where([['tarikh_bayaran','>=',$harini . ' 00:00:00'],['tarikh_bayaran','<=',$harini . ' 23:59:59']])->sum('bayaran_keuntungan');
+
+        $upahToday = $upahToday + $ansuran_today;
+
+        $diffUpah = 0;
+
+        if($bajetcollection)
+                $diffUpah = (($upahToday - $bajetharian)/$bajetharian)*100;
+        else
+                $diffUpah = 0;
+
+        $upahData = [];
+        array_push($upahData,['upahToday'=>$upahToday,'percentDiff'=>$diffUpah,'bajetharian' => round($bajetharian,2),'bulan' => $bulan,'percentcum' => abs(round($percentcum)),'remaining' => $cummulativekeuntungan]);
+        return response()->json($upahData);
+    }
+
+    public function getpetibesiSebelumbyTarikh($kodcaw,Request $request)
+    {
+      $current = Carbon::now();
+      $current = new Carbon();    
+   
+       $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+       $vault=Vault::on($cawangan['mysql'])
+               ->where('kodcaw','=',$kodcaw)
+               ->where('tarikh','<',$request->tarikh)
+               ->orderby('tarikh','desc')->limit(1)->get();
+   
+       return response()->json($vault);
+       
+    }
+
+    public function getGldetailbyTarikh($kodcaw,Request $request)
+    {
+       $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+ 
+       $gldetail=GlDetail::on($cawangan['mysql'])
+                ->where('kodcaw','=',$kodcaw)
+                ->where('tarikh','=',$request->tarikh)
+                ->where('descpt','NOT LIKE','SERAHAN BAYAR ONLINE%')
+                ->orderby('tarikh','desc')->get();
+ 
+       return response()->json($gldetail,200);
+    }
+
+
+    public function getPanjarbyTarikh($kodcaw,Request $request)
+    {
+       $harini = Carbon::now();
+       $harini = new Carbon;
+ 
+       $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+ 
+       $panjar=Panjar::on($cawangan['mysql'])
+                ->where('tarikh','=',$request->tarikh)
+                ->get();
+ 
+       return response()->json($panjar);
+    }
+
+    public function updatePetiBesiAdmin(Request $request)
+    {
+      $current = Carbon::now();
+      $current = new Carbon();     
+      
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $request->kodcaw)->first();
+      $updateVault=Vault::on($cawangan['mysql'])->where('tarikh', '=', $request->tarikh)->update(array(
+   
+         'bakiawal' => $request->bakiawal,
+         'keluar' => $request->keluar,
+         'masuk' => $request->masuk,
+         'pendahuluan' => $request->pendahuluan,
+         'serahan' => $request->serahan,
+         'totpanjar' => $request->panjar,
+         'bakiakhir' => $request->bakiakhir,
+         'bakieod' => $request->bakiakhir
+   
+      ) );
+   
+      return response()->json($updateVault, 200);
+    }
+
+    public function AdminsearchSagOnline(Request $request)
+    {
+        $customer = TransactionOnline::on('mysql7')
+        ->where('norujukan','=', $request->norujukan)
+        ->orderBy('status', 'asc')
+        ->get();
+
+        return response()->json($customer);
+    }
+
+    public function SimpanStatus(Request $request)
+    {
+
+        $transactiononline = TransactionOnline::on('mysql7')
+        ->where('id', '=', $request->id)
+        ->update([
+            'status' => $request->status,
+            'paid_at' => $request->paidat
+        ]);
+
+        return response()->json($transactiononline);
+    }
+
+    public function SenaraiBajet(Request $request)
+    {
+
+        // $arrayBajet = ['Gadai' => [],['Penebusan' => []],['Keuntungan' =>[]]];
+
+        // $arrayBajet = array('Gadai' => [],'Penebusan' => []);
+
+        $bajetgroup = BajetTahunan::on('mysql7')
+            ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
+            ->where('bajettahunan.kodcaw','=', $request->kodcaw)
+            ->whereYear('bajettahunan.tahun', '=', $request->year)
+            ->groupBy('bajettahunan.jenisbajet')
+            ->get();
+
+        $bajetcollection = BajetTahunan::on('mysql7')
+                ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
+                ->where('bajettahunan.kodcaw','=', $request->kodcaw)
+                ->whereYear('bajettahunan.tahun', '=', $request->year)
+                ->get();
+
+
+        $arrayBajet = [];
+        foreach($bajetgroup as $index=>$bg)
+        {
+            array_push($arrayBajet,[$bg['jenisbajet'] => []]);
+
+            foreach($bajetcollection as $index1=>$bj)
+            {
+                if($bj['jenisbajet'] == key($arrayBajet[$index]))
+                {
+                    array_push($arrayBajet[$index][key($arrayBajet[$index])],['id' => $bj['bajetid'], 'bulan' => $bj['bulan'], 'nilaibajet' => $bj['nilaibajet'] ]);
+                }
+            }
+        }
+
+        return response()->json($arrayBajet);
+    }
+
+    public function CheckBajet(Request $request)
+    {
+        $bajet = BajetTahunan::on('mysql7')
+        ->where([['kodcaw','=', $request->kodcaw],['jenisbajet','=',$request->jenisbajet]])
+        ->whereYear('tahun', '=', $request->year)
+        ->get();
+
+        return response()->json($bajet);
+    }
+
+    public function SimpanBajet(Request $request)
+    {
+
+        $current = Carbon::now();
+        $current = new Carbon();  
+
+        $bajettahunan = new BajetTahunan();
+
+        $bajettahunan->tahun = $request->year.'-00-00';
+        $bajettahunan->jenisbajet = $request->jenisbajet;
+        $bajettahunan->kodcaw = $request->kodcaw;
+        $bajettahunan->save();
+
+        foreach($request->bulan as $index=>$bulan)
+        {
+            $bajet = new Bajet();
+
+            $bajet->kodcaw = $request->kodcaw;
+            $bajet->bulan = $bulan['bulan'];
+            $bajet->nilaibajet = $bulan['bajet'];
+            $bajet->updated_by = $request->username;
+            $bajet->bajetid = $bajettahunan->id;
+            $bajet->save();
+        }
+
+        return response()->json($bajet);
+    }
+
+    public function senaraikemaskinibajet(Request $request)
+    {
+        $bajet = Bajet::on('mysql7')
+                ->where('bajetid','=',$request->bajetid)
+                ->get();
+
+        return response()->json($bajet);
+    }
+
+    public function KemaskiniBajet(Request $request)
+    {
+       
+        $bajetjanuari = Bajet::on('mysql7')
+                        ->where('bajetid','=',$request->bajetid)
+                        ->where('bulan','=','Januari')
+                        ->update(['nilaibajet' => $request->bajetjanuari]);
+
+        $bajetfebruari = Bajet::on('mysql7')
+                        ->where('bajetid','=',$request->bajetid)
+                        ->where('bulan','=','Februari')
+                        ->update(['nilaibajet' => $request->bajetfebruari]);
+
+        $bajetmarch = Bajet::on('mysql7')
+                        ->where('bajetid','=',$request->bajetid)
+                        ->where('bulan','=','Mac')
+                        ->update(['nilaibajet' => $request->bajetmarch]);
+                        
+        $bajetapril = Bajet::on('mysql7')
+                        ->where('bajetid','=',$request->bajetid)
+                        ->where('bulan','=','April')
+                        ->update(['nilaibajet' => $request->bajetapril]);
+                        
+        $bajetmei = Bajet::on('mysql7')
+                        ->where('bajetid','=',$request->bajetid)
+                        ->where('bulan','=','Mei')
+                        ->update(['nilaibajet' => $request->bajetmei]);
+
+        $bajetjun = Bajet::on('mysql7')
+                        ->where('bajetid','=',$request->bajetid)
+                        ->where('bulan','=','Jun')
+                        ->update(['nilaibajet' => $request->bajetjun]);
+
+        $bajetjulai = Bajet::on('mysql7')
+                        ->where('bajetid','=',$request->bajetid)
+                        ->where('bulan','=','Julai')
+                        ->update(['nilaibajet' => $request->bajetjulai]);
+
+        $bajetogos = Bajet::on('mysql7')
+                        ->where('bajetid','=',$request->bajetid)
+                        ->where('bulan','=','Ogos')
+                        ->update(['nilaibajet' => $request->bajetogos]);
+
+        $bajetseptember = Bajet::on('mysql7')
+                        ->where('bajetid','=',$request->bajetid)
+                        ->where('bulan','=','September')
+                        ->update(['nilaibajet' => $request->bajetseptember]);
+
+        $bajetoktober = Bajet::on('mysql7')
+                        ->where('bajetid','=',$request->bajetid)
+                        ->where('bulan','=','Oktober')
+                        ->update(['nilaibajet' => $request->bajetoktober]);
+
+        $bajetnovember = Bajet::on('mysql7')
+                        ->where('bajetid','=',$request->bajetid)
+                        ->where('bulan','=','November')
+                        ->update(['nilaibajet' => $request->bajetnovember]);
+
+        $bajetdisember = Bajet::on('mysql7')
+                        ->where('bajetid','=',$request->bajetid)
+                        ->where('bulan','=','Disember')
+                        ->update(['nilaibajet' => $request->bajetdisember]);
+
+        return response(1);
+    }
+
+    public function SenaraiBlacklist(Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $request->kodcaw)->first();
+
+        if(isset($request->search))
+        {
+                $blacklist = Blacklist::on($cawangan['mysql'])
+                ->where('nama','LIKE',"%{$request->search}%")
+                ->orderBy('tarikhdaftar','desc')
+                ->paginate(5);
+        }else{
+                $blacklist = Blacklist::on($cawangan['mysql'])
+                ->orderBy('tarikhdaftar','desc')
+                ->paginate(5);
+        }
+       
+
+        return response()->json($blacklist);
+    }
+
+    public function AddSenaraiHitam(Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $request->kodcaw)->first();
+            
+        $customer = Customer::on('mysql7')
+                ->where('kpbaru','=', $request->nokp)
+                ->orWhere('kplama','=', $request->nokp)
+                ->first();
+
+        $blacklist = Blacklist::on($cawangan['mysql'])->create([
+                'kodcaw' => $customer['kodcaw'],
+                'tarikhdaftar' => $customer['tarikhdaftar'],
+                'kplama' => $customer['kplama'],
+                'kpbaru' => $customer['kpbaru'],
+                'nokp' => $request->nokp,
+                'nama' => $customer['nama'],
+                't_lahir' => $customer['t_lahir'],
+                'jantina' => $customer['jantina'],
+                'alamat1' => $customer['alamat1'],
+                'alamat2' => $customer['alamat2'],
+                'alamat3' => $customer['alamat3'],
+                'alamat4' => $customer['alamat4'],
+                'telefon' => $customer['telefon'],
+                'nota' => $request->nota,
+                'teller' => null,
+                'pelulus' => null
+            ]);
+
+        return response()->json($blacklist, 201);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 1cd22a1..d31b909 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2939,7 +2939,6 @@ class GadaiController extends Controller
         })
         ->where('trans.trans_type','=','A')
         ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
-        ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
         ->get();
 
         $transaksi = 0;
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 047949a..770093a 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -1144,6 +1144,9 @@ class TebusController extends Controller
 
         $current = new Carbon($request->tarikh);
 
+        $daterequest = new Carbon($request->tarikh);
+        $daterequest->addDays(1);
+
         $total = 0;
 
         //Untung Rugi Terkumpul Sebelum 01.12.2013
@@ -1187,6 +1190,22 @@ class TebusController extends Controller
             ->whereYear('tarikh','<',$current->year)
             ->sum('upahdibayar');
 
+        //Upah Tawarruq
+
+        $keuntungan_data = TransaksiKeuntungan::on('mysql7')
+        ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
+        ->whereYear('transaksi_keuntungan.tarikh_bayaran','<',$current->year)
+        ->where('kodcaw',$kodcaw)
+        ->pluck('norujukan');
+
+        $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan', $keuntungan_data)->whereNull('hargajualan')->pluck('norujukan');
+
+        $upahsimpankeuntungansebelumtawarruq = TransaksiKeuntungan::on('mysql7')
+            ->where('tarikh_bayaran' ,'<=', $daterequest)
+            ->whereYear('tarikh_bayaran','<',$current->year)
+            ->whereIn('norujukan',$gadaiData)
+            ->sum('bayaran_keuntungan');
+
         $upahsimpanlama = imbangdugalama::on($cawangan['mysql'])
             ->sum('upah_t');
 
@@ -1222,8 +1241,147 @@ class TebusController extends Controller
         // $parameter = Parameter::on($cawangan['mysql']) //--masuk
         //     ->sum('sumpanjarlama');
 
+        //Keuntungan Tawarruq Sebenar
+        $keuntungansebenar = 0;
+        $dateSM = '2021-04-24';
 
-        $total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong) + $parameter;
+        if($request->tarikh < '2021-06-09')
+        {
+            $keuntungan_data = TransaksiKeuntungan::on('mysql7')
+                ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
+                ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
+                ->whereYear('tarikh_bayaran','<',$current->year)
+                ->where('kodcaw',$kodcaw)
+                ->pluck('norujukan');
+            
+            $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
+
+            $keuntungan = TransaksiKeuntungan::on('mysql7')
+                ->whereIn('norujukan',$gadaiData)
+                ->whereDate('tarikh_bayaran', '<=', $request->tarikh)
+                ->whereDate('tarikh_bayaran' ,'<', $dateSM)
+                ->whereYear('tarikh_bayaran','<',$current->year)
+                ->sum('bayaran_keuntungan');
+
+            $keuntunganreducing_data = TransaksiKeuntungan::on('mysql7')
+                ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
+                ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
+                ->whereYear('tarikh_bayaran','<',$current->year)
+                ->where('kodcaw',$request->kodcaw)
+                ->pluck('norujukan');
+
+            $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntunganreducing_data)->whereNotNull('hargajualan')->pluck('norujukan');
+
+            $keuntunganreducing = TransaksiKeuntungan::on('mysql7')
+                ->whereIn('norujukan',$gadaiData)
+                ->whereDate('tarikh_bayaran' ,'<=', $request->tarikh)
+                ->whereDate('tarikh_bayaran','>=', $dateSM)
+                ->whereYear('tarikh_bayaran','<',$current->year)
+                ->sum('keuntungan_rebet');
+	    
+            $keuntungansebenar = ($keuntungan + $keuntunganreducing);
+
+
+        }else{
+
+        $keuntungan_data = TransaksiKeuntungan::on('mysql7')
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
+                    ->whereYear('tarikh_bayaran','<',$current->year)
+                    ->where('kodcaw',$kodcaw)
+                    ->pluck('norujukan');
+
+
+        $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
+
+        $keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan');
+
+        $keuntunganreducing_data = TransaksiKeuntungan::on('mysql7')
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', '2021-06-09')
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
+                    ->whereYear('tarikh_bayaran','<',$current->year)
+                    ->where('kodcaw',$kodcaw)
+                    ->pluck('norujukan');
+
+        $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntunganreducing_data)->whereNotNull('hargajualan')->pluck('norujukan');
+
+        $keuntunganreducing = TransaksiKeuntungan::on('mysql7')
+            ->whereIn('norujukan',$gadaiData)
+            ->whereDate('tarikh_bayaran' ,'<', '2021-06-09')
+            ->whereDate('tarikh_bayaran','>=', $dateSM)
+            ->sum('keuntungan_rebet');
+
+        $bukanansuran_data = 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');
+                    })
+                    ->where('trans.trans_type','!=','A')
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
+                    ->whereYear('tarikh_bayaran','<',$current->year)
+                    ->where('trans.kodcaw',$kodcaw)
+                    ->pluck('transaksi_keuntungan.norujukan');
+
+        $gadaiData = Gadai::on($cawangan['mysql'])
+                    ->whereIn('norujukan',$bukanansuran_data)
+                    ->whereNotNull('hargajualan')
+                    ->pluck('norujukan');
+
+        $bukanansuran = TransaksiKeuntungan::on('mysql7')
+                    ->whereIn('transaksi_keuntungan.norujukan',$gadaiData)
+                    ->leftJoin('transaction as trans', function($join)
+                    {
+                        $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                        $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                    })
+                    ->where('trans.trans_type','!=','A')
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
+                    ->whereYear('transaksi_keuntungan.tarikh_bayaran','<',$current->year)
+                    ->sum('transaksi_keuntungan.keuntungan_rebet');
+
+        $ansuran_data = 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');
+                    })
+                    ->where('trans.trans_type','=','A')
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
+                    ->whereYear('tarikh_bayaran','<',$current->year)
+                    ->where('trans.kodcaw',$kodcaw)
+                    ->pluck('transaksi_keuntungan.norujukan');
+
+        $gadaiData = Gadai::on($cawangan['mysql'])
+            ->whereIn('norujukan',$ansuran_data)
+            ->whereNotNull('hargajualan')
+            ->pluck('norujukan');
+
+        $ansuran = TransaksiKeuntungan::on('mysql7')
+            ->whereIn('transaksi_keuntungan.norujukan',$gadaiData)
+            ->leftJoin('transaction as trans', function($join)
+            {
+                $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+            })
+            ->where('trans.trans_type','=','A')
+            ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
+            ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
+            ->whereYear('transaksi_keuntungan.tarikh_bayaran','<',$current->year)
+            ->sum('transaksi_keuntungan.bayaran_keuntungan');
+
+
+        $keuntungansebenar = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
+
+        }
+        // dd($keuntungansebenar);
+
+        $total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong + $keuntungansebenar + $upahsimpankeuntungansebelumtawarruq) + $parameter;
+
+        // dd($utgrugilama,$lelong,$upahsimpantebus,$upahsimpanlelong,$upahsimpanansur,$gstcajlelong,$parameter);
 
         if($kodcaw == '011229')
             $total -= 45390.37;
@@ -1255,13 +1413,15 @@ class TebusController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
 
+        $tarikhyear = new Carbon($request->tarikh);
+
         if($request->tarikh < '2021-06-09')
         {
             $keuntungan_data = TransaksiKeuntungan::on('mysql7')
                 // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                 ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
                 ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
-                ->whereYear('tarikh_bayaran','=',$current->year)
+                ->whereYear('tarikh_bayaran','=',$tarikhyear->year)
                 ->where('kodcaw',$request->kodcaw)
                 // ->whereNotNull('db2.hargajualan')
                 // ->sum('bayaran_keuntungan');
@@ -1273,7 +1433,7 @@ class TebusController extends Controller
                 ->whereIn('norujukan',$gadaiData)
                 ->whereDate('tarikh_bayaran', '<=', $request->tarikh)
                 ->whereDate('tarikh_bayaran' ,'<', $dateSM)
-                ->whereYear('tarikh_bayaran','=',$current->year)
+                ->whereYear('tarikh_bayaran','=',$tarikhyear->year)
                 ->sum('bayaran_keuntungan');
 
             // $keuntungan = 0;
@@ -1290,7 +1450,7 @@ class TebusController extends Controller
                 // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                 ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
                 ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
-                ->whereYear('tarikh_bayaran','=',$current->year)
+                ->whereYear('tarikh_bayaran','=',$tarikhyear->year)
                 ->where('kodcaw',$request->kodcaw)
                 // ->whereNotNull('db2.hargajualan')
                 // ->sum('keuntungan_rebet');
@@ -1303,7 +1463,7 @@ class TebusController extends Controller
                 ->whereIn('norujukan',$gadaiData)
                 ->whereDate('tarikh_bayaran' ,'<=', $request->tarikh)
                 ->whereDate('tarikh_bayaran','>=', $dateSM)
-                ->whereYear('tarikh_bayaran','=',$current->year)
+                ->whereYear('tarikh_bayaran','=',$tarikhyear->year)
                 ->sum('keuntungan_rebet');
             
             // $keuntunganreducing = 0;
@@ -1325,7 +1485,7 @@ class TebusController extends Controller
                     // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
-                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->whereYear('tarikh_bayaran','=',$tarikhyear->year)
                     ->where('kodcaw',$request->kodcaw)
                     // ->whereNotNull('db2.hargajualan')
                     // ->sum('bayaran_keuntungan');
@@ -1354,7 +1514,7 @@ class TebusController extends Controller
                     // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', '2021-06-09')
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
-                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->whereYear('tarikh_bayaran','=',$tarikhyear->year)
                     ->where('kodcaw',$request->kodcaw)
                     // ->whereNotNull('db2.hargajualan')
                     // ->sum('keuntungan_rebet');
@@ -1392,7 +1552,7 @@ class TebusController extends Controller
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
                     // ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
-                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->whereYear('tarikh_bayaran','=',$tarikhyear->year)
                     ->where('trans.kodcaw',$request->kodcaw)
                     // ->whereNotNull('db2.hargajualan')
                     // ->sum('keuntungan_rebet');
@@ -1414,7 +1574,7 @@ class TebusController extends Controller
                     ->where('trans.trans_type','!=','A')
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
-                    ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
+                    ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$tarikhyear->year)
                     ->sum('transaksi_keuntungan.keuntungan_rebet');
 
         // $bukanansuran = 0;
@@ -1440,7 +1600,7 @@ class TebusController extends Controller
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
                     // ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
-                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->whereYear('tarikh_bayaran','=',$tarikhyear->year)
                     ->where('trans.kodcaw',$request->kodcaw)
                     // ->whereNotNull('db2.hargajualan')
                     // ->sum('bayaran_keuntungan');
@@ -1462,7 +1622,7 @@ class TebusController extends Controller
             ->where('trans.trans_type','=','A')
             ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
             ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
-            ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
+            ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$tarikhyear->year)
             ->sum('transaksi_keuntungan.bayaran_keuntungan');
         
         // $ansuran = 0;
diff --git a/routes/web.php b/routes/web.php
index 71d9427..c4095cb 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -609,4 +609,52 @@ $router->group(['prefix'=>'portal'], function () use ($router){
     $router->get('searchsagonline',['uses'=>'TransactionOnlineController@searchSAGOnline']);
 });
 
+$router->group(['prefix'=>'admin'], function () use ($router){
+
+    $router->get('getTunaiPaginate/{kodcaw}',['uses' => 'AdminPageController@TunaiPaginateforAdmin']);
+    $router->get('getPetiBesiPaginate/{kodcaw}',['uses' => 'AdminPageController@PetiBesiPaginateforAdmin']);
+    $router->get('GetTunaiByTarikh/{kodcaw}',['uses' =>'AdminPageController@getTarikhTunai']);
+    $router->get('getAddTunaiDateKodlaluan/{kodcaw}/',['uses' =>'AdminPageController@getAddTunaiDateKodlaluan']);
+    $router->get('AdvansurSearchByTarikh/{kodcaw}',['uses'=>'AdminPageController@SenaraiAdvansurTarikh']);
+    $router->get('TuntutBakiTarikhTeller/{kodcaw}',['uses'=>'AdminPageController@showTuntutBakiTarikhTeller']);
+    $router->get('lelong/tarikh/{kodcaw}',['uses'=>'AdminPageController@LelonganTarikh']); 
+
+    $router->get('searchByName',['uses'=>'CustomerController@AdminsearchCustomerByName']);
+    $router->get('searchByIC',['uses'=>'CustomerController@AdminsearchCustomerByIC']);
+
+    $router->get('pembiayaanTahunan',['uses'=>'AdminPageController@TahunanGadai']);
+    $router->get('penebusanTahunan',['uses'=>'AdminPageController@TahunanTebus']);
+    $router->get('keuntunganTahunan',['uses'=>'AdminPageController@TahunanKeuntungan']);
+
+    $router->get('pembiayaanBulanan',['uses'=>'AdminPageController@PembiayaanBulanan']);
+    $router->get('penebusanBulanan',['uses'=>'AdminPageController@PenebusanBulanan']);
+    $router->get('keuntunganBulanan',['uses'=>'AdminPageController@KeuntunganBulanan']);
+    $router->get('pembiayaanToday',['uses'=>'AdminPageController@showAllGadaiToday']);
+    $router->get('penebusanToday',['uses'=>'AdminPageController@showAllTebusToday']);
+    $router->get('keuntunganToday',['uses'=>'AdminPageController@showAllUpahToday']);
+    $router->get('bilangan/gadai',['uses'=>'AdminPageController@BilanganGadaianBulanan']);
+    $router->get('bilangan/tebus',['uses'=>'AdminPageController@BilanganPenebusanBulanan']);
+
+    $router->get('senaraiBajet',['uses' => 'AdminPageController@SenaraiBajet']);
+    $router->get('senaraiKemaskiniBajet',['uses' => 'AdminPageController@senaraikemaskinibajet']);
+    $router->get('checkBajet',['uses' => 'AdminPageController@checkBajet']);
+    $router->post('simpanBajet',['uses'=>'AdminPageController@SimpanBajet']);
+    $router->put('kemaskiniBajet',['uses'=>'AdminPageController@KemaskiniBajet']);
+
+    $router->get('Customers/{id}',['uses'=>'AdminPageController@showOneCustomer']);
+    $router->get('PetibesiSebelumTarikh/{kodcaw}',['uses'=>'AdminPageController@getpetibesiSebelumbyTarikh']);
+    $router->get('GlDetailTarikh/{kodcaw}',['uses'=>'AdminPageController@getGldetailbyTarikh']);
+    $router->get('PanjarTarikh/{kodcaw}',['uses'=>'AdminPageController@getPanjarbyTarikh']);
+    $router->put('UpdatePetiBesi',['uses'=>'AdminPageController@updatePetiBesiAdmin']);
+    $router->get('searchSAGOnline',['uses'=>'AdminPageController@AdminsearchSagOnline']);
+    $router->post('simpanStatus',['uses'=>'AdminPageController@SimpanStatus']);
+
+    $router->get('SenaraiBlacklist/{kodcaw}',['uses'=>'AdminPageController@SenaraiBlacklist']);
+    $router->post('AddSenaraiHitam',['uses'=>'AdminPageController@AddSenaraiHitam']);
+
+
+
+
+});
+