From 4a8d10b7a9004b3dbf625c32a64fe0ada2dd6d91 Mon Sep 17 00:00:00 2001
From: Afiq <afiqzakwanhamdan@gmail.com>
Date: Wed, 2 Mar 2022 22:57:56 +0800
Subject: [PATCH 1/6] fix tebus

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

diff --git a/app/Cawangan.php b/app/Cawangan.php
index c17b0b1..61ef694 100644
--- a/app/Cawangan.php
+++ b/app/Cawangan.php
@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 class Cawangan extends Model
 {
     protected $table = 'arrahn_master_db';
+    protected $connection = 'mysql7';
 
     /**
      * The attributes that are mass assignable.
@@ -14,7 +15,7 @@ class Cawangan extends Model
      * @var array
      */
     // protected $fillable = [
-        
+
     // ];
 
     /**
@@ -23,4 +24,4 @@ class Cawangan extends Model
      * @var array
      */
     // protected $hidden = [];
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 14c45db..4571b34 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -50,6 +50,28 @@ class TebusController extends Controller
         return response()->json($hargatebus);
     }
 
+    public function hargaTebusTawarruq($kodcaw,$norujukan){
+        $cawangan = Cawangan::on('mysql7')
+                    ->where('kodcaw','=',$kodcaw)
+                    ->first();
+
+        $gadai_data = Gadai::on($cawangan['mysql'])
+                    ->where('norujukan','=',$norujukan)
+                    ->first();
+
+        $rebet = $this->rebetselepastawarruq($kodcaw,$norujukan);
+
+        $harga_tebus = $gadai_data['bakihargajualan'] - $rebet;
+
+        $hargatebus = bcdiv(round($harga_tebus,2),1,1);
+        $hargatebus = number_format($hargatebus,2);
+        if(strpos($hargatebus,',')){
+            $hargatebus = str_replace(',','',$hargatebus);
+        }
+
+        return $hargatebus;
+    }
+
     public function kiraupahTawarruq($kodcaw,$norujukan){
         $cawangan = Cawangan::on('mysql7')
                     ->where('kodcaw','=',$kodcaw)
@@ -388,11 +410,7 @@ class TebusController extends Controller
 
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
-        $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
-            'sttebus' => "T",
-            't_update' => $current->toDateString(),
-        ));
-        $harga_tebus = $this->tebusTawarruq($kodcaw,$norujukan);
+        $harga_tebus = $this->hargaTebusTawarruq($kodcaw,$norujukan);
         $upah_rebet = $this->kiraUpahRebetSebenar($kodcaw,$norujukan);
         $upah_tebus = $this->kiraupahTawarruq($kodcaw,$norujukan);
         $upah_rebet_sebenar = $harga_tebus - $gadai['bakipjm'];
@@ -472,6 +490,11 @@ class TebusController extends Controller
             ]);
         }
 
+        $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
+            'sttebus' => "T",
+            't_update' => $current->toDateString(),
+        ));
+
         $audit = new Audit();
         $audit->users = $request->teller;
         if($request->jenistebus == 'P'){

From 09a23025798d11c8ba3df4bb4826385fbd483ff5 Mon Sep 17 00:00:00 2001
From: Afiq <afiqzakwanhamdan@gmail.com>
Date: Thu, 3 Mar 2022 13:19:36 +0800
Subject: [PATCH 2/6] fix update

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

diff --git a/app/Http/Controllers/TransactionOnlineController.php b/app/Http/Controllers/TransactionOnlineController.php
index a0e7c24..cea278e 100644
--- a/app/Http/Controllers/TransactionOnlineController.php
+++ b/app/Http/Controllers/TransactionOnlineController.php
@@ -254,7 +254,7 @@ class TransactionOnlineController extends Controller
     }
 
     public function getListUnsuccessful(){
-        $list = TransactionOnline::on('mysql7')->whereIn('status',['NOT PAID','UNSUCCESSFUL'])->get();
+        $list = TransactionOnline::on('mysql7')->where('status','NOT PAID')->orderBy('id', 'desc')->take(10)->get();
 
         return response()->json($list);
     }

From e6971928c68670558015200692ada975c79e7dc9 Mon Sep 17 00:00:00 2001
From: Afiq <afiqzakwanhamdan@gmail.com>
Date: Thu, 3 Mar 2022 15:25:22 +0800
Subject: [PATCH 3/6] fix

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

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 27a256c..b532906 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -3421,14 +3421,14 @@ class GadaiController extends Controller
             $gadai_all = Gadai::on($cawangan['mysql'])->where('sttebus','')->where('hargajualan','!=','bakihargajualan')->get();
             foreach($gadai_all as $index=>$gadai){
                 $totalbayaran = round($gadai['hargajualan'] - $gadai['bakihargajualan'],1);
-                $upah6bln_raw = $gadai['bakiupah'];
+                $upah6bln_raw = $gadai['bakiupah'] - 0.2;
 
                 $upah6bln_round = number_format($upah6bln_raw,2);
                 $upah6bln = substr($upah6bln_round, 0, -1);
-                //$upah6bln = floatval(preg_replace('/[^\d.]/', '', $upah6bln));
-		if(strpos($upah6bln,',')){
-           		 $upah6bln = str_replace(',','',$upah6bln);
-       		 }
+
+		        if(strpos($upah6bln,',')){
+           		    $upah6bln = str_replace(',','',$upah6bln);
+       		    }
 
 
                 if($totalbayaran >= $upah6bln){
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 4571b34..b08be2b 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -216,6 +216,22 @@ class TebusController extends Controller
         return response()->json($harga_tebus);
     }
 
+    public function hargaTebusNotTawarruq($kodcaw,$norujukan){
+        $cawangan = Cawangan::on('mysql7')
+                    ->where('kodcaw','=',$kodcaw)
+                    ->first();
+
+        $gadai_data = Gadai::on($cawangan['mysql'])
+                    ->where('norujukan','=',$norujukan)
+                    ->first();
+
+        $upah_semasa = $this->kiraUpahNotTawarruq($kodcaw,$norujukan);
+
+        $harga_tebus = $upah_semasa + $gadai_data['pinjaman'];
+
+        return $harga_tebus;
+    }
+
     public function getMoratorium(){
         $bln_mora = Moratorium::first();
 
@@ -410,9 +426,14 @@ class TebusController extends Controller
 
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
-        $harga_tebus = $this->hargaTebusTawarruq($kodcaw,$norujukan);
+        if($gadai['hargajualan'] == null){
+            $harga_tebus = $this->hargaTebusNotTawarruq($kodcaw,$norujukan);
+            $upah_tebus = $this->kiraUpahNotTawarruq($kodcaw,$norujukan);
+        }else{
+            $harga_tebus = $this->hargaTebusTawarruq($kodcaw,$norujukan);
+            $upah_tebus = $this->kiraupahTawarruq($kodcaw,$norujukan);
+        }
         $upah_rebet = $this->kiraUpahRebetSebenar($kodcaw,$norujukan);
-        $upah_tebus = $this->kiraupahTawarruq($kodcaw,$norujukan);
         $upah_rebet_sebenar = $harga_tebus - $gadai['bakipjm'];
 
         $create_tebus = Tebus::on($cawangan['mysql'])->create([

From e85373509a02433f5f6f84a3e412f15e8baffcf5 Mon Sep 17 00:00:00 2001
From: Afiq <afiqzakwanhamdan@gmail.com>
Date: Thu, 3 Mar 2022 16:27:36 +0800
Subject: [PATCH 4/6] fix sag lama

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

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index b08be2b..5c5faba 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -429,12 +429,15 @@ class TebusController extends Controller
         if($gadai['hargajualan'] == null){
             $harga_tebus = $this->hargaTebusNotTawarruq($kodcaw,$norujukan);
             $upah_tebus = $this->kiraUpahNotTawarruq($kodcaw,$norujukan);
+            $upah_rebet = 0;
+            $upah_rebet_sebenar = 0;
         }else{
             $harga_tebus = $this->hargaTebusTawarruq($kodcaw,$norujukan);
             $upah_tebus = $this->kiraupahTawarruq($kodcaw,$norujukan);
+            $upah_rebet = $this->kiraUpahRebetSebenar($kodcaw,$norujukan);
+            $upah_rebet_sebenar = $harga_tebus - $gadai['bakipjm'];
         }
-        $upah_rebet = $this->kiraUpahRebetSebenar($kodcaw,$norujukan);
-        $upah_rebet_sebenar = $harga_tebus - $gadai['bakipjm'];
+
 
         $create_tebus = Tebus::on($cawangan['mysql'])->create([
             'kodcaw'=> $kodcaw,

From 6ac338a38a1369605b66f5ce6f9f3d5e73eae258 Mon Sep 17 00:00:00 2001
From: fifi97 <46933637+fifi97@users.noreply.github.com>
Date: Sun, 6 Mar 2022 11:06:07 +0800
Subject: [PATCH 5/6] fix skit2

---
 app/Http/Controllers/AdminPageController.php | 132 +++++++---
 app/Http/Controllers/LaporanController.php   | 263 ++++++++++++++++++-
 routes/web.php                               |   1 -
 3 files changed, 359 insertions(+), 37 deletions(-)

diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
index ecac955..04db6da 100644
--- a/app/Http/Controllers/AdminPageController.php
+++ b/app/Http/Controllers/AdminPageController.php
@@ -1029,7 +1029,7 @@ class AdminPageController extends Controller
                     break;  
             case 2: $bulan = 'Februari';
                     break;
-            case 3: $bulan = 'March';
+            case 3: $bulan = 'Mac';
                     break;
             case 4: $bulan = 'April';
                     break;
@@ -1122,7 +1122,7 @@ class AdminPageController extends Controller
                     break;  
             case 2: $bulan = 'Februari';
                     break;
-            case 3: $bulan = 'March';
+            case 3: $bulan = 'Mac';
                     break;
             case 4: $bulan = 'April';
                     break;
@@ -1214,14 +1214,48 @@ class AdminPageController extends Controller
                     ->orderBy('t_tebus','asc')
                     ->sum('bakiupah');
 
-        $upahlatest = $lelongupahsimpan + $tebus;
+        $advansur = Advansur::on($cawangan['mysql'])
+                ->selectRaw('SUM(upahDibayar) AS total')
+                ->whereYear('tarikh',$current->year)
+                ->where([['tarikh','<=',$harini],['tarikh','>=',$monthly_date]])
+                ->sum('upahDibayar');
+
+        $ansuran = Transaction::on('mysql7')
+                ->selectRaw('SUM(trans.bayaran_keuntungan) AS total')
+                ->whereYear('transaction.created_at',$current->year)
+                ->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([['trans.tarikh_bayaran','>=',$monthly_date . ' 00:00:00'],['trans.tarikh_bayaran','<=',$harini. ' 23:59:59']])
+                ->where('trans.kodcaw','=',$request->kodcaw)
+                ->sum('trans.bayaran_keuntungan');
+
+
+        $tebus_upah_tawarruq = Transaction::on('mysql7')
+                ->selectRaw('SUM(trans.keuntungan_rebet) AS total')
+                ->whereYear('transaction.created_at',$current->year)
+                ->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([['trans.tarikh_bayaran','>=',$monthly_date . ' 00:00:00'],['trans.tarikh_bayaran','<=',$harini . ' 23:59:59']])
+                ->where('trans.kodcaw','=',$request->kodcaw)
+                ->sum('trans.keuntungan_rebet');
+    
+
+        $upahlatest = $lelongupahsimpan + $tebus + $ansuran + $advansur + $tebus_upah_tawarruq;
 
         switch($current->month){
             case 1: $bulan = 'Januari';
                     break;  
             case 2: $bulan = 'Februari';
                     break;
-            case 3: $bulan = 'March';
+            case 3: $bulan = 'Mac';
                     break;
             case 4: $bulan = 'April';
                     break;
@@ -1686,7 +1720,7 @@ class AdminPageController extends Controller
        return response()->json($arraykelulusan,200);
     }
 
-    public function showOneCustomerGadai($ic,$status){
+    public function showOneCustomerGadai($ic,$status,Request $request){
         if($status == 'belum_tebus'){
             $gadai_status = '';
         }elseif($status == 'sudah_tebus'){
@@ -1697,37 +1731,73 @@ class AdminPageController extends Controller
 
         $cawangan_all = Cawangan::on('mysql7')->get();
         $gadai_all = [];
-        foreach($cawangan_all as $index=>$cawangan){
-            if($status == 'belum_tebus' || $status == 'sudah_tebus'){
-                
-                if($status == 'sudah_tebus')
-                {
-                        $gadai = Gadai::on($cawangan['mysql'])
-                                ->join('tebus', 'gadai.norujukan', '=', 'tebus.norujukan')
-                                ->where([['gadai.sttebus','=',$gadai_status],['gadai.nokp','=',$ic]])
-                                ->orderBy('tebus.t_tebus','desc')
+
+        if(isset($request->search))
+        {
+                foreach($cawangan_all as $index=>$cawangan){
+                        if($status == 'belum_tebus' || $status == 'sudah_tebus'){
+                                
+                                if($status == 'sudah_tebus')
+                                {
+                                        $gadai = Gadai::on($cawangan['mysql'])
+                                                ->join('tebus', 'gadai.norujukan', '=', 'tebus.norujukan')
+                                                ->where([['gadai.norujukan','LIKE',"%{$request->search}%"],['gadai.sttebus','=',$gadai_status],['gadai.nokp','=',$ic]])
+                                                ->orderBy('tebus.t_tebus','desc')
+                                                ->get()->toArray();
+                                }else{
+                                        $gadai = Gadai::on($cawangan['mysql'])
+                                                ->where([['norujukan','LIKE',"%{$request->search}%"],['sttebus','=',$gadai_status],['nokp','=',$ic]])
+                                                ->orderBy('t_gadai','desc')
+                                                ->get()->toArray();
+                                }
+                                
+                                if(sizeof($gadai) != 0){
+                                        $gadai_all += $gadai;
+                                }
+                        }elseif($status == 'lelong'){
+                                $gadai = Gadai::on($cawangan['mysql'])
+                                ->where([['norujukan','LIKE',"%{$request->search}%"],['sttebus','=',$gadai_status],['nokp','=',$ic]])
+                                ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
                                 ->get()->toArray();
-                }else{
-                        $gadai = Gadai::on($cawangan['mysql'])
+                                if(sizeof($gadai) != 0){
+                                        $gadai_all += $gadai;
+                                }
+                        }
+                }
+
+        }else{
+                foreach($cawangan_all as $index=>$cawangan){
+                        if($status == 'belum_tebus' || $status == 'sudah_tebus'){
+                                
+                                if($status == 'sudah_tebus')
+                                {
+                                        $gadai = Gadai::on($cawangan['mysql'])
+                                                ->join('tebus', 'gadai.norujukan', '=', 'tebus.norujukan')
+                                                ->where([['gadai.sttebus','=',$gadai_status],['gadai.nokp','=',$ic]])
+                                                ->orderBy('tebus.t_tebus','desc')
+                                                ->get()->toArray();
+                                }else{
+                                        $gadai = Gadai::on($cawangan['mysql'])
+                                                ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
+                                                ->orderBy('t_gadai','desc')
+                                                ->get()->toArray();
+                                }
+                                
+                                if(sizeof($gadai) != 0){
+                                        $gadai_all += $gadai;
+                                }
+                        }elseif($status == 'lelong'){
+                                $gadai = Gadai::on($cawangan['mysql'])
                                 ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
-                                ->orderBy('t_gadai','desc')
+                                ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
                                 ->get()->toArray();
+                                if(sizeof($gadai) != 0){
+                                        $gadai_all += $gadai;
+                                }
+                        }
                 }
-               
-                if(sizeof($gadai) != 0){
-                        $gadai_all += $gadai;
-                }
-            }elseif($status == 'lelong'){
-                $gadai = Gadai::on($cawangan['mysql'])
-                    ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
-                    ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
-                    ->get()->toArray();
-                if(sizeof($gadai) != 0){
-                        $gadai_all += $gadai;
-                }
-            }
         }
-        
+      
         $data = $this->paginate($gadai_all);
 
         return response()->json($data);
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index bc70015..d1c30fa 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -766,12 +766,15 @@ class LaporanController extends Controller
         
         $tebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]]);
         $ansuran = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]]);
+        $bayaranonlinequery = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where('teller','=','Online')->where('kodcaw',$request->kodcaw);
 
-
+        $bayaranonline = $bayaranonlinequery->sum('duit_masuk');
+        $bilbayaranonline = $bayaranonlinequery->count();
+        
         //a
         $total_gadai = $gadai->sum('pinjaman');
         $total_tebus = $tebus->sum('pinjaman');
-        $total_ansuran = $ansuran->sum('duit_masuk');
+        // $total_ansuran = $ansuran->sum('duit_masuk');
         // $total_keuntungan = TransaksiKeuntungan::on('mysql7')->whereDate('tarikh_bayaran','=',$request->tarikh)->sum('bayaran_keuntungan');
         $total_upah = Advansur::on($cawangan['mysql'])->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->akhir]])->sum('upahdibayar');
         $total_keuntungantebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]])->sum('bakiupah');
@@ -797,7 +800,7 @@ class LaporanController extends Controller
         //b
         $bilangan_gadai = $gadai->count();
         $bilangan_tebus = $tebus->count();
-        $bilangan_ansuran = $ansuran->count();
+        // $bilangan_ansuran = $ansuran->count();
         $bilangan_customer_baru = Customer::on($cawangan['mysql'])->where([['tarikhdaftar','>=',$request->mula],['tarikhdaftar','<=',$request->akhir]])->count();
 
         //f
@@ -847,13 +850,255 @@ class LaporanController extends Controller
 
         $total_bilangan = floatval($bilangan_70) + floatval($bilangan_75) + floatval($bilangan_80);
 
+        //pendahuluan dan serahan
+
+        $serahanpkb = '1000/020';
+        $serahanjmc = '1000/026';
+        $pendahuluanpkb = '7000/102';
+        $pendahuluanjmc = '7000/106';
+        $serahankoperasi = '1000/090';
+
+        $totalserahan = GlDetail::on($cawangan['mysql'])
+            ->where('ktacct','=',$serahanpkb)
+            ->where('descpt','not like', 'SERAHAN BAYAR ONLINE%')
+            ->where('tarikh','>=', $request->mula)
+            ->where('tarikh','<=', $request->akhir)
+            ->where('tarikh','>','2021-03-24')
+            ->sum('serahan');
+
+        $serahanbayaranOnline = GlDetail::on($cawangan['mysql'])
+            ->where('ktacct','=',$serahanpkb)
+            ->where('descpt','like', 'SERAHAN BAYAR ONLINE%')
+            ->where('tarikh','>=', $request->mula)
+            ->where('tarikh','<=', $request->akhir)
+            ->where('tarikh','>','2021-03-24')
+            ->sum('serahan');
+
+        $totalpendahuluan = GlDetail::on($cawangan['mysql'])
+            ->where('ktacct','=',$pendahuluanpkb)
+            ->where([['tarikh','<=', $request->mula],['tarikh','<=', $request->akhir],['tarikh','>','2021-03-24']])
+            ->sum('pendahuluan');
+
+        $belanjaam = Panjar::on($cawangan['mysql'])->where('tag','=', 1)->where('tarikh','>=', $request->mula)->where('tarikh','<=', $request->akhir)->sum('bayaran');
+        $baikidanselenggara = Panjar::on($cawangan['mysql'])->where('tag','=', 2)->where('tarikh','>=', $request->mula)->where('tarikh','<=', $request->akhir)->sum('bayaran');
+        $keraian = Panjar::on($cawangan['mysql'])->where('tag','=', 3)->where('tarikh','>=', $request->mula)->where('tarikh','<=', $request->akhir)->sum('bayaran');
+
+        //Ansuran
+
+        $ansurankaunter = 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');
+                        })
+                        ->whereRaw('DATE(transaksi_keuntungan.tarikh_bayaran) >= ?',[$request->mula])
+                        ->whereRaw('DATE(transaksi_keuntungan.tarikh_bayaran) <= ?',[$request->akhir])
+                        ->where([['trans.trans_type','=','A'],['teller','<>','Online'],['trans.kodcaw','=',$request->kodcaw]]);
+           
+        $ansuranonline = 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');
+                        })
+                        ->whereRaw('DATE(transaksi_keuntungan.tarikh_bayaran) >= ?',[$request->mula])
+                        ->whereRaw('DATE(transaksi_keuntungan.tarikh_bayaran) <= ?',[$request->akhir])
+                        ->where([['trans.trans_type','=','A'],['teller','=','Online'],['trans.kodcaw','=',$request->kodcaw]]);
+
+        $total_ansuran = $ansurankaunter->sum('transaksi_keuntungan.bayaran_pembiayaan');
+        $total_ansuranonline = $ansuranonline->sum('transaksi_keuntungan.bayaran_pembiayaan');
+
+        $total_upah = Advansur::on($cawangan['mysql'])
+                        ->where([['tarikh','>=', $request->mula],['tarikh','<=', $request->akhir]])
+                        ->sum('upahdibayar');
+        
+        $total_keuntungantebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]])->sum('bakiupah');
+
+        $total_keuntunganansuran_data_kaunter = 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->mula)
+                    ->whereDate('trans.created_at','<=',$request->akhir)
+                    ->where('trans.teller','<>','Online')
+                    ->where('trans.trans_type','=','A')
+                    ->where('trans.kodcaw',$request->kodcaw)
+                    ->pluck('transaksi_keuntungan.norujukan');
+    
+        $gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data_kaunter)->whereNotNull('hargajualan')->pluck('norujukan');
+
+        $keuntunganansuran_kaunter_query = TransaksiKeuntungan::on('mysql7')
+                                            ->whereIn('norujukan',$gadaiDataKaunter)
+                                            ->whereDate('tarikh_bayaran','>=',$request->mula)
+                                            ->whereDate('tarikh_bayaran','<=',$request->akhir);
+
+                                            
+                                            
+        $total_keuntunganansuran_kaunter = $keuntunganansuran_kaunter_query->sum('bayaran_keuntungan');
+        $bil_keuntunganansuran_kaunter = $keuntunganansuran_kaunter_query->count();
+
+        $total_keuntunganansuran_data_online = 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->mula)
+        ->whereDate('trans.created_at','<=',$request->akhir)
+        ->where('trans.teller','=','Online')
+        ->where('trans.trans_type','=','A')
+        ->where('trans.kodcaw',$request->kodcaw)
+        ->pluck('transaksi_keuntungan.norujukan');
+
+        $gadaiDataOnline = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data_online)->whereNotNull('hargajualan')->pluck('norujukan');
+
+        $keuntunganansuran_online_query = TransaksiKeuntungan::on('mysql7')
+                                        ->whereIn('norujukan',$gadaiDataOnline)
+                                        ->whereDate('tarikh_bayaran','>=',$request->mula)
+                                        ->whereDate('tarikh_bayaran','<=',$request->akhir);
+                                        
+        $total_keuntunganansuran_online = $keuntunganansuran_online_query->sum('bayaran_keuntungan');
+        $bil_keuntunganansuran_online = $keuntunganansuran_online_query->count();
+
+        $total_keuntunganbukanansuran_data_kaunter = 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')
+                    ->where('trans.teller','<>','Online')
+                    ->whereDate('trans.created_at','>=',$request->mula)
+                    ->whereDate('trans.created_at','<=',$request->akhir)
+                    ->where('trans.kodcaw','=',$request->kodcaw);
+    
+        $total_keuntunganbukanansuran_kaunter = $total_keuntunganbukanansuran_data_kaunter->sum('keuntungan_rebet');
+        $bil_keuntunganbukanansuran_kaunter = $total_keuntunganbukanansuran_data_kaunter->count();
+    
+
+        $total_keuntunganbukanansuran_data_online = 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')
+            ->where('trans.teller','=','Online')
+            ->whereDate('trans.created_at','>=',$request->mula)
+            ->whereDate('trans.created_at','<=',$request->akhir)
+            ->where('trans.kodcaw','=',$request->kodcaw)
+            ->pluck('transaksi_keuntungan.norujukan');
+
+        $gadaiDataOnline = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganbukanansuran_data_online)->whereNotNull('hargajualan')->pluck('norujukan');
+
+        $keuntunganbukanansuran_online_query = TransaksiKeuntungan::on('mysql7')
+                                ->whereIn('norujukan',$gadaiDataOnline)
+                                ->whereDate('tarikh_bayaran','>=',$request->mula)
+                                ->whereDate('tarikh_bayaran','<=',$request->akhir);
+
+        $total_keuntunganbukanansuran_online = $keuntunganbukanansuran_online_query->sum('keuntungan_rebet');
+        $bil_keuntunganbukanansuran_online = $keuntunganbukanansuran_online_query->count();
+
+        $keuntungan_data_kaunter = 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('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->akhir)
+                    ->where('trans.teller','<>','Online')
+                    ->pluck('transaksi_keuntungan.norujukan');
+
+        $gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data_kaunter)->whereNull('hargajualan')->pluck('norujukan');
+
+        $keuntungan_kaunter_query = TransaksiKeuntungan::on('mysql7')
+                            ->whereIn('norujukan',$gadaiDataKaunter);
+                               
+        
+        $keuntungan_kaunter = $keuntungan_kaunter_query->sum('bayaran_keuntungan'); 
+        $bil_keuntungan_kaunter = $keuntungan_kaunter_query->count(); 
+
+        $bilangan_ansuran = $ansurankaunter->count();
+        $bilangan_ansuranonline = $ansuranonline->count();
+
+        
+        $upahtebus = Tebus::on($cawangan['mysql'])
+                    ->where('t_tebus','>=',$request->mula)
+                    ->where('t_tebus','<=',$request->akhir)
+                    ->sum('upahdibayar');
+
+        $upahlelong = Lelong::on($cawangan['mysql'])
+                    ->where('t_jual','>=',$request->mula)
+                    ->where('t_jual','<=',$request->akhir)
+                    ->sum('bakiupah');
+
+        $upahansurKaunter = Advansur::on($cawangan['mysql'])
+                    ->where('teller','<>','Online')
+                    ->where('tarikh','>=',$request->mula)
+                    ->where('tarikh','<=',$request->akhir)
+                    ->sum('upahdibayar');
+
+        $upahansurOnlineQuery = Advansur::on($cawangan['mysql'])
+                    ->where('teller','=','Online')
+                    ->where('tarikh','>=',$request->mula)
+                    ->where('tarikh','<=',$request->akhir);
+
+        $upahansurOnline = $upahansurOnlineQuery->sum('upahdibayar');
+        $bilupahansurOnline = $upahansurOnlineQuery->count();
+
+        
+        $upahsimpankaunter = $keuntungan_kaunter + $upahtebus + $upahlelong + $upahansurKaunter + $total_keuntunganbukanansuran_kaunter;
+
+        $keuntungansebenarkaunter = $total_keuntunganansuran_kaunter;
+
+        $upahsimpanonline = $upahansurOnline;
+        $keuntungansebenaronline = $total_keuntunganansuran_online + $total_keuntunganbukanansuran_online;
+
+        $total_keuntungan_kaunter = floatval($upahsimpankaunter) + floatval($keuntungansebenarkaunter);
+        $total_keuntungan_online = floatval($upahsimpanonline) + floatval($keuntungansebenaronline);
+
+        $totalbayaranonline = floatval($bayaranonline) + floatval($upahansurOnline);
+        $biltotalbayaranonline =  $bilbayaranonline + $bilupahansurOnline;
+
+        $tebus = Tebus::on($cawangan['mysql'])
+                ->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg')
+                ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
+                ->where('tebus.t_tebus','>=',$request->mula)
+                ->where('tebus.t_tebus','<=',$request->akhir)
+                ->get();
+
+        $pembiayaanlelong = Lelong::on($cawangan['mysql'])
+                ->where('t_jual','>=',$request->mula)
+                ->where('t_jual','<=',$request->akhir)
+                ->sum('pinjaman');
+
+        $totalpenebusan = 0;
+
+        foreach($tebus as $index1=>$teb)
+        {
+            if($teb['gad.hargajualan'] != $teb['bakihargajualan'])
+            {
+                $totalpenebusan += $teb['gadaibakipjm'];
+            }else{
+                $totalpenebusan += $teb['pinjaman'];
+            }
+        }
+
+        //Lelongan Pembiayaan
+        $totalpenebusan += $pembiayaanlelong;
+
         array_push($laporan_terkumpul,[
             'total_gadai'=>$total_gadai,
             'total_tebus'=>$total_tebus,
             'total_ansuran'=>$total_ansuran,
+            'total_ansuranonline'=>$total_ansuranonline,
             'bilangan_gadai'=>$bilangan_gadai,
             'bilangan_tebus'=>$bilangan_tebus,
             'bilangan_ansuran'=>$bilangan_ansuran,
+            'bilangan_ansuranonline'=>$bilangan_ansuranonline,
             'bilangan_customer_baru'=>$bilangan_customer_baru,
             'bayar_baki_lelong'=>$bayar_baki_lelong,
             'bayar_rugi_lelong'=>$bayar_rugi_lelong,
@@ -874,8 +1119,16 @@ class LaporanController extends Controller
             'jumlah_lelong'=>$jumlah_lelong,
             'baki_lelong'=>$baki_lelong,
             'rugi_lelong'=>$rugi_lelong,
-            'total_keuntungan'=>floatval($total_keuntungan)
-
+            'total_keuntungan'=>floatval($total_keuntungan),
+            'totalserahan' => floatval($totalserahan),
+            'serahanbayaranOnline' => floatval($serahanbayaranOnline),
+            'totalpendahuluan' => floatval($totalpendahuluan),
+            'belanjaam' => floatval($belanjaam),
+            'baikidanselenggara' => floatval($baikidanselenggara),
+            'keraian' => floatval($keraian),
+            'keuntungansebenarkaunter' => floatval($keuntungansebenarkaunter),
+            'total_keuntungan_kaunter'=>floatval($total_keuntungan_kaunter),
+            'total_keuntungan_online'=>floatval($total_keuntungan_online),
             ]);
             
         return response()->json($laporan_terkumpul);
diff --git a/routes/web.php b/routes/web.php
index 3f30ddd..a1e30cb 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -683,7 +683,6 @@ $router->group(['prefix'=>'admin'], function () use ($router){
 
     $router->get('customers/{ic}/gadai/{status}',['uses'=>'AdminPageController@showOneCustomerGadai']);
 
-
 });
 
 $router->group(['prefix'=>'kelantanpay'], function () use ($router){

From 25d5f90abefd32c1e91542e054e893c5b03ea94d Mon Sep 17 00:00:00 2001
From: fifi97 <46933637+fifi97@users.noreply.github.com>
Date: Sun, 6 Mar 2022 19:09:31 +0800
Subject: [PATCH 6/6] fix skit2

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

diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index d1c30fa..781583f 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -1129,6 +1129,7 @@ class LaporanController extends Controller
             'keuntungansebenarkaunter' => floatval($keuntungansebenarkaunter),
             'total_keuntungan_kaunter'=>floatval($total_keuntungan_kaunter),
             'total_keuntungan_online'=>floatval($total_keuntungan_online),
+            'upahsimpankaunter' => floatval($upahsimpankaunter)
             ]);
             
         return response()->json($laporan_terkumpul);