diff --git a/app/GlCode.php b/app/GlCode.php
new file mode 100644
index 0000000..c069f6e
--- /dev/null
+++ b/app/GlCode.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class GlCode extends Model
+{
+    protected $table = 'glcode';
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = ['kodcaw','glcode','descpt','acttype','jenisakaun','bayaran','tarikh','amaun' ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}
+
diff --git a/app/Glejer.php b/app/Glejer.php
new file mode 100644
index 0000000..eda1731
--- /dev/null
+++ b/app/Glejer.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Glejer extends Model
+{
+
+    protected $table = 'glejer';
+    public $timestamps = false;
+
+
+    
+   // protected $fillable = ['tarikh','kodcaw','kodlaluan','bakiawal','masuk','yuran','keluar','baki','tambah','kurang' ];
+
+
+    protected $fillable = [
+    'kodcaw',
+    'tarikh',
+    'glcode',
+    'descpt',
+    'debit',
+    'kredit',
+    'hariini',
+    'kelmarin',
+    'jumlah',
+    'bulanini',
+    'tahunini',
+    'acttype',
+    'ar'];
+
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/GLCodeController.php b/app/Http/Controllers/GLCodeController.php
new file mode 100644
index 0000000..7bc20f0
--- /dev/null
+++ b/app/Http/Controllers/GLCodeController.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\HargaEmas;
+use App\GlCode;
+use App\Cawangan;
+use Illuminate\Http\Request;
+
+use Carbon\Carbon;
+
+class GLCodeController extends Controller
+{
+
+
+
+    public function GetGlcode($kodcaw,Request $request) //create on 2021-02-12
+    {
+
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+
+
+        $gc=GlCode::on($cawangan['mysql'])->where('glcode','=',$request->glcode)->get();
+        return response()->json($gc);
+
+
+    }
+
+    public function GetGlcodeByActType($kodcaw,$acttype)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        
+        $gc=GlCode::on($cawangan['mysql'])->where('acttype','=',$acttype)->get();
+        
+        return response()->json($gc);
+    }
+
+
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index fb56d56..6ba267b 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -190,8 +190,8 @@ class GadaiController extends Controller
 
     public function daftarGadaiMarhun($norujukan,Request $request)
     {
-        $current = Carbon::now();
-        $current = new Carbon();
+        $router->get('CalculationPendahuluanSerahan/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahan']); //panjar
+
 
         $t_matang = Carbon::now();
         $t_matang = new Carbon();
@@ -1916,4 +1916,40 @@ class GadaiController extends Controller
 
         return response()->json($rekod_gadaian);
     }
+
+    public function CalculationPinjamanDiberi($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
+            ->where('t_gadai','<=',$request->tarikh)
+            ->where('sttebus','=','')
+            ->where('tagpalsu','=',1)
+            ->sum('pinjaman');
+
+        $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
+            ->where('t_gadai','<=',$request->tarikh)
+            ->where('sttebus','=','')
+            ->where('tagpalsu','=',0)
+            ->sum('pinjaman');
+
+
+        $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
+
+        return response()->json($array_rekodemas);
+    }
+
+    public function CalculationKeuntungan($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $keuntungan = Gadai::on($cawangan['mysql'])
+        ->where('t_gadai','<=',$request->tarikh)
+        ->where('sttebus','=','')
+        ->whereNotNull('upah12')
+        ->sum('upah12');
+
+
+        return response()->json($keuntungan,200);
+    }
 }
diff --git a/app/Http/Controllers/GlDetailsController.php b/app/Http/Controllers/GlDetailsController.php
new file mode 100644
index 0000000..4708e7a
--- /dev/null
+++ b/app/Http/Controllers/GlDetailsController.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\HargaEmas;
+use App\GlCode;
+use App\Cawangan;
+use App\GlDetail;
+
+use Illuminate\Http\Request;
+
+use Carbon\Carbon;
+use DB;
+class GlDetailsController extends Controller
+{
+
+
+
+public function sum_gldetails($kodcaw)
+{
+
+    $current = Carbon::now();
+    $current = new Carbon();
+
+    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+    $db=$cawangan['mysql'];
+
+    $gadai_aging=DB::connection($db)->select("SELECT sum(amaun)as amaun from gldetail where tarikh <= '".$current->toDateString()."' and  tarikh >'2013-12-31' and ktacct = '7000/102'");
+    return response()->json($gadai_aging);
+
+
+}
+
+
+public function sum_advance_2014($kodcaw)
+{
+
+    $current = Carbon::now();
+    $current = new Carbon();
+
+    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+    $db=$cawangan['mysql'];
+
+     $gadai_2014=DB::connection($db)->select("SELECT sum(amaun)as amaun from gldetail where tarikh <= '".$current->toDateString()."' and  tarikh >'2014-12-31' and ktacct = '7000/102'");
+    return response()->json($gadai_2014);
+
+}
+
+public function sumJMC_2015($kodcaw)
+{
+
+    $current = Carbon::now();
+    $current = new Carbon();
+
+    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+    $db=$cawangan['mysql'];
+
+     $gadai_2015=DB::connection($db)->select("SELECT sum(amaun)as amaun from gldetail where tarikh <= '".$current->toDateString()."' and  tarikh >'2015-01-01' and ktacct = '7000/026'");
+    return response()->json($gadai_2015);
+
+}
+
+
+public function sumJMC_2014($kodcaw)
+{
+
+    $current = Carbon::now();
+    $current = new Carbon();
+
+    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+    $db=$cawangan['mysql'];
+
+     $gadai_2014=DB::connection($db)->select("SELECT sum(amaun)as amaun from gldetail where tarikh <= '".$current->toDateString()."' and  tarikh >'2014-01-01' and ktacct = '7000/026'");
+    return response()->json($gadai_2014);
+
+}
+
+
+public function JumlahSerahanHQ($kodcaw)
+{
+
+    $current = Carbon::now();
+    $current = new Carbon();
+
+    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+    $db=$cawangan['mysql'];
+    $jumlahSerahHQ=DB::connection($db)->select("SELECT sum(amaun)as amaun from gldetail where tarikh <= '".$current->toDateString()."' and  tarikh >'2013-12-31' and ktacct = '1000/102'");
+    return response()->json($jumlahSerahHQ);
+
+}
+
+ public function data_imbangduga($kodcaw, $tarikh)
+ {
+
+    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+    $db=$cawangan['mysql'];
+     $imbangduga=DB::connection($db)->select("select glcode.glcode, glcode.descpt, glcode.acttype, glcode.tarikh, glcode.amaun, glcode.kodcaw, glcode.jenisakaun, jenisakaun.keterangan,jenisakaun.kod from glcode, jenisakaun where glcode.tarikh='".$tarikh."' and glcode.amaun<>0 and jenisakaun.kod=glcode.acttype order by jenisakaun.kod,  glcode.glcode ");
+    return response()->json($imbangduga);
+
+ }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/GlejerController.php b/app/Http/Controllers/GlejerController.php
new file mode 100644
index 0000000..9879e2d
--- /dev/null
+++ b/app/Http/Controllers/GlejerController.php
@@ -0,0 +1,231 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\HargaEmas;
+use App\GlCode;
+use App\Cawangan;
+use App\Glejer;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+use Carbon\Carbon;
+class GlejerController extends Controller
+{
+
+
+
+
+    public function getGlejer($kodcaw, Request $request)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+       
+       $glejer=Glejer::on($cawangan['mysql'])->where( [['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['glcode','=',$request->glcode]])->get();
+       return response()->json($glejer);
+
+    }
+
+
+
+
+
+
+
+
+    public  function Getglejer_Data($tarikh1,$tarikh2,$kodcaw)
+    {
+
+    
+
+
+     $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+      $glejer=Glejer::on($cawangan['mysql'])->whereBetween('tarikh',[$tarikh1,$tarikh2])->orderBy('glcode','ASC')->get();
+      return response()->json($glejer);
+
+
+
+     }
+
+
+
+    public function SumDebit_Glejer($tarikh1,$tarikh2,$kodcaw)
+    {
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $sumDebit=Glejer::on($cawangan['mysql'])->selectRaw( 'SUM(Debit) as totalDebit')->whereBetween('tarikh',[$tarikh1,$tarikh2])->get();
+        return  response()->json($sumDebit);
+
+
+    }
+
+
+    public function SumKredit_Glejer($tarikh1,$tarikh2,$kodcaw)
+    {
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $sumDebit=Glejer::on($cawangan['mysql'])->selectRaw( 'SUM(Kredit) as totalKredit')->whereBetween('tarikh',[$tarikh1,$tarikh2])->get();
+        return  response()->json($sumDebit);
+
+
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        public function getSemalam_Glejer($kodcaw, Request $request)
+        {
+
+
+  
+            $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+            $glejer=Glejer::on($cawangan['mysql'])->where('glcode','=',$request->glcode)->orderBy('tarikh','DESC')->limit(1)->get();
+
+          return response()->json($glejer);
+
+
+            }
+
+
+
+
+
+
+
+
+
+
+
+            public function Create_Glejer($kodcaw,Request $request)
+            {
+
+
+
+
+               $current = Carbon::now();
+                $current = new Carbon();
+        
+                
+        
+                $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+                $glejer=Glejer::on($cawangan['mysql'])->create([ 
+                      
+                  // 'tarikh' => $current->toDateString(),
+                   'kodcaw'=> $request->kodcaw,
+                   'tarikh'=>$current->toDateString(),
+                   'glcode'=>$request->glcode,
+                   'descpt'=>$request->descpt,
+                   'debit'=>$request->debit,
+                   'kredit'=>$request->kredit,
+                   'hariini'=>$request->hariini,
+                   'kelmarin'=>$request->kelmarin,
+                   'jumlah'=>$request->jumlah,
+                   'bulanini'=>$request->bulanini,
+                   'tahunini'=>$request->tahunini,
+                   'acttype'=>$request->acttype
+        
+              ]);
+        
+              return response()->json($glejer,201);
+
+              
+            }
+
+
+    public function carianBulananTahun_glejer($kodcaw,Request $request)
+    {
+
+        $current = Carbon::now();
+        $current = new Carbon();
+        $yr = Carbon::now()->format('Y');
+        $month= Carbon::now()->format('m');
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+       $glejerMy=Glejer::on ($cawangan['mysql'])->whereYear('tarikh','=',$yr)->whereMonth('tarikh', '=',$month)->where('glcode', '=',$request->glcode)->
+       orderBy('tarikh','ASC')->get();
+       return response()->json($glejerMy);
+
+    }
+
+
+
+
+
+
+
+
+
+    /*public function updateRequestTeller($kodcaw,Request $request)
+    {
+        $requestteller = RequestTeller::on('mysql7')->
+        where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$request->kodlaluan],['update','=',0]])
+        ->update(array(
+
+            'update' => 1
+      
+         ) );
+    }
+*/
+
+
+
+
+
+
+
+
+    public function Kemaskini_Glejer($kodcaw, Request $request)
+    {
+
+        $current = Carbon::now();
+        $current = new Carbon();
+   
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $updateGLejer=Glejer::on($cawangan['mysql'])->where([['recno','=',$request->recno],['kodcaw','=', $kodcaw]])->
+        update(array(
+   
+            'debit'=>$request->debit,
+            'kredit'=>$request->kredit,
+            'hariini'=>$request->hariini,
+            'kelmarin'=>$request->kelmarin
+        
+         ) );
+
+         return response()->json($updateGLejer,200);
+
+         
+    }
+
+    public function carianTahun_glejer($kodcaw,Request $request)
+    {
+
+
+
+        $current = Carbon::now();
+        $current = new Carbon();
+        $yr = Carbon::now()->format('Y');
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+         $db=$cawangan['mysql'];
+
+        $gelejerYear=Glejer::on($cawangan['mysql'])->whereYear('tarikh','=',$yr)->where('glcode', '=',$request->glcode)->
+        orderBy('tarikh','ASC')->get();
+        return response()->json($gelejerYear);
+    }
+
+
+
+
+}
diff --git a/app/Http/Controllers/ImbangDugaLamaController.php b/app/Http/Controllers/ImbangDugaLamaController.php
new file mode 100644
index 0000000..3d96246
--- /dev/null
+++ b/app/Http/Controllers/ImbangDugaLamaController.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Controllers;
+use App\imbangdugalama;
+use App\Cawangan;
+
+
+use Illuminate\Http\Request;
+
+
+class ImbangDugaLamaController extends Controller
+{
+
+
+
+
+public function GetImbangDuga_Lama($kodcaw)
+{
+
+    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+    $getImbangDugaLama=imbangdugalama::on($cawangan['mysql'])->get();
+
+    return response()->json($getImbangDugaLama);
+
+}
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index e0fb498..c497152 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -6,6 +6,7 @@ use App\Lelong;
 use App\Cawangan;
 use App\Gadai;
 use App\TuntutBaki;
+use App\WTD;
 use Illuminate\Http\Request;
 
     use Carbon\Carbon;
@@ -130,6 +131,29 @@ class LelongController extends Controller
 
     }
 
+    public function BakiLelongCalculation($kodcaw,Request $request)
+    {
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $bakilelong = Gadai::on($cawangan['mysql'])
+        ->where([['gadai.sttebus','=', 'L'],['lelong.t_jual','<=',$request->tarikh],['lelong.baki','>=', 0]])
+        ->whereNull('lelong.trkhtuntut')
+        ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
+                ->sum('baki');
+
+                
+        $rugilelong = Gadai::on($cawangan['mysql'])
+        ->where([['gadai.sttebus','=', 'L'],['lelong.t_jual','<=',$request->tarikh],['lelong.baki','<=', 0]])
+        ->whereNull('lelong.trkhtuntut')
+        ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
+                ->sum('baki');
+
+        $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugilelong];
+
+        return response()->json($arraylelong,200);
+    }
+
     public function BilAkanDilelong($noic)
     {
         $cawangan_all = Cawangan::on('mysql7')->get();
@@ -275,7 +299,32 @@ class LelongController extends Controller
         ->first();
 
         return response()->json($lelong,200);
+    }
 
+    public function calculationwtd($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+
+       $wtd = WTD::on($cawangan['mysql'])
+            ->where('tarikh','<=', $request->tarikh)
+            ->sum('wtd');
+
+        return response()->json($wtd,200);
+    }
+
+    public function cajlelongcalculation($kodcaw)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $cajlelong = Lelong::on($cawangan['mysql'])
+        ->whereYear('t_jual','=',$current->year)
+        ->sum('cajlelong');
+
+        return response()->json($cajlelong,200);
     }
 
 
diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php
index d078b2d..2cdcc8d 100644
--- a/app/Http/Controllers/PanjarController.php
+++ b/app/Http/Controllers/PanjarController.php
@@ -93,11 +93,45 @@ class PanjarController extends Controller
                         'nobaucer' => $request->nobaucer,
                         'nobil' => $request->nobil,
                         'tuntutoleh' => $request->tuntutoleh
-
-                    ]);
+      ]);
 
       return response()->json($panjar);
    }
 
+   public function calculationpanjar(Request $request,$kodcaw)
+   {
+
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+      $current = Carbon::now();
+      $current = new Carbon();
+
+      $baikidanselenggara = Panjar::on($cawangan['mysql'])
+      // ->where('tarikh','>=', $request->mula)
+      // ->where('tarikh','<=', $request->akhir)
+      ->where('tag', '=', 2)
+      ->whereYear('tarikh','=',$current->year)
+      ->sum('bayaran');
+
+      $perubatan = Panjar::on($cawangan['mysql'])
+      // ->where('tarikh','>=', $request->mula)
+      // ->where('tarikh','<=', $request->akhir)
+      ->where('tag', '=', 1)
+      ->whereYear('tarikh','=',$current->year)
+      ->sum('bayaran'); 
+
+      $keraian = Panjar::on($cawangan['mysql'])
+      // ->where('tarikh','>=', $request->mula)
+      // ->where('tarikh','<=', $request->akhir)
+      ->where('tag', '=', 3)
+      ->whereYear('tarikh','=',$current->year)
+      ->sum('bayaran');
+
+      $arraycalculation = ['bds' => $baikidanselenggara, 'perubatan' => $perubatan, 'keraian' => $keraian];
+
+      return response()->json($arraycalculation);
+
+   }
+
 
 }
diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php
new file mode 100644
index 0000000..5733375
--- /dev/null
+++ b/app/Http/Controllers/ProductController.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Controllers;
+use App\Vault;
+use App\Cawangan;
+use App\Tunai;
+use App\AddTunai;
+use App\GlDetail;
+use App\Product;
+
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+
+class ProductController extends Controller
+{
+
+
+  public function getProduct($kodcaw)
+  {
+    $current = Carbon::now();
+    $current = new Carbon();    
+
+    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+
+    $product=Product::on($cawangan['mysql'])->get();
+
+    return response()->json($product);
+
+  }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 273ee4a..1828030 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -532,4 +532,17 @@ class TebusController extends Controller
 
         return response()->json($create_advansur ,201);
     }
+
+    public function calculationKeuntunganSebenar($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $keuntungan = Tebus::on($cawangan['mysql'])
+        ->where('t_tebus','<=',$request->tarikh)
+        // ->where('sttebus','=','')
+        ->whereNotNull('rebate')
+        ->sum('rebate');
+
+        return response()->json($keuntungan,200);
+    }
 }
diff --git a/app/Http/Controllers/TunaiGadTebController.php b/app/Http/Controllers/TunaiGadTebController.php
new file mode 100644
index 0000000..63df2c6
--- /dev/null
+++ b/app/Http/Controllers/TunaiGadTebController.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Cawangan;
+use App\Tunai;
+use App\Gadai;
+use App\AddTunai;
+use App\RequestTeller;
+use App\TunaiGadTeb;
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+
+class TunaiGadTebController extends Controller
+{
+
+
+
+
+
+    public function getCurrentTunaiGadTeb($kodcaw,Request $request)
+    {
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $tunaiGadteb=TunaiGadTeb::on($cawangan['mysql'])
+        ->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['kodlaluan','=',$request->kodlaluan]])
+        ->orderBy('tarikh','desc')
+        ->first();
+        return response()->json($tunaiGadteb);
+
+    }
+
+
+
+
+
+
+
+    public function UpdateTunaiGadTeb($kodcaw, Request $request)
+    {
+
+        $current = Carbon::now();
+        $current = new Carbon();
+       
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $updatetunaiGD=TunaiGadTeb::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
+        update(array(
+             'gadai'=>$request->gadai,
+             'tebus'=>$request->tebus,
+             'upah'=>$request->upah
+          
+        ));
+           
+        return response()->json($updatetunaiGD, 200);
+    
+
+    }
+
+    
+    
+
+
+
+
+
+
+
+
+
+
+
+    public function createTunaiGadTeb($kodcaw, Request $request)
+    {
+
+        $current = Carbon::now();
+        $current = new Carbon();
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $tunaigadteb=TunaiGadTeb::on($cawangan['mysql'])->create([
+          'tarikh'=>$current->toDateString(),
+          'kodcaw'=>$request->kodcaw,
+          'kodlaluan'=>$request->teller,
+          'prkod'=>$request->prkod,
+          'gadai'=>$request->gadai,
+          'tebus'=>$request->tebus,
+          'upah'=>$request->upah,
+          'lain'=>$request->lain,
+          'bakilelong'=>$request->bakilelong,
+          'byrbakilelong'=>$request->byrbakilelong
+
+        ]);
+
+
+
+        return response()->json($tunaigadteb,201);
+
+
+
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index b027f4a..a35f8e3 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -207,6 +207,55 @@ class VaultController extends Controller
       return response()->json($gldetail,200);
    }
 
+   public function TunaiDiTangan($kodcaw,Request $request)
+   {
+     $current = Carbon::now();
+     $current = new Carbon();    
+  
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+      $vault=Vault::on($cawangan['mysql'])
+              ->where('kodcaw','=',$kodcaw)
+              ->where('tarikh','=', $request->tarikh)
+              ->orderby('tarikh','desc')->first();
+  
+      return response()->json($vault);
+   }
+
+
+   public function laporanPetiBesi($kodcaw,$tarikh)
+   {
+     $current = Carbon::now();
+     $current = new Carbon();    
+  
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+      $vault=Vault::on($cawangan['mysql'])
+              ->where('kodcaw','=',$kodcaw)
+              ->where('tarikh','=', $tarikh)
+              ->orderby('tarikh','desc')->first();
+  
+      return response()->json($vault);
+   }
+
+   public function CalculationPendahuluanSerahan($kodcaw,Request $request)
+   {
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+      $pendahuluan = Vault::on($cawangan['mysql'])
+      ->where('kodcaw','=',$kodcaw)
+      ->where('tarikh','<=', $request->tarikh)
+      ->sum('pendahuluan');
+
+      $serahan = Vault::on($cawangan['mysql'])
+      ->where('kodcaw','=',$kodcaw)
+      ->where('tarikh','<=', $request->tarikh)
+      ->sum('serahan');
+
+
+      $arraypend = ['pendahuluan' => $pendahuluan,'serahan' => $serahan];
+
+      return response()->json($arraypend);
+   }
+
 
 
 }
\ No newline at end of file
diff --git a/app/Product.php b/app/Product.php
new file mode 100644
index 0000000..821ab6f
--- /dev/null
+++ b/app/Product.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Product extends Model
+{
+    protected $table = 'product';
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'prkod',
+        'tarikh',
+        'database',
+        'keterangan',
+        'tempoh',
+        'tempohmax',
+        'pinjaman',
+        'pinjaman2',
+        'marginmin',
+        'marginmax',
+        'marginansur',
+        'laporan',
+        'lanjut1',
+        'lanjut2',
+        'matang',
+        'notis1',
+        'notis2',
+        'notis3',
+        'nt1',
+        'nt2',
+        'nt3',
+        'nt1a',
+        'nt2a',
+        'nt3a',
+        'cajnotis3',
+        'cajnotis',
+        'sks1',
+        'sks2',
+        'sks3',
+        'sks4',
+        'sks5',
+        'sks6',
+        'sks1n',
+        'sks2n',
+        'sks3n',
+        'sks4n',
+        'sks5n',
+        'sks6n',
+        'pkadarupah',
+        'hari',
+        'kodgl',
+        'kodglxtra',
+        'glcode',
+        'glcodebk',
+        'glcode_up',
+        'glcode_kc',
+        'glcode_cn',
+        'glcode_cl',
+        'glcode_hk',
+        'glcode_sc',
+        'pilihtempoh',
+        'harisebulan',
+        'hari15',
+        'jenisansur',
+        'glcode_up_jmc',
+        'glpd_xtra',
+        'glcode_upxtra',
+        'glcode_clxtra',
+        'glcode_scxtra',
+        'glcode_rugilelxtra',
+        'gl_phk',
+        'gl_bp',
+        'gl_belumbp'
+    ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}
\ No newline at end of file
diff --git a/app/TunaiGadTeb.php b/app/TunaiGadTeb.php
new file mode 100644
index 0000000..2f41e25
--- /dev/null
+++ b/app/TunaiGadTeb.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class TunaiGadTeb extends Model
+{
+    protected $table = 'tunaigadteb';
+
+    
+
+    protected $fillable=[
+   'tarikh',
+    'kodcaw',
+    'kodlaluan', 
+    'prkod',
+    'gadai', 
+    'tebus',
+    'upah',
+    'lain',
+    'bakilelong',
+    'byrbakilelong',
+    'pampasan',
+    'gadaixtra',
+    'tebusxtra',
+    'upahxtra','lainxtra',
+    'bakilelongxtra',
+    'byrbakilelongxtra',
+    'pampasanxtra',
+    'rugilelong',
+    'pampasanxtra',
+    'rugilelong',
+    'trmrugilelong',
+    'rugiLelongxtra',
+    'trnRugiLelongxtra',
+    'gst_hj',
+    'gst_cl',
+    '1sen',
+    '5sen', 
+    '10sen',
+    '20sen',
+    '50sen',
+    'rm1',
+    'rm2',
+    'rm5',
+    'rm10',
+    'rm50',
+    'rm100','
+    rm1000',
+    'ansuranupah',
+    'ansuranrugi',
+    'gst_hjxtra',
+    'gst_clxtra',
+    'belianmarhun',
+    'jualanmarhun',
+    'gst_yuran_gx',
+    'yuran_gad_x',
+    'yurangadai'];
+
+    public $timestamps = false;
+
+}
\ No newline at end of file
diff --git a/app/imbangdugalama.php b/app/imbangdugalama.php
new file mode 100644
index 0000000..54760b0
--- /dev/null
+++ b/app/imbangdugalama.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class imbangdugalama extends Model
+{
+    protected $table = 'imbang_duga_lama';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+  /*  protected $fillable = [
+        
+    
+       
+
+
+
+        
+
+      
+
+    
+    ];*/
+
+    public $timestamps = false;
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}
+
+
diff --git a/routes/web.php b/routes/web.php
index cf86f00..a9a098e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -217,6 +217,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('gldetail/{kodcaw}',['uses'=> 'VaultController@creategldetailonline']); //Gldetail Online
     $router->post('gldetailkaunter/{kodcaw}',['uses'=> 'VaultController@creategldetail']); //Gldetail Kaunter
     $router->get('listgldetail/{kodcaw}',['uses'=> 'VaultController@listgldetail']); //Gldetail List Kaunter
+    $router->get('laporanpetibesi/{kodcaw}/{tarikh}',['uses'=> 'VaultController@laporanPetiBesi']); //Gldetail List Kaunter
 
 
     //API PANJAR KHAZANAH
@@ -273,7 +274,67 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('TuntutBaki/resit/{kodcaw}/{norujukan}',['uses'=>'LelongController@resitLelong']);
     $router->post('Tuntutbakisimpan/{kodcaw}',['uses'=>'LelongController@simpantuntutbaki']);
     $router->put('tuntutbakiupdate/{kodcaw}/{norujukan}',['uses'=>'LelongController@updatetagtbaki']);
+        
+    //API KOD PRODUK
+    $router->get('getProduct/{kodcaw}',['uses'=>'ProductController@getProduct']); //add 2021-02-11
 
+    //API GLCODE
+    $router->get('getGlCode/{kodcaw}',['uses'=>'GLCodeController@GetGlcode']); //add 2021-02-11
+    $router->get('getGlCode/{kodcaw}/acttype/{acttype}',['uses'=>'GLCodeController@GetGlcodeByActType']); //add 2021-02-11
+
+    //API IMBANGDUGA_LAMA
+    $router->get('imbangduga_lama/{kodcaw}', ['uses' =>'ImbangDugaLamaController@GetImbangDuga_Lama']);
+
+    //API GLDETAILS
+    $router->get('jumlahTerkumpulBayaranUpah/{kodcaw}', ['uses'=>'TebusController@JumUpahDibayar_keseluruhan']);
+    $router->get('gldetailkira_pendahuluan_2013/data/{kodcaw}',['uses'=>'GlDetailsController@sum_gldetails']);  // GLDETAILS 7000/102
+    $router->get('gldetailkira_pendahuluan_2014/data/{kodcaw}',['uses'=>'GlDetailsController@sum_advance_2014']);  
+    $router->get('gldetailkira_pendahuluanJMC_2015/data/{kodcaw}', ['uses' =>'GlDetailsController@sumJMC_2015']);
+    $router->get('gldetailkira_pendahuluanJMC_2014/data/{kodcaw}', ['uses' =>'GlDetailsController@sumJMC_2014']);
+    $router->get('gldetailKira_SerahanHQ/data/{kodcaw}', ['uses'=>'GlDetailsController@JumlahSerahanHQ']);
+
+    //API GLEJER
+    $router->get('getGlejer/{kodcaw}',['uses'=>'GlejerController@getGlejer']);
+    $router->get('getLejerMonthYear/{kodcaw}',['uses'=>'GlejerController@carianBulananTahun_glejer']);
+    $router->get('getLejerYear/{kodcaw}',['uses'=>'GlejerController@carianTahun_glejer']);
+    $router->get('getSemalam_Glejer/{kodcaw}',['uses' =>'GlejerController@getSemalam_Glejer']);
+    $router->post('daftarGlejer/{kodcaw}',['uses'=>'GlejerController@Create_Glejer']);
+    $router->put('kemasKiniGlejer/{kodcaw}',['uses'=>'GlejerController@Kemaskini_Glejer']);
+    $router->get('glejer/getdata/{tarikh1}/{tarikh2}/{kodcaw}',['uses'=>'GlejerController@Getglejer_Data']);
+    $router->get('glejer/sumDebit/{tarikh1}/{tarikh2}/{kodcaw}',['uses'=>'GlejerController@SumDebit_Glejer']);
+    $router->get('glejer/sumKredit/{tarikh1}/{tarikh2}/{kodcaw}',['uses'=>'GlejerController@SumKredit_Glejer']);
+
+    //TUNAI GADAITEBUS
+    $router->get('getTunaiGadTeb/{kodcaw}',['uses'=>'TunaiGadTebController@getCurrentTunaiGadTeb']);
+    $router->post('daftarTunaiGadteb/{kodcaw}',['uses'=>'TunaiGadTebController@createTunaiGadTeb']);
+    $router->put('updateTunaiGadteb/{kodcaw}',['uses'=>'TunaiGadTebController@UpdateTunaiGadTeb']);  
+    $router->put('updateBakiEOD_Vault/{kodcaw}',['uses'=>'VaultController@update_onlyBakiEod']); // add 0n 2021-02-11
+
+    $router->get('transaction_spesifik/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukan_specific']);  //transaction specific by cawangan & tarikh 
+    $router->get('transaction_spesifik_tarikh/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukan_specific_tarikh']);
+    $router->get('jumlahBayaranOnlineAll/data/{kodcaw}',['uses'=>'TransactionController@JumlahBayaranOnline_Keseluruhan']);  //transaction kira sum  all bayaran online cawangan
+    
+
+    //IMBANG DUGA//
+
+    //Dua-Dua Table
+    $router->get('CalculationPendahuluanSerahan/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahan']); //pendahuluan dan serahan
+    $router->get('KeuntunganArRahn/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntungan']); //Penghutang Ar-Rahn dan Keuntungan Terakru
+
+    //-- Harta Semasa --//
+    $router->get('PinjamanDiberi/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi
+    $router->get('TunaiDiTangan/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan
+    
+    //-- Tanggungan Semasa --//
+    $router->get('CalculationPanjar/{kodcaw}',['uses'=>'PanjarController@calculationpanjar']); //panjar
+    $router->get('BakiLelongCalculation/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculation']); //baki lelong & Rugi lelong
+    $router->get('WTD/{kodcaw}',['uses'=>'LelongController@calculationwtd']); //wang tak dituntut
+    $router->get('cajlelong/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); //caj lelong by tahun
+    $router->get('KeuntunganSebenar/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenar']); //Keuntungan Sebenar
+    
+
+
+    //END IMBANG DUGA//
 
     //Komuditi Pukal
     $router->get('komuditi/check',['uses'=>'KomuditiController@checkKomuditi']);