From 53dd80daac855b79c70978a3df8bc2f51d96b78a Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Tue, 29 Jun 2021 10:09:16 +0800
Subject: [PATCH 01/10] biasa

---
 app/Http/Controllers/GadaiController.php   |  69 +++++++++++
 app/Http/Controllers/LaporanController.php |  12 +-
 app/Http/Controllers/LelongController.php  |  11 ++
 app/Http/Controllers/PanjarController.php  |   6 +
 app/Http/Controllers/TebusController.php   |  15 ++-
 app/Http/Controllers/VaultController.php   | 138 ++++++++++++++++++++-
 routes/web.php                             |  35 +++++-
 7 files changed, 274 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 2c4d88d..90473a3 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -74,8 +74,11 @@ class GadaiController extends Controller
     }
 
     public function showOneGadaiByNorujukan($norujukan){
+
         $cawangan_all = Cawangan::on('mysql7')->get();
+
         $gadai_all = [];
+
         foreach($cawangan_all as $index=>$cawangan){
             $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->get();
             if(sizeof($gadai) != 0){
@@ -83,6 +86,7 @@ class GadaiController extends Controller
             }
         }
 
+
         return response()->json($gadai_all);
     }
 
@@ -2298,6 +2302,42 @@ class GadaiController extends Controller
             case 'ARP':
                 $tarikhtawarruq = '2021-06-15';
             break;
+            case '010621':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '010136':
+                $tarikhtawarruq = '2021-06-20';
+            break;
+            case '011235':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '011227':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '010620':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '010617':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '010915':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '011228':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '010219':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '011229':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '011013':
+                $tarikhtawarruq = '2021-06-23';
+            break;
+            case '011412':
+                $tarikhtawarruq = '2021-06-23';
+            break;
           }
 
         $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
@@ -2376,6 +2416,35 @@ class GadaiController extends Controller
         return response()->json($totalkeuntungan,200);
     }
 
+    public function CalculationKeuntunganLejer($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $keuntungan = Gadai::on($cawangan['mysql'])
+        ->where('t_gadai','>=',$request->mula)
+        ->where('t_gadai','<=',$request->hingga)
+        ->where('hargajualan','<>','null')
+        ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['t_gadai','>=','2021-04-14']])
+        ->whereNotNull('upah12')
+        ->sum('upah12');
+
+        $transaksi = TransaksiKeuntungan::on('mysql7')
+        ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+        ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
+        ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
+        ->whereYear('tarikh_bayaran','=',$current->year)
+        ->whereNotNull('db2.hargajualan')
+        ->sum('bayaran_keuntungan');
+
+
+        $totalkeuntungan = $keuntungan - $transaksi;
+
+        return response()->json($totalkeuntungan,200);
+    }
+
     public function CalculationBayaranPendahuluan($kodcaw,Request $request)
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index cf17956..bce3ce8 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -379,7 +379,17 @@ class LaporanController extends Controller
                             ->where('glcode','=','3000/120')
                             ->sum('amaun');	
 
-        $arrayxtra = ['upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)];
+        if($kodcaw == '011229')
+        {
+            $peruntukanhapuskira = GlCode::on($cawangan['mysql'])
+            ->where('glcode','=','1000/015')
+            ->sum('amaun');	
+        }else{
+            $peruntukanhapuskira = 0;
+        }
+       
+
+        $arrayxtra = ['phapuskira' => floatval($peruntukanhapuskira),'upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)];
 
         return response()->json($arrayxtra);
     }
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index f5b61c5..75000fc 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -201,6 +201,17 @@ class LelongController extends Controller
         if($kodcaw == 'APM')
             $bakilelong += 4498.1;
 
+        if($kodcaw == '010617')
+            $rugitotal -= 6.1;
+
+        if($kodcaw == '011229'){
+            $rugitotal -= 919.7;
+            $bakilelong -= 144;
+        }
+
+        if($kodcaw == '011412')
+            $rugitotal -= 7248.4;
+
         $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
 
         return response()->json($arraylelong,200);
diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php
index 1add74b..fc5b93d 100644
--- a/app/Http/Controllers/PanjarController.php
+++ b/app/Http/Controllers/PanjarController.php
@@ -140,6 +140,12 @@ class PanjarController extends Controller
       ->whereYear('tarikh','=',$current->year)
       ->sum('bayaran');
 
+      if($kodcaw == 'APM')
+      {
+         $perubatan = $perubatan - 10;
+         $baikidanselenggara = $baikidanselenggara - 10;
+      }
+
       $arraycalculation = ['bds' => $baikidanselenggara, 'perubatan' => $perubatan, 'keraian' => $keraian];
 
       return response()->json($arraycalculation);
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 57f43c7..5c0aeda 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -954,6 +954,9 @@ class TebusController extends Controller
 
 
         $total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong) + $parameter;
+
+        if($kodcaw == '011229')
+            $total -= 45390.37;
         
   
         return response()->json($total,200);
@@ -994,7 +997,7 @@ class TebusController extends Controller
 
         $keuntunganreducing = 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' ,'<', '2021-06-09')
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
                     ->whereYear('tarikh_bayaran','=',$current->year)
                     ->whereNotNull('db2.hargajualan')
@@ -1008,8 +1011,9 @@ class TebusController extends Controller
                         $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','>=', $dateSM)
+                    ->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)
                     ->whereNotNull('db2.hargajualan')
                     ->sum('keuntungan_rebet');
@@ -1022,8 +1026,9 @@ class TebusController extends Controller
                         $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','>=', $dateSM)
+                    ->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)
                     ->whereNotNull('db2.hargajualan')
                     ->sum('bayaran_keuntungan');
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index 4625997..63be5e0 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -321,7 +321,7 @@ class VaultController extends Controller
 
 
       //Sebelum Tawarruq
-      if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621')
+      if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621' || $kodcaw == '010915')
       {
          $serahanpkb = GlDetail::on($cawangan['mysql'])
             ->where('dtacct','=',$serahanpkb)
@@ -398,6 +398,142 @@ class VaultController extends Controller
       ->where('glcode','=',$serahankoperasi)
       ->sum('amaun');
 
+      if($kodcaw == '011229')
+         $totalserahan -= 0.10;
+      
+      if($kodcaw == '011013')
+         $totalserahan += 641000;
+
+      $arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb];
+
+      return response()->json($arraypend);
+   }
+
+
+   public function CalculationPendahuluanSerahanLejer($kodcaw,Request $request)
+   {
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+      $serahanpkb = '1000/020';
+      $serahanjmc = '1000/026';
+      $pendahuluanpkb = '7000/102';
+      $pendahuluanjmc = '7000/106';
+      $serahankoperasi = '1000/090';
+
+      $mula = $request->mula;
+      $hingga = $request->hingga;
+
+      //Selepas Tawarruq
+
+      $serahanpkbTawarruq = GlDetail::on($cawangan['mysql'])
+         ->where('ktacct','=',$serahanpkb)
+         ->where('tarikh','>=', $mula)
+         ->where('tarikh','<=', $hingga)
+         ->where('tarikh','>','2021-03-24')
+         ->sum('serahan');
+
+      //Sebelum Tawarruq
+      if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621' || $kodcaw == '010915')
+      {
+         $serahanpkb = GlDetail::on($cawangan['mysql'])
+            ->where('dtacct','=',$serahanpkb)
+            ->where('tarikh','>=', $mula)
+            ->where('tarikh','<=', $hingga)
+            ->where('tarikh','>','2013-12-31')
+            ->sum('amaun');
+
+         $serahanJMC = GlDetail::on($cawangan['mysql'])
+            ->where('dtacct','=',$serahanjmc)
+            ->where('tarikh','>=', $mula)
+            ->where('tarikh','<=', $hingga)
+            ->where('tarikh','>','2013-12-31')
+            ->sum('amaun');
+
+
+         if($mula <= '2013-12-31')
+         {
+            $serahanpkblama = imbangdugalama::on($cawangan['mysql'])
+               ->sum('serahan_pkb');
+
+            $serahanjmclama = imbangdugalama::on($cawangan['mysql'])
+               ->sum('serahan_jmc');
+
+               $totaljmc = $serahanJMC + $serahanjmclama;
+               $totalpkb = $serahanpkb + $serahanpkblama;
+      
+               $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb;
+         }else{
+
+            $totaljmc = $serahanJMC;
+            $totalpkb = $serahanpkb;
+   
+            $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb;
+         }
+        
+       
+      }else{
+
+         if($kodcaw == '020301')
+            $serahanbaru = '1000/030';
+         else
+            $serahanbaru = '1000/026';
+
+         $serahanpkb = GlDetail::on($cawangan['mysql'])
+            ->where('dtacct','=',$serahanpkb)
+                     ->where('tarikh','>=', $mula)
+                     ->where('tarikh','<=', $hingga)
+            ->sum('amaun');
+
+         $serahanJMC = GlDetail::on($cawangan['mysql'])
+            ->where('dtacct','=',$serahanbaru)
+                     ->where('tarikh','>=', $mula)
+                     ->where('tarikh','<=', $hingga)
+            ->sum('amaun');
+
+         $totalserahan = $serahanpkbTawarruq + $serahanpkb + $serahanJMC;
+      }
+
+      //Selepas Tawarruq
+
+      $pendahuluanPKBtawarruq = GlDetail::on($cawangan['mysql'])
+         ->where('ktacct','=',$pendahuluanpkb)
+         ->where([['tarikh','>=', $mula],['tarikh','<=', $hingga],['tarikh','>','2021-03-24']])
+         ->sum('pendahuluan');
+      
+      //Sebelum Tawarruq
+
+      $pendahuluanPKB = GlDetail::on($cawangan['mysql'])
+         ->where('ktacct','=',$pendahuluanpkb)
+         ->where([['tarikh','>=', $mula],['tarikh','<=', $hingga],['tarikh','>','2013-12-31']])
+         ->sum('amaun');
+
+      $pendahuluanJMC = GlDetail::on($cawangan['mysql'])
+         ->where('ktacct','=','7000/106')
+         ->where([['tarikh','>=', $mula],['tarikh','<=', $hingga],['tarikh','>','2013-12-31']])
+         ->sum('amaun');
+
+      if($mula <= '2013-12-31')
+      {
+         $pendahuluanpkblama = imbangdugalama::on($cawangan['mysql'])
+         ->sum('pendahuluan_pkb');
+
+         $pendahuluanjmclama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('pendahuluan_jmc');
+
+         $total = $pendahuluanPKBtawarruq + $pendahuluanjmclama + $pendahuluanpkblama + $pendahuluanPKB + $pendahuluanJMC;
+
+         $pindahkekpkb = GlCode::on($cawangan['mysql'])
+         ->where('glcode','=',$serahankoperasi)
+         ->sum('amaun');
+      }else{
+     
+         $total = $pendahuluanPKBtawarruq + $pendahuluanPKB + $pendahuluanJMC;
+
+         $pindahkekpkb = 0;
+
+      }
+
+   
       $arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb];
 
       return response()->json($arraypend);
diff --git a/routes/web.php b/routes/web.php
index d7e4a61..af862d3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -387,13 +387,38 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('Xtra/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); //Hapus Kira
 
 
-    //-- Untung Rugi --//
-    $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar
+    //LEJER AM//
+
+    //Dua-Dua Table
+    $router->get('PendahuluanSerahanLejer/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahanLejer']); //pendahuluan dan serahan
+    $router->get('KeuntunganArRahnLejer/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntunganLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru
+    // $router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru
+
+    // //-- Harta Semasa --//
+    // $router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi
+    // $router->get('PembiayaanDiberiTawarruqLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruq']); //pembiayaan tawarruq
+    // $router->get('BayaranPendahuluanLejer/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluan']); //pembiayaan tawarruq
+
+    // $router->get('TunaiDiTanganLejer/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan
+    // $router->get('PenghutangKakitanganLejer/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan
+
+    // //-- Tanggungan Semasa --//
+    // $router->get('CalculationPanjarLejer/{kodcaw}',['uses'=>'PanjarController@calculationpanjar']); //panjar
+    // $router->get('BakiLelongCalculationLejer/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculation']); //baki lelong & Rugi lelong
+    // $router->get('WTDLejer/{kodcaw}',['uses'=>'LelongController@calculationwtd']); //wang tak dituntut
+    // $router->get('SerahBakiLejer/{kodcaw}',['uses'=>'LelongController@calculationserahbaki']); //wang tak dituntut
+    // $router->get('cajlelongLejer/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); //caj lelong by tahun
+    // $router->get('KeuntunganSebenarLejer/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenar']); //Keuntungan Sebenar
+    // $router->get('UntungRugiTerkumpulLejer/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun
+    // $router->get('cajperkhidmatanterkumpulLejer/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun
+    // $router->get('CalculationHapusKiraLejer/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); //Hapus Kira
+    // $router->get('XtraLejer/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); //Xtra
 
 
-    
-    
-    //END IMBANG DUGA//
+    // //-- Untung Rugi --//
+    // $router->get('UntungRugiCalculationLejer/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); 
+
+    //END IMBANG DUGA & LEJER AM//
 
     //ADDED LEJER AM
 

From a8dde4715faa0ff7d43249e31adf7642884bb31f Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Sun, 4 Jul 2021 09:00:01 +0800
Subject: [PATCH 02/10] lejer am fix

---
 app/Http/Controllers/GadaiController.php  | 140 ++++++++++++++++++++++
 app/Http/Controllers/LelongController.php |  64 ++++++++++
 app/Http/Controllers/PanjarController.php |  45 +++++++
 app/Http/Controllers/TebusController.php  | 111 +++++++++++++++++
 app/Http/Controllers/VaultController.php  |  44 +++++++
 routes/web.php                            |  20 ++--
 6 files changed, 415 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 90473a3..745824c 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2364,6 +2364,109 @@ class GadaiController extends Controller
         return response()->json($array_rekodemas);
     }
 
+    public function CalculationPinjamanDiberiLejer($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $tarikhtawarruq = '';
+
+        switch ($kodcaw) {
+            case 'KB2':
+                $tarikhtawarruq = '2021-04-13';
+              break;
+            case 'WCY':
+                $tarikhtawarruq = '2021-05-04';
+              break;
+            case '1STOP':
+                $tarikhtawarruq = '2021-05-09';
+            break;
+            case '020301':
+                $tarikhtawarruq = '2021-05-18';
+            break;
+            case 'ALS':
+                $tarikhtawarruq = '2021-05-24';
+            break;
+            case 'WB':
+                $tarikhtawarruq = '2021-05-24';
+            break;
+            case 'APM':
+                $tarikhtawarruq = '2021-06-08';
+            break;
+            case 'ARM':
+                $tarikhtawarruq = '2021-06-08';
+            break;
+            case '020306':
+                $tarikhtawarruq = '2021-06-08';
+            break;
+            case '010311':
+                $tarikhtawarruq = '2021-06-13';
+            break;
+            case 'GC':
+                $tarikhtawarruq = '2021-06-13';
+            break;
+            case 'JLI':
+                $tarikhtawarruq = '2021-06-13';
+            break;
+            case '010621':
+                $tarikhtawarruq = '2021-06-15';
+            break;
+            case 'ARP':
+                $tarikhtawarruq = '2021-06-15';
+            break;
+            case '010621':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '010136':
+                $tarikhtawarruq = '2021-06-20';
+            break;
+            case '011235':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '011227':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '010620':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '010617':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '010915':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '011228':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '010219':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '011229':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '011013':
+                $tarikhtawarruq = '2021-06-23';
+            break;
+            case '011412':
+                $tarikhtawarruq = '2021-06-23';
+            break;
+          }
+
+        $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',1)
+            ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=','']])
+            ->sum('pinjaman');
+
+        $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',0)
+            ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
+            ->orWhere([['sttebus','!=',''],['t_update','>',$request->mula],['t_update','<=',$request->hingga],['t_gadai','<=',$tarikhtawarruq]])
+            ->sum('pinjaman');
+
+        $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
+
+        return response()->json($array_rekodemas);
+    }
+
     public function CalculationPembiayaanTawarruq($kodcaw,Request $request)
     {
 
@@ -2378,6 +2481,20 @@ class GadaiController extends Controller
         return response()->json($rekod_pinjamandiberi);
     }
 
+    public function CalculationPembiayaanTawarruqLejer($kodcaw,Request $request)
+    {
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',0)
+            ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']])
+            ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']])
+            ->sum('pinjaman');
+
+        return response()->json($rekod_pinjamandiberi);
+    }
+
     public function CalculationKeuntungan($kodcaw,Request $request)
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
@@ -2465,6 +2582,29 @@ class GadaiController extends Controller
         return response($transaksi);
     }
 
+    public function CalculationBayaranPendahuluanLejer($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $datetawarruq = new Carbon('2021-04-14');
+        $datemula = new Carbon($request->mula);
+        $datemula->addDays(1);
+
+        $datehingga = new Carbon($request->hingga);
+        $datehingga->addDays(1);
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $transaksi = TransaksiKeuntungan::on('mysql7')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
+                    ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
+                    ->sum('bayaran_pembiayaan');
+
+        return response($transaksi);
+    }
+
     public function LaporanAuditAktif($kodcaw,Request $request)
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 75000fc..a69250f 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -217,6 +217,70 @@ class LelongController extends Controller
         return response()->json($arraylelong,200);
     }
 
+    public function BakiLelongCalculationLejer($kodcaw,Request $request)
+    {
+
+        $tarikhbaru = $request->mula;
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        if($kodcaw == 'KB2')
+        {
+            if($request->tarikh <= '2021-02-25')
+            {
+                $bakilelong = Lelong::on($cawangan['mysql'])
+                ->where('t_jual','>=',$request->mula)
+                ->where('t_jual','<=',$request->hingga)
+                ->where(function($query) use ($tarikhbaru){
+                    $query->whereNull('trkhtuntut')
+                        ->orWhere('trkhtuntut','>',$tarikhbaru);
+                })
+                ->where('baki','>=',0)
+                ->sum('baki');
+            }else{
+                $bakilelong = Lelong::on($cawangan['mysql'])
+                ->where('t_jual','>=',$request->mula)
+                ->where('t_jual','<=',$request->hingga)
+                ->where(function($query) use ($tarikhbaru){
+                    $query->whereNull('trkhtuntut')
+                        ->orWhere('trkhtuntut','>','2021-02-25');
+                })
+                ->where('baki','>=',0)
+                ->sum('baki');
+            } 
+        }else{
+            $bakilelong = Lelong::on($cawangan['mysql'])
+            ->where('t_jual','>=',$request->mula)
+            ->where('t_jual','<=',$request->hingga)
+            ->where(function($query) use ($tarikhbaru){
+                $query->whereNull('trkhtuntut')
+                    ->orWhere('trkhtuntut','>',$tarikhbaru);
+            })
+            ->where('baki','>=',0)
+            ->sum('baki');
+        }
+
+        $ansrugi = AnsRugi::on($cawangan['mysql'])
+            ->sum('bayaran');
+                
+        $rugilelong = Lelong::on($cawangan['mysql'])
+            ->where('t_jual','>=',$request->mula)
+            ->where('t_jual','<=',$request->hingga)
+            ->where(function($query) use ($tarikhbaru)
+            {
+                $query->whereNull('trkhtuntut')
+                    ->orWhere('trkhtuntut','>',$tarikhbaru);
+            })
+            ->where('baki','<',0)
+            ->sum('baki');
+
+        // $rugitotal = $rugilelong + $ansrugi; 
+        $rugitotal = $rugilelong;  
+        
+        $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
+
+        return response()->json($arraylelong,200);
+    }
+
     public function BilAkanDilelong($noic)
     {
         $cawangan_all = Cawangan::on('mysql7')->get();
diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php
index fc5b93d..acbd576 100644
--- a/app/Http/Controllers/PanjarController.php
+++ b/app/Http/Controllers/PanjarController.php
@@ -152,5 +152,50 @@ class PanjarController extends Controller
 
    }
 
+   public function calculationpanjarLejer(Request $request,$kodcaw)
+   {
+
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+      $current = Carbon::now();
+      $current = new Carbon($request->tarikh);
+
+
+
+      $baikidanselenggara = Panjar::on($cawangan['mysql'])
+      // ->where('tarikh','>=', $request->mula)
+      ->where('tarikh','>=', $request->mula)
+      ->where('tarikh','<=', $request->hingga)
+      ->where('tag', '=', 2)
+      ->sum('bayaran');
+
+      $perubatan = Panjar::on($cawangan['mysql'])
+      // ->where('tarikh','>=', $request->mula)
+      ->where('tarikh','>=', $request->mula)
+      ->where('tarikh','<=', $request->hingga)
+      ->where('tag', '=', 1)
+      ->sum('bayaran'); 
+
+      $keraian = Panjar::on($cawangan['mysql'])
+      // ->where('tarikh','>=', $request->mula)
+      ->where('tarikh','>=', $request->mula)
+      ->where('tarikh','<=', $request->hingga)
+      ->where('tag', '=', 3)
+      ->sum('bayaran');
+
+
+
+      if($kodcaw == 'APM')
+      {
+         $perubatan = $perubatan - 10;
+         $baikidanselenggara = $baikidanselenggara - 10;
+      }
+
+      $arraycalculation = ['bds' => $baikidanselenggara, 'perubatan' => $perubatan, 'keraian' => $keraian];
+
+      return response()->json($arraycalculation);
+
+   }
+
 
 }
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 5c0aeda..9e8baa9 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -868,6 +868,56 @@ class TebusController extends Controller
         return response()->json($total,200);
     }
 
+    public function calculationKeuntunganSebenarLejer($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $current = new Carbon($request->tarikh);
+
+        $total = 0;
+        $keuntunganselepastawarruq = 0;
+        $keuntungansebelumtawarruq = 0;
+
+        $daterequest = new Carbon($request->tarikh);
+        $daterequest->addDays(1);
+
+        //Keuntungan Selepas Tawarruq
+        $keuntungan = TransaksiKeuntungan::on('mysql7')
+            ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+            ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
+            ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
+            ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
+            ->whereNull('db2.hargajualan')
+            ->sum('bayaran_keuntungan');
+
+        $upahtebus = Tebus::on($cawangan['mysql'])
+            ->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga],['t_tebus','>','2013-12-31']])
+            ->whereYear('t_tebus','=',$current->year)
+            ->sum('upahdibayar');
+
+        $upahlelong = Lelong::on($cawangan['mysql'])
+            ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga],['t_jual','>','2013-12-31']])
+            ->whereYear('t_jual','=',$current->year)
+            ->sum('bakiupah');
+
+        $upahansur = Advansur::on($cawangan['mysql'])
+            ->where('tarikh','>=',$request->mula)
+            ->where('tarikh','<=',$request->hingga)
+            ->whereYear('tarikh','=',$current->year)
+            ->sum('upahdibayar');
+
+
+        $keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
+
+        // $keuntunganselepastawarruq = $keuntunganselepastawarruqupah; 
+        
+        // $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
+
+        $total = $keuntungansebelumtawarruq + $keuntungan;
+
+        return response()->json($total,200);
+    }
+
     public function calculationUntungRugiTerkumpul($kodcaw,Request $request)
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
@@ -1038,6 +1088,52 @@ class TebusController extends Controller
         return response($total);
     }
 
+    public function untungrugicalculationLejer($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        // $datetawarruq = new Carbon('2021-04-14');
+        $daterequest = new Carbon($request->tarikh);
+        $daterequest->addDays(1);
+
+        $dateSM = '2021-04-24';
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $bukanansuran = TransaksiKeuntungan::on('mysql7')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->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->mula)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
+                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->whereNotNull('db2.hargajualan')
+                    ->sum('keuntungan_rebet');
+
+        $ansuran = TransaksiKeuntungan::on('mysql7')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->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->mula)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
+                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->whereNotNull('db2.hargajualan')
+                    ->sum('bayaran_keuntungan');
+
+	$total = ($ansuran + $bukanansuran);
+
+        return response($total);
+    }
+
     public function RebetCalculation($kodcaw,Request $request)
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
@@ -1053,4 +1149,19 @@ class TebusController extends Controller
         return response($rebet);
     }
 
+    public function RebetCalculationLejer($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $rebet = Tebus::on($cawangan['mysql'])
+                ->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
+                ->where('tebus.t_tebus','>=',$request->mula)
+                ->where('tebus.t_tebus','<=',$request->hingga)
+                ->where('db2.hargajualan','>','0')
+                ->whereNotNull('db2.hargajualan')
+                ->sum('rebate');      
+
+        return response($rebet);
+    }
+
 }
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index 63be5e0..151e93e 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -276,6 +276,50 @@ class VaultController extends Controller
       return response()->json($totalbakiakhirtunai);
    }
 
+   public function TunaiDiTanganLejer($kodcaw,Request $request)
+   {
+
+
+     $current = Carbon::now();
+     $current = new Carbon();   
+     
+     $totalbakiakhirtunai = 0;
+  
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+      $vault=Vault::on($cawangan['mysql'])
+              ->where('kodcaw','=',$kodcaw)
+              ->where('tarikh','>=', $request->mula)
+              ->where('tarikh','<=', $request->hingga)
+              ->orderby('tarikh','desc')->first();
+
+      $tunai = Tunai::on($cawangan['mysql'])
+               ->where('kodcaw','=',$kodcaw)
+               ->where('tarikh','>=', $request->mula)
+              ->where('tarikh','<=', $request->hingga)
+               ->get();
+
+      $total = 0;
+      foreach($tunai as $index=>$money)
+      {
+         $total+=$money['baki'];
+      }
+
+
+      if($total != 0)
+      {
+         $totalmasuk = $vault['masuk'] + $vault['pendahuluan'] + $total;
+      }else
+      {
+         $totalmasuk = $vault['masuk'];
+      }
+
+      $totalkeluar = $vault['keluar'] + $vault['serahan'] + $vault['totpanjar'];
+
+      $arraytunaiditangan = ['totalmasuk' => $totalmasuk, 'totalkeluar' => $totalkeluar];
+   
+      return response()->json($arraytunaiditangan,200);
+   }
+
 
    public function laporanPetiBesi($kodcaw,$tarikh)
    {
diff --git a/routes/web.php b/routes/web.php
index af862d3..5fb6807 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -392,23 +392,23 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //Dua-Dua Table
     $router->get('PendahuluanSerahanLejer/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahanLejer']); //pendahuluan dan serahan
     $router->get('KeuntunganArRahnLejer/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntunganLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru
-    // $router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru
+    $router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru
 
     // //-- Harta Semasa --//
-    // $router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi
-    // $router->get('PembiayaanDiberiTawarruqLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruq']); //pembiayaan tawarruq
-    // $router->get('BayaranPendahuluanLejer/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluan']); //pembiayaan tawarruq
+    $router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberiLejer']); //pinjaman diberi
+    $router->get('PembiayaanDiberiTawarruqLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruqLejer']); //pembiayaan tawarruq
+    $router->get('BayaranPendahuluanLejer/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluanLejer']); //pembiayaan tawarruq
 
-    // $router->get('TunaiDiTanganLejer/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan
+    $router->get('TunaiDiTanganLejer/{kodcaw}',['uses'=>'VaultController@TunaiDiTanganLejer']); //Tunai di tangan
     // $router->get('PenghutangKakitanganLejer/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan
 
     // //-- Tanggungan Semasa --//
-    // $router->get('CalculationPanjarLejer/{kodcaw}',['uses'=>'PanjarController@calculationpanjar']); //panjar
-    // $router->get('BakiLelongCalculationLejer/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculation']); //baki lelong & Rugi lelong
+    $router->get('CalculationPanjarLejer/{kodcaw}',['uses'=>'PanjarController@calculationpanjarLejer']); //panjar
+    $router->get('BakiLelongCalculationLejer/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculationLejer']); //baki lelong & Rugi lelong
     // $router->get('WTDLejer/{kodcaw}',['uses'=>'LelongController@calculationwtd']); //wang tak dituntut
     // $router->get('SerahBakiLejer/{kodcaw}',['uses'=>'LelongController@calculationserahbaki']); //wang tak dituntut
     // $router->get('cajlelongLejer/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); //caj lelong by tahun
-    // $router->get('KeuntunganSebenarLejer/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenar']); //Keuntungan Sebenar
+    $router->get('KeuntunganSebenarLejer/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenarLejer']); //Keuntungan Sebenar
     // $router->get('UntungRugiTerkumpulLejer/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun
     // $router->get('cajperkhidmatanterkumpulLejer/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun
     // $router->get('CalculationHapusKiraLejer/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); //Hapus Kira
@@ -416,7 +416,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
 
     // //-- Untung Rugi --//
-    // $router->get('UntungRugiCalculationLejer/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); 
+    $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); 
+    $router->get('UntungRugiCalculationLejer/{kodcaw}',['uses'=>'TebusController@untungrugicalculationLejer']); 
+    
 
     //END IMBANG DUGA & LEJER AM//
 

From 8db8f17ed8d0d26ded536f0b237b982f114e48db Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Sun, 4 Jul 2021 15:32:26 +0800
Subject: [PATCH 03/10] fix lejer am

---
 app/Http/Controllers/GadaiController.php   | 69 ++++++++++++++--------
 app/Http/Controllers/LaporanController.php |  5 +-
 app/Http/Controllers/TebusController.php   | 43 ++++++++++++--
 config/database.php                        | 33 +++++++++++
 4 files changed, 118 insertions(+), 32 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 745824c..083c67a 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -558,14 +558,15 @@ class GadaiController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $gadai = Gadai::on($cawangan['mysql'])
-                ->select('Gadai.t_gadai','Gadai.norujukan','cust.nama','Gadai.nokp','Gadai.semakbarcode','Gadai.masa','Gadai.berat','Gadai.nilaimarhun','Gadai.pinjaman','Gadai.upah12','Gadai.percentpinj','cust.alamat1','Gadai.teller')
-                ->join('Customer as cust', function($join)
+                ->select('gadai.t_gadai','gadai.norujukan','cust.nama','gadai.nokp','gadai.semakbarcode','gadai.masa','gadai.berat','gadai.nilaimarhun','gadai.pinjaman','gadai.upah12','gadai.percentpinj','cust.alamat1','gadai.teller')
+                ->join('online_arrahn.customer as cust', function($join)
                 {
-                    $join->on('Gadai.nokp', '=', 'cust.kpbaru');
-                    $join->orOn('Gadai.nokp', '=', 'cust.kplama');
+                    $join->on('gadai.nokp', '=', 'cust.kpbaru');
+                    $join->orOn('gadai.nokp', '=', 'cust.kplama');
                 })
-                ->where('Gadai.t_gadai','=',$tarikh)
-                ->orderBy('Gadai.teller')
+                ->where('gadai.t_gadai','=',$tarikh)
+                ->orderBy('gadai.teller')
+                ->orderBy('gadai.sirig')
                 ->get();
         
         return response()->json($gadai);
@@ -2338,7 +2339,16 @@ class GadaiController extends Controller
             case '011412':
                 $tarikhtawarruq = '2021-06-23';
             break;
-          }
+            case '011234':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '020303':
+                $tarikhtawarruq = '2021-06-23';
+            break;
+            case '010618':
+                $tarikhtawarruq = '2021-06-23';
+            break;
+          } 
 
         $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',1)
@@ -2451,18 +2461,20 @@ class GadaiController extends Controller
             break;
           }
 
-        $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
-            ->where('tagpalsu','=',1)
-            ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=','']])
-            ->sum('pinjaman');
-
-        $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
+        $gadai = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
             ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
-            ->orWhere([['sttebus','!=',''],['t_update','>',$request->mula],['t_update','<=',$request->hingga],['t_gadai','<=',$tarikhtawarruq]])
+            ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga]])
             ->sum('pinjaman');
 
-        $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
+        $tebus = Gadai::on($cawangan['mysql'])
+            ->join('Tebus as teb','teb.norujukan','=','Gadai.norujukan')
+            ->where('Gadai.tagpalsu','=',0)
+            ->where([['Gadai.t_gadai','<=',$tarikhtawarruq],['Gadai.sttebus','=','T']])
+            ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]])
+            ->sum('teb.pinjaman');
+
+        $array_rekodemas = ['Gadai' => $gadai,'Tebus' => $tebus];
 
         return response()->json($array_rekodemas);
     }
@@ -2486,12 +2498,20 @@ class GadaiController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
+        $Gadai = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
             ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']])
             ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']])
             ->sum('pinjaman');
 
+        $Tebus = Gadai::on($cawangan['mysql'])
+            ->join('Tebus as teb','teb.norujukan','=','Gadai.norujukan')
+            ->where('Gadai.tagpalsu','=',0)
+            ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['Gadai.sttebus','=','T'],['Gadai.hargajualan','<>','NULL']])
+            ->sum('teb.pinjaman');
+
+            $rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus];
+
         return response()->json($rekod_pinjamandiberi);
     }
 
@@ -2548,16 +2568,17 @@ class GadaiController extends Controller
         ->whereNotNull('upah12')
         ->sum('upah12');
 
-        $transaksi = TransaksiKeuntungan::on('mysql7')
-        ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-        ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
-        ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
-        ->whereYear('tarikh_bayaran','=',$current->year)
-        ->whereNotNull('db2.hargajualan')
-        ->sum('bayaran_keuntungan');
+        // $transaksi = TransaksiKeuntungan::on('mysql7')
+        // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+        // ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
+        // ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
+        // ->whereYear('tarikh_bayaran','=',$current->year)
+        // ->whereNotNull('db2.hargajualan')
+        // ->sum('bayaran_keuntungan');
 
 
-        $totalkeuntungan = $keuntungan - $transaksi;
+        // $totalkeuntungan = $keuntungan - $transaksi;
+        $totalkeuntungan = $keuntungan;
 
         return response()->json($totalkeuntungan,200);
     }
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index bce3ce8..66f7748 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -264,8 +264,9 @@ class LaporanController extends Controller
                     ->whereDate('trans.created_at','>=',$request->mula)
                     ->whereDate('trans.created_at','<=',$request->akhir)
                     ->where('trans.trans_type','=','A')
+                    ->where('trans.kodcaw','=',$request->kodcaw)
                     ->groupBy('trans.id')
-                    ->sum('keuntungan_rebet');
+                    ->sum('bayaran_keuntungan');
 
         // $total_ansuran = number_format($total_ansuran,2);
 
@@ -304,7 +305,7 @@ class LaporanController extends Controller
 
         //h
         $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('pinjaman');
-        $gadai_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',75]])->sum('pinjaman');
+        $gadai_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',70],['percentpinj','<=',75]])->sum('pinjaman');
         $gadai_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',75],['percentpinj','<=',80]])->sum('pinjaman');
 
         $nilaimarhun_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('nilaimarhun');
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 9e8baa9..7570541 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -494,15 +494,16 @@ class TebusController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $tebus = Tebus::on($cawangan['mysql'])
-                ->select('tebus.t_tebus', 'gad.t_gadai','Tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg')
-                ->join('Gadai as gad','gad.norujukan','=','Tebus.norujukan')
-                ->join('Customer as cust', function($join)
+                ->select('tebus.t_tebus', 'gad.t_gadai','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg')
+                ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
+                ->join('online_arrahn.customer as cust', function($join)
                 {
                     $join->on('gad.nokp', '=', 'cust.kpbaru');
                     $join->orOn('gad.nokp', '=', 'cust.kplama');
                 })
-                ->where('Tebus.t_tebus','=',$tarikh)
-                ->orderBy('Tebus.teller')
+                ->where('tebus.t_tebus','=',$tarikh)
+                ->orderBy('tebus.teller')
+                ->orderBy('tebus.sirit')
                 ->get();
         
         return response()->json($tebus);
@@ -1036,6 +1037,34 @@ class TebusController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
 
+
+        if($request->tarikh < '2021-06-09')
+        {
+            $keuntungan = 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)
+                ->whereNotNull('db2.hargajualan')
+                ->sum('bayaran_keuntungan');
+
+
+            $keuntunganreducing = 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)
+                ->whereNotNull('db2.hargajualan')
+                ->sum('keuntungan_rebet');
+
+
+            // dd($keuntungan,$keuntunganreducing);
+
+            $total = ($keuntungan + $keuntunganreducing);
+
+
+        }else{
+
         $keuntungan = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
@@ -1083,7 +1112,9 @@ class TebusController extends Controller
                     ->whereNotNull('db2.hargajualan')
                     ->sum('bayaran_keuntungan');
 
-	$total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
+        $total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
+
+        }
 
         return response($total);
     }
diff --git a/config/database.php b/config/database.php
index da7a044..afbd7f8 100644
--- a/config/database.php
+++ b/config/database.php
@@ -16,6 +16,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
          ],
         'mysql2' => [
             'driver'    => 'mysql',
@@ -28,6 +29,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql3' => [
             'driver'    => 'mysql',
@@ -40,6 +42,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql4' => [
             'driver'    => 'mysql',
@@ -52,6 +55,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql5' => [
             'driver'    => 'mysql',
@@ -64,6 +68,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
 
@@ -78,6 +83,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
 
@@ -92,6 +98,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql8' => [
             'driver'    => 'mysql',
@@ -104,6 +111,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
         'mysql9' => [
@@ -117,6 +125,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql10' => [
             'driver'    => 'mysql',
@@ -129,6 +138,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql11' => [
             'driver'    => 'mysql',
@@ -141,6 +151,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
         'mysql12' => [
@@ -154,6 +165,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql13' => [
             'driver'    => 'mysql',
@@ -166,6 +178,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql14' => [
             'driver'    => 'mysql',
@@ -178,6 +191,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
         'mysql15' => [
@@ -191,6 +205,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql16' => [
             'driver'    => 'mysql',
@@ -203,6 +218,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
         'mysql17' => [
@@ -216,6 +232,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql18' => [
             'driver'    => 'mysql',
@@ -228,6 +245,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql19' => [
             'driver'    => 'mysql',
@@ -240,6 +258,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql20' => [
             'driver'    => 'mysql',
@@ -252,6 +271,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql21' => [
             'driver'    => 'mysql',
@@ -264,6 +284,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
         'mysql22' => [
@@ -277,6 +298,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql23' => [
             'driver'    => 'mysql',
@@ -289,6 +311,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
         'mysql24' => [
@@ -302,6 +325,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
         'mysql25' => [
@@ -315,6 +339,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql26' => [
             'driver'    => 'mysql',
@@ -327,6 +352,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql27' => [
             'driver'    => 'mysql',
@@ -339,6 +365,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
         'mysql28' => [
@@ -352,6 +379,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql29' => [
             'driver'    => 'mysql',
@@ -364,6 +392,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql30' => [
             'driver'    => 'mysql',
@@ -376,6 +405,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql31' => [
             'driver'    => 'mysql',
@@ -388,6 +418,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql32' => [
             'driver'    => 'mysql',
@@ -400,6 +431,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql33' => [
             'driver'    => 'mysql',
@@ -412,6 +444,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
     ],
 ];

From 9572d050c7256abc070ead6f44259c8317de891b Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Mon, 5 Jul 2021 09:37:47 +0800
Subject: [PATCH 04/10] fix imbang duga

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

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 083c67a..2e17006 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2340,13 +2340,13 @@ class GadaiController extends Controller
                 $tarikhtawarruq = '2021-06-23';
             break;
             case '011234':
-                $tarikhtawarruq = '2021-06-22';
+                $tarikhtawarruq = '2021-06-28';
             break;
             case '020303':
-                $tarikhtawarruq = '2021-06-23';
+                $tarikhtawarruq = '2021-06-29';
             break;
             case '010618':
-                $tarikhtawarruq = '2021-06-23';
+                $tarikhtawarruq = '2021-06-29';
             break;
           } 
 

From b5b68d9517744760cb1ea9a3918cc807e0dd3848 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Mon, 5 Jul 2021 16:27:41 +0800
Subject: [PATCH 05/10] fix laporan

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

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 2e17006..ac8f36a 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -934,6 +934,33 @@ class GadaiController extends Controller
         return response()->json($gadai);
     }
 
+    public function getAnsuranSummary($kodcaw,Request $request){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $dateans = new Carbon($request->tarikh);
+
+        $ansurans = Transaction::on('mysql7')
+                ->leftJoin('transaksi_keuntungan as trans', function($join)
+                {
+                    $join->on('transaction.norujukan', '=', 'trans.norujukan');
+                    $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
+                })
+                ->where('transaction.kodcaw','=',$kodcaw)
+                ->where('transaction.trans_type','=','A')
+                ->whereDate('transaction.created_at','=',$dateans)
+                ->sum('trans.bayaran_keuntungan');
+
+        $transaksi = TransaksiKeuntungan::on('mysql7')
+                ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'=', $dateans]])
+                ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'=', $dateans]])
+                ->sum('bayaran_pembiayaan');
+
+        $arrayansuran = ['totalpendahuluan' => $transaksi, 'totalkeuntungan' => $ansurans];
+        
+        return response()->json($arrayansuran,200);
+    }
+
     public function updateHistoryGadai($kodcaw,$norujukan,Request $request){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
diff --git a/routes/web.php b/routes/web.php
index 5fb6807..9fe1695 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -198,7 +198,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     
 
     //ANSURAN UPAH API
-    $router->get('ansuran/laporan/{kodcaw}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong
+    $router->get('ansuran/laporan/{kodcaw}',['uses'=>'GadaiController@getLaporanAnsuran']); 
+    $router->get('ansuransummary/{kodcaw}',['uses'=>'GadaiController@getAnsuranSummary']); 
     $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']);
     $router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']);
     $router->get('AnsuranByRangeTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansurRangeDate']);

From c822c3abd3689c3396c4ca2ee477ecbf9e098554 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Tue, 6 Jul 2021 16:49:35 +0800
Subject: [PATCH 06/10] pembetulan laporan

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

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index ac8f36a..8ccf0f9 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -920,18 +920,25 @@ class GadaiController extends Controller
 
         $dateans = new Carbon($request->tarikh);
 
-        $gadai = Transaction::on('mysql7')
+        $ansuran = Transaction::on('mysql7')
                 ->leftJoin('transaksi_keuntungan as trans', function($join)
                 {
                     $join->on('transaction.norujukan', '=', 'trans.norujukan');
                     $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
                 })
+                ->leftJoin('customer as cust', function($join)
+                {
+                    $join->on('transaction.nokp', '=', 'cust.kpbaru');
+                    $join->orOn('transaction.nokp', '=', 'cust.kplama');
+                })
+                ->leftJoin($cawangan['db_name'].'.gadai as db2','transaction.norujukan','=','db2.norujukan')
                 ->where('transaction.kodcaw','=',$kodcaw)
                 ->where('transaction.trans_type','=','A')
                 ->whereDate('transaction.created_at','=',$dateans)
+                ->orderBy('transaction.teller')
                 ->get();
         
-        return response()->json($gadai);
+        return response()->json($ansuran);
     }
 
     public function getAnsuranSummary($kodcaw,Request $request){
@@ -947,16 +954,12 @@ class GadaiController extends Controller
                 })
                 ->where('transaction.kodcaw','=',$kodcaw)
                 ->where('transaction.trans_type','=','A')
-                ->whereDate('transaction.created_at','=',$dateans)
-                ->sum('trans.bayaran_keuntungan');
+                ->whereDate('transaction.created_at','=',$dateans);
 
-        $transaksi = TransaksiKeuntungan::on('mysql7')
-                ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-                ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'=', $dateans]])
-                ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'=', $dateans]])
-                ->sum('bayaran_pembiayaan');
+        $keuntungan = $ansurans->sum('trans.bayaran_keuntungan');
+        $pendahuluan = $ansurans->sum('trans.bayaran_pembiayaan');
 
-        $arrayansuran = ['totalpendahuluan' => $transaksi, 'totalkeuntungan' => $ansurans];
+        $arrayansuran = ['totalpendahuluan' => $pendahuluan, 'totalkeuntungan' => $keuntungan];
         
         return response()->json($arrayansuran,200);
     }
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 7570541..a1fca9c 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -494,13 +494,14 @@ class TebusController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $tebus = Tebus::on($cawangan['mysql'])
-                ->select('tebus.t_tebus', 'gad.t_gadai','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg')
+                ->select('tebus.t_tebus', 'gad.t_gadai','trans.tarikh_bayaran','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg')
                 ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
                 ->join('online_arrahn.customer as cust', function($join)
                 {
                     $join->on('gad.nokp', '=', 'cust.kpbaru');
                     $join->orOn('gad.nokp', '=', 'cust.kplama');
                 })
+                ->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan')
                 ->where('tebus.t_tebus','=',$tarikh)
                 ->orderBy('tebus.teller')
                 ->orderBy('tebus.sirit')

From 750232c9151e6e966915578c56e20f14bb41ce1e Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Wed, 7 Jul 2021 09:14:02 +0800
Subject: [PATCH 07/10] hapus panjar

---
 app/DenoPanjar.php                        | 28 +++++++++++++
 app/Http/Controllers/PanjarController.php | 50 +++++++++++++++++++++++
 routes/web.php                            |  6 +++
 3 files changed, 84 insertions(+)
 create mode 100644 app/DenoPanjar.php

diff --git a/app/DenoPanjar.php b/app/DenoPanjar.php
new file mode 100644
index 0000000..6b18bb0
--- /dev/null
+++ b/app/DenoPanjar.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class DenoPanjar extends Model
+{
+    protected $table = 'denopanjar';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = ['no','kodlaluan','serahan','tarikh','masa','update','kodcaw','bd1','bd5','bd10','bd20','bd50','bd100','txtring1','txtring5','txtring10','txtring20',
+	                        'txtring50','txtring100','txtring1000','txtsen1','txtsen5','txtsen10','txtsen20','txtsen50','jenis','recno'];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+
+    public $timestamps = false;
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php
index acbd576..659f911 100644
--- a/app/Http/Controllers/PanjarController.php
+++ b/app/Http/Controllers/PanjarController.php
@@ -3,6 +3,8 @@
 namespace App\Http\Controllers;
 use App\Panjar;
 use App\Cawangan;
+use App\DenoPanjar;
+
 
 use Carbon\Carbon;
 
@@ -111,6 +113,15 @@ class PanjarController extends Controller
       return response()->json($panjar);
    }
 
+   public function delete(REQUEST $request,$kodcaw)
+   {
+         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+ 
+         Panjar::on($cawangan['mysql'])->where('recno','=',$request->recno)->delete();
+ 
+         return response('Batal Berjaya', 200);
+   }
+
    public function calculationpanjar(Request $request,$kodcaw)
    {
 
@@ -197,5 +208,44 @@ class PanjarController extends Controller
 
    }
 
+   public function createDenoPanjar($kodcaw,Request $request)
+   {
+   
+
+       $current = Carbon::now();
+       $current = new Carbon();
+
+
+       $denopanjar=DenoPanjar::on('mysql7')->create([ 
+             
+            'tarikh' => $current->toDateString(),
+            'masa' => $current->toTimeString(),
+            'kodcaw' => $kodcaw,
+            'kodlaluan' => $request->kodlaluan,
+            'serahan' => $request->serahan,
+            'bd1' => $request->bd1,
+            'bd5' => $request->bd5,
+            'bd10' => $request->bd10,
+            'bd20' => $request->bd20,
+            'bd50' => $request->bd50,
+            'bd100' => $request->bd100,
+            'txtring1' => $request->txtring1,
+            'txtring5' => $request->txtring5,
+            'txtring10' => $request->txtring10,
+            'txtring20' => $request->txtring20,
+            'txtring50' => $request->txtring50,
+            'txtring100' => $request->txtring100,
+            'txtring1000' => $request->txtring1000,
+            'txtsen1' => $request->txtsen1,
+            'txtsen5' => $request->txtsen5,
+            'txtsen10' => $request->txtsen10,
+            'txtsen20' => $request->txtsen20,
+            'txtsen50' => $request->txtsen50,
+            'update' => '0'
+       ]);
+
+       return response()->json($denopanjar,200);
+   }
+
 
 }
diff --git a/routes/web.php b/routes/web.php
index 9fe1695..b323df1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -264,6 +264,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('SenaraiPanjar/{kodcaw}/{mula}/{akhir}',['uses'=>'PanjarController@listmulaakhir']);
     // $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'PanjarController@update']);
     $router->post('CreatePanjar/{kodcaw}',['uses'=>'PanjarController@create']);
+    $router->post('DeletePanjar/{kodcaw}',['uses'=>'PanjarController@delete']);
+
 
     //API KELULUSAN
     $router->get('SenaraiKelulusan/{kodcaw}',['uses'=>'KelulusanController@list']);
@@ -288,6 +290,10 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->put('requestTeller/update/{kodcaw}',['uses' => 'TunaiController@updateRequestTeller']);
     $router->put('requestTeller/batal/{kodcaw}',['uses' => 'TunaiController@batalRequestTeller']);
 
+    //API DENO PANJAR & DENO PEND-SERAHAN
+    $router->post('requestdenopanjar/{kodcaw}',['uses' => 'PanjarController@createDenoPanjar']);
+    $router->post('requestdenopanjar/batal/{kodcaw}',['uses' => 'PanjarController@batalDenoPanjar']);
+
     //API WAKIL
     $router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']);
     $router->get('getwakil/{kodcaw}/{icno}',['uses' => 'TebusController@getWakil']);

From 547f36d9a11dbe3e240a0dbf13ee7e9754856f30 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 7 Jul 2021 16:38:29 +0800
Subject: [PATCH 08/10] fix delete panjar

---
 app/DenoPanjar.php                         |  4 +--
 app/Http/Controllers/GadaiController.php   |  3 +-
 app/Http/Controllers/LaporanController.php | 18 +++++++++---
 app/Http/Controllers/PanjarController.php  | 33 ++++++++++++++++++++++
 app/Http/Controllers/VaultController.php   | 30 ++++++++++++++++++++
 routes/web.php                             |  3 ++
 6 files changed, 84 insertions(+), 7 deletions(-)

diff --git a/app/DenoPanjar.php b/app/DenoPanjar.php
index 6b18bb0..72ff736 100644
--- a/app/DenoPanjar.php
+++ b/app/DenoPanjar.php
@@ -13,8 +13,8 @@ class DenoPanjar extends Model
      *
      * @var array
      */
-    protected $fillable = ['no','kodlaluan','serahan','tarikh','masa','update','kodcaw','bd1','bd5','bd10','bd20','bd50','bd100','txtring1','txtring5','txtring10','txtring20',
-	                        'txtring50','txtring100','txtring1000','txtsen1','txtsen5','txtsen10','txtsen20','txtsen50','jenis','recno'];
+    protected $fillable = ['no','kodlaluan','serahan','tarikh','masa','update','jenis','recno','kodcaw','bd1','bd5','bd10','bd20','bd50','bd100','txtring1','txtring5','txtring10','txtring20',
+	                        'txtring50','txtring100','txtring1000','txtsen1','txtsen5','txtsen10','txtsen20','txtsen50'];
 
     /**
      * The attributes excluded from the model's JSON form.
diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 8ccf0f9..61b31fa 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -958,8 +958,9 @@ class GadaiController extends Controller
 
         $keuntungan = $ansurans->sum('trans.bayaran_keuntungan');
         $pendahuluan = $ansurans->sum('trans.bayaran_pembiayaan');
+        $bilangan = $ansurans->count();
 
-        $arrayansuran = ['totalpendahuluan' => $pendahuluan, 'totalkeuntungan' => $keuntungan];
+        $arrayansuran = ['totalpendahuluan' => $pendahuluan, 'totalkeuntungan' => $keuntungan, 'bilangan' => $bilangan];
         
         return response()->json($arrayansuran,200);
     }
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 66f7748..b54e58a 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -47,10 +47,12 @@ class LaporanController extends Controller
                              $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
                          })
                     ->whereDate('trans.created_at','=',$request->tarikh)
+                    ->where('trans.kodcaw','=',$request->kodcaw)
                     ->where('trans.trans_type','=','A')
-                    ->groupBy('trans.id')
+                    // ->groupBy('trans.id')
                     ->sum('bayaran_keuntungan');
 
+
         // $total_ansuran = number_format($total_ansuran,2);
         $total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus);
 
@@ -181,7 +183,10 @@ class LaporanController extends Controller
         }
 
         //g
-        $bayar_baki_lelong = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('jumlah');
+        $tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh);
+
+        $bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah');
+        $bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah');
 
         //h
         $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('pinjaman');
@@ -205,6 +210,7 @@ class LaporanController extends Controller
             'bilangan_ansuran'=>$bilangan_ansuran,
             'bilangan_customer_baru'=>$bilangan_customer_baru,
             'bayar_baki_lelong'=>$bayar_baki_lelong,
+            'bayar_rugi_lelong'=>$bayar_rugi_lelong,
             'gadai_70'=>$gadai_70,
             'gadai_75'=>$gadai_75,
             'gadai_80'=>$gadai_80,
@@ -265,7 +271,7 @@ class LaporanController extends Controller
                     ->whereDate('trans.created_at','<=',$request->akhir)
                     ->where('trans.trans_type','=','A')
                     ->where('trans.kodcaw','=',$request->kodcaw)
-                    ->groupBy('trans.id')
+                    // ->groupBy('trans.id')
                     ->sum('bayaran_keuntungan');
 
         // $total_ansuran = number_format($total_ansuran,2);
@@ -301,7 +307,10 @@ class LaporanController extends Controller
         }
 
         //g
-        $bayar_baki_lelong = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->sum('jumlah');
+        $tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]]);
+
+        $bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah');
+        $bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah');
 
         //h
         $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('pinjaman');
@@ -325,6 +334,7 @@ class LaporanController extends Controller
             'bilangan_ansuran'=>$bilangan_ansuran,
             'bilangan_customer_baru'=>$bilangan_customer_baru,
             'bayar_baki_lelong'=>$bayar_baki_lelong,
+            'bayar_rugi_lelong'=>$bayar_rugi_lelong,
             'gadai_70'=>$gadai_70,
             'gadai_75'=>$gadai_75,
             'gadai_80'=>$gadai_80,
diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php
index 659f911..7b0d128 100644
--- a/app/Http/Controllers/PanjarController.php
+++ b/app/Http/Controllers/PanjarController.php
@@ -241,11 +241,44 @@ class PanjarController extends Controller
             'txtsen10' => $request->txtsen10,
             'txtsen20' => $request->txtsen20,
             'txtsen50' => $request->txtsen50,
+            'jenis' =>$request->jenis,
+            'recno' =>$request->recno,
             'update' => '0'
        ]);
 
        return response()->json($denopanjar,200);
    }
 
+   public function getDenoPanjar($kodcaw,Request $request)
+   {
+   
+       $current = Carbon::now();
+       $current = new Carbon();
+
+
+       $denopanjar=DenoPanjar::on('mysql7')->where('kodcaw','=', $kodcaw)->where('recno','=', $request->recno)->get();
+
+       return response()->json($denopanjar,200);
+   }
+
+   public function updateDenoPanjar($kodcaw,Request $request)
+   {
+   
+       $current = Carbon::now();
+       $current = new Carbon();
+
+
+       $denopanjar=DenoPanjar::on('mysql7')
+                     ->where('recno','=', $request->recno)
+                     ->update(array(
+                        'pelulus' => $request->pelulus,
+                        'masalulus'=> $harini->toTimeString()
+                     ));
+
+       return response()->json($denopanjar,200);
+   }
+
+   
+
 
 }
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index 151e93e..f223515 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -88,6 +88,36 @@ class VaultController extends Controller
    return response()->json($updateVault, 200);
  }
 
+ public function updateVaultDeletePanjar($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','=',$current->toDateString())->orderby('tarikh','desc')->first();
+
+   $bakiawal = $vault['bakiawal'];
+   $keluar = $vault['keluar'];
+   $masuk = $vault['masuk'];
+   $bakiakhir = $vault['bakiakhir'];
+   $bakieod = $vault['bakieod'];
+   $pendahuluan = $vault['pendahuluan'];
+   $serahan = $vault['serahan'];
+   $totpanjaran = $vault['totpanjar'];
+
+   $totalpanjar = $request->totpanjar - $totpanjaran;
+
+   $bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $serahan - $totalpanjar;
+
+   $updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
+      'totpanjar' => $totalpanjar,
+      'bakiakhir'=>$bakiakhir,
+      'bakieod'=>$bakiakhir
+   ));
+
+   return response()->json($updateVault, 200);
+ }
+
  public function updateVaultPendahuluanSerahan($kodcaw, Request $request)
  {
    $current = Carbon::now();
diff --git a/routes/web.php b/routes/web.php
index b323df1..d194f6b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -233,6 +233,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('daftarVault/{kodcaw}',['uses'=>'VaultController@create']);
     $router->put('UpdateVault/{kodcaw}', ['uses'=>'VaultController@updateVault']);
     $router->put('UpdateVault/Panjar/{kodcaw}', ['uses'=>'VaultController@updateVaultPanjar']);
+    $router->put('UpdateVault/DeletePanjar/{kodcaw}', ['uses'=>'VaultController@updateVaultDeletePanjar']);
     $router->put('UpdateVaultPendahuluanSerahan/{kodcaw}', ['uses'=>'VaultController@updateVaultPendahuluanSerahan']);
     $router->get('TunaiController/{kodcaw}',['uses'=>'TunaiController@listTunai']);
     $router->post('tunai/daftarTunai/{kodcaw}',['uses'=> 'TunaiController@DaftarTunai']);
@@ -292,6 +293,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //API DENO PANJAR & DENO PEND-SERAHAN
     $router->post('requestdenopanjar/{kodcaw}',['uses' => 'PanjarController@createDenoPanjar']);
+    $router->post('requestdenopanjar/get/{kodcaw}',['uses' => 'PanjarController@getDenoPanjar']);
+    $router->post('requestdenopanjar/update/{kodcaw}',['uses' => 'PanjarController@updateDenoPanjar']);
     $router->post('requestdenopanjar/batal/{kodcaw}',['uses' => 'PanjarController@batalDenoPanjar']);
 
     //API WAKIL

From 32563f1d7670898bcd88fb69ddce9712d9fe3366 Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Thu, 8 Jul 2021 10:42:34 +0800
Subject: [PATCH 09/10] fix panjar

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

diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php
index 7b0d128..6e1de5f 100644
--- a/app/Http/Controllers/PanjarController.php
+++ b/app/Http/Controllers/PanjarController.php
@@ -256,7 +256,7 @@ class PanjarController extends Controller
        $current = new Carbon();
 
 
-       $denopanjar=DenoPanjar::on('mysql7')->where('kodcaw','=', $kodcaw)->where('recno','=', $request->recno)->get();
+       $denopanjar = DenoPanjar::on('mysql7')->where('kodcaw','=', $kodcaw)->where('recno','=', $request->recno)->get();
 
        return response()->json($denopanjar,200);
    }
diff --git a/routes/web.php b/routes/web.php
index d194f6b..a0cae3a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -293,10 +293,12 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //API DENO PANJAR & DENO PEND-SERAHAN
     $router->post('requestdenopanjar/{kodcaw}',['uses' => 'PanjarController@createDenoPanjar']);
-    $router->post('requestdenopanjar/get/{kodcaw}',['uses' => 'PanjarController@getDenoPanjar']);
+    $router->get('getdenopanjar/{kodcaw}',['uses' => 'PanjarController@getDenoPanjar']);
     $router->post('requestdenopanjar/update/{kodcaw}',['uses' => 'PanjarController@updateDenoPanjar']);
     $router->post('requestdenopanjar/batal/{kodcaw}',['uses' => 'PanjarController@batalDenoPanjar']);
 
+
+
     //API WAKIL
     $router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']);
     $router->get('getwakil/{kodcaw}/{icno}',['uses' => 'TebusController@getWakil']);

From 05622858d5ecae50c8e66d6719de1cb1a9799e1a Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Thu, 8 Jul 2021 16:54:05 +0800
Subject: [PATCH 10/10] fix laporan

---
 app/Http/Controllers/LaporanController.php | 18 ++++++++++++++++++
 app/Http/Controllers/VaultController.php   |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 053a8c2..53b42ff 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -193,14 +193,20 @@ class LaporanController extends Controller
         $gadai_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',70],['percentpinj','<=',75]])->sum('pinjaman');
         $gadai_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',75],['percentpinj','<=',80]])->sum('pinjaman');
 
+        $total_gadaian = floatval($gadai_70) + floatval($gadai_75) + floatval($gadai_80);
+
         $nilaimarhun_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('nilaimarhun');
         $nilaimarhun_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',70],['percentpinj','<=',75]])->sum('nilaimarhun');
         $nilaimarhun_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',75],['percentpinj','<=',80]])->sum('nilaimarhun');
 
+        $total_nm = floatval($nilaimarhun_70) + floatval($nilaimarhun_75) + floatval($nilaimarhun_80);
+
         $bilangan_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->count();
         $bilangan_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',70],['percentpinj','<=',75]])->count();
         $bilangan_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',75],['percentpinj','<=',80]])->count();
 
+        $total_bilangan = floatval($bilangan_70) + floatval($bilangan_75) + floatval($bilangan_80);
+
         array_push($laporan_harian,[
             'total_gadai'=>$total_gadai,
             'total_tebus'=>$total_tebus,
@@ -214,12 +220,15 @@ class LaporanController extends Controller
             'gadai_70'=>$gadai_70,
             'gadai_75'=>$gadai_75,
             'gadai_80'=>$gadai_80,
+            'total_gadaian'=>$total_gadaian,
             'nilaimarhun_70'=>$nilaimarhun_70,
             'nilaimarhun_75'=>$nilaimarhun_75,
             'nilaimarhun_80'=>$nilaimarhun_80,
+            'total_nm'=>$total_nm,
             'bilangan_70'=>$bilangan_70,
             'bilangan_75'=>$bilangan_75,
             'bilangan_80'=>$bilangan_80,
+            'total_bilangan'=>$total_bilangan,
             'panjar_harian'=>$panjar_harian,
             'panjar_bulanan'=>$panjar_bulanan,
             'panjar_tahunan'=>$panjar_tahunan,
@@ -317,14 +326,20 @@ class LaporanController extends Controller
         $gadai_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',70],['percentpinj','<=',75]])->sum('pinjaman');
         $gadai_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',75],['percentpinj','<=',80]])->sum('pinjaman');
 
+        $total_gadaian = floatval($gadai_70) + floatval($gadai_75) + floatval($gadai_80);
+
         $nilaimarhun_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('nilaimarhun');
         $nilaimarhun_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',70],['percentpinj','<=',75]])->sum('nilaimarhun');
         $nilaimarhun_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',75],['percentpinj','<=',80]])->sum('nilaimarhun');
 
+        $total_nm = floatval($nilaimarhun_70) + floatval($nilaimarhun_75) + floatval($nilaimarhun_80);
+
         $bilangan_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->count();
         $bilangan_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',70],['percentpinj','<=',75]])->count();
         $bilangan_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',75],['percentpinj','<=',80]])->count();
 
+        $total_bilangan = floatval($bilangan_70) + floatval($bilangan_75) + floatval($bilangan_80);
+
         array_push($laporan_terkumpul,[
             'total_gadai'=>$total_gadai,
             'total_tebus'=>$total_tebus,
@@ -338,12 +353,15 @@ class LaporanController extends Controller
             'gadai_70'=>$gadai_70,
             'gadai_75'=>$gadai_75,
             'gadai_80'=>$gadai_80,
+            'total_gadaian'=>$total_gadaian,
             'nilaimarhun_70'=>$nilaimarhun_70,
             'nilaimarhun_75'=>$nilaimarhun_75,
             'nilaimarhun_80'=>$nilaimarhun_80,
+            'total_nm'=>$total_nm,
             'bilangan_70'=>$bilangan_70,
             'bilangan_75'=>$bilangan_75,
             'bilangan_80'=>$bilangan_80,
+            'total_bilangan'=>$total_bilangan,
             'bilangan_lelong'=>$bilangan_lelong,
             'cas_lelong'=>$cas_lelong,
             'jumlah_lelong'=>$jumlah_lelong,
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index f223515..7686890 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -105,7 +105,7 @@ class VaultController extends Controller
    $serahan = $vault['serahan'];
    $totpanjaran = $vault['totpanjar'];
 
-   $totalpanjar = $request->totpanjar - $totpanjaran;
+   $totalpanjar = $totpanjaran - $request->totpanjar;
 
    $bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $serahan - $totalpanjar;