diff --git a/app/GlDetail.php b/app/GlDetail.php
index 1f41f7f..417e552 100644
--- a/app/GlDetail.php
+++ b/app/GlDetail.php
@@ -20,15 +20,9 @@ class GlDetail extends Model
       'dtacct',
       'ktacct',
       'descpt',
-      'acttype',
-      'fracttype',
       'amaun',
-      'teller',
-      'pelulus',
-      'terima',
-      'jenisbyr',
-      'bkcode',
-      'nocek'
+      'pendahuluan',
+      'serahan'
     ];
 
     /**
diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php
index 4c9484e..c829755 100644
--- a/app/Http/Controllers/KelulusanController.php
+++ b/app/Http/Controllers/KelulusanController.php
@@ -248,6 +248,7 @@ class KelulusanController extends Controller
                'tarikh'=> $harini->toDateString(),
                'mohon' => $request->mohon,
                'norujukan' => $norujukan,
+               'katalaluan' => $request->message,
                'benar' => '0',
                'teller' => $request->teller
       ]);
@@ -262,14 +263,24 @@ class KelulusanController extends Controller
 
       $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-      $kelulusan=Mohonid::on($cawangan['mysql'])
-               ->where('tarikh','=',$harini->toDateString())
-               ->where('norujukan','=',$norujukan)
-               ->update(array(
-                     'benar' => '1',
-                     'id' => $request->khazanah
-                  
-                     ));
+      if($request->pembatalan != null)
+      {
+         $kelulusan=Mohonid::on($cawangan['mysql'])
+         ->where('tarikh','=',$harini->toDateString())
+         ->where('norujukan','=',$norujukan)
+         ->update(array(
+               'benar' => '2',
+               'id' => $request->khazanah
+         ));
+      }else{
+         $kelulusan=Mohonid::on($cawangan['mysql'])
+         ->where('tarikh','=',$harini->toDateString())
+         ->where('norujukan','=',$norujukan)
+         ->update(array(
+               'benar' => '1',
+               'id' => $request->khazanah
+         ));
+      }
 
       return response()->json($kelulusan,202);
    }
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index 172ff5f..159d2e4 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -31,8 +31,6 @@ class VaultController extends Controller
 
  public function updateVault($kodcaw, Request $request)
  {
-
-       
    $current = Carbon::now();
    $current = new Carbon();     
    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
@@ -46,19 +44,57 @@ class VaultController extends Controller
    ) );
 
    return response()->json($updateVault, 200);
-
  }
 
+ public function updateVaultPendahuluanSerahan($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'];
+
+   if($request->jenispendahuluanserahan == 'pendahuluan'){
+
+      $totalpendahuluan = $request->amaun + $pendahuluan;
+
+      $bakiakhir = $bakiawal-$keluar+$masuk+$totalpendahuluan-$serahan;
+
+      $updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
+         'pendahuluan' => $totalpendahuluan,
+         'bakiakhir' => $bakiakhir,
+         'bakieod' => $bakiakhir
+
+      ));
+   }else if($request->jenispendahuluanserahan == 'serahan'){
+
+      $totalserahan = $request->amaun + $serahan;
+
+      $bakiakhir = $bakiawal - $keluar  + $masuk + $pendahuluan - $totalserahan;
+
+      $updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
+         'serahan' => $totalserahan,
+         'bakiakhir' => $bakiakhir,
+         'bakieod' => $bakiakhir
+      ));
+   }
+
+   return response()->json($updateVault, 200);
+ }
 
  public function create($kodcaw,Request $request)
  {
-
-   
    $current = Carbon::now();
    $current = new Carbon();
 
-   
-
    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
    $vault = Vault::on($cawangan['mysql'])->orderby('tarikh','desc')->first(); 
@@ -93,30 +129,76 @@ class VaultController extends Controller
     return response()->json($vaultcreate,201);
  }
 
-//GLDETAIL ONLINE
+//GLDETAIL
 
-public function creategldetailonline($kodcaw,Request $request)
-{
-    $current = Carbon::now();
-    $current = new Carbon();
-    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+   public function creategldetailonline($kodcaw,Request $request)
+   {
+      $current = Carbon::now();
+      $current = new Carbon();
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-    $gldetail=GlDetail::on($cawangan['mysql'])->create([ 
-        'kodcaw' => $request->kodcaw,
-        'tarikh' => $current->toDateString(),
-        'dtacct' => '1000/020',
-        'ktacct' => '1000/010',
-        'descpt' => 'SERAHAN BAYAR ONLINE',
-        'acttype' => 'A',
-        'fracttype' => 'A',
-        'amaun' => $request->amaun,
-        'teller' => 'ONLINE',
-        'terima' => '*'
-    ]);
+      $gldetail=GlDetail::on($cawangan['mysql'])->create([ 
+         'kodcaw' => $request->kodcaw,
+         'tarikh' => $current->toDateString(),
+         'dtacct' => '1000/020',
+         'ktacct' => '1000/010',
+         'descpt' => 'SERAHAN BAYAR ONLINE',
+         'acttype' => 'A',
+         'fracttype' => 'A',
+         'amaun' => $request->amaun,
+         'teller' => 'ONLINE',
+         'terima' => '*'
+      ]);
 
-    return response()->json($gldetail,201);
+      return response()->json($gldetail,201);
 
-}
+   }
+
+   public function creategldetail($kodcaw,Request $request)
+   {
+      $current = Carbon::now();
+      $current = new Carbon();
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+      if($request->jenisgldetail == 'pendahuluan')
+      {
+         $gldetail=GlDetail::on($cawangan['mysql'])->create([ 
+            'kodcaw' => $request->kodcaw,
+            'tarikh' => $current->toDateString(),
+            'dtacct' => $request->dtacct,
+            'ktacct' => $request->ktacct,
+            'descpt' => $request->keterangan,
+            'pendahuluan' => $request->amaun,
+            'teller' => $request->teller
+         ]);
+      }else if($request->jenisgldetail == 'serahan')
+      {
+         $gldetail=GlDetail::on($cawangan['mysql'])->create([ 
+            'kodcaw' => $request->kodcaw,
+            'tarikh' => $current->toDateString(),
+            'dtacct' => $request->dtacct,
+            'ktacct' => $request->ktacct,
+            'descpt' => $request->keterangan,
+            'serahan' => $request->amaun,
+            'teller' => $request->teller
+         ]);
+      }
+  
+
+      return response()->json($gldetail,201);
+
+   }
+
+   public function listgldetail($kodcaw,Request $request)
+   {
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+      $gldetail=GlDetail::on($cawangan['mysql'])
+      ->where('kodcaw','=',$kodcaw)
+      ->orderby('tarikh','desc')->get();
+
+      return response()->json($gldetail,200);
+   }
 
 
 
diff --git a/routes/web.php b/routes/web.php
index ca4b0ee..ed2e7ac 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -187,6 +187,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('countGT/{kodcaw}',['uses'=>'TunaiController@countgadaidantebus']);
     $router->post('daftarVault/{kodcaw}',['uses'=>'VaultController@create']);
     $router->put('UpdateVault/{kodcaw}', ['uses'=>'VaultController@updateVault']);
+    $router->put('UpdateVaultPendahuluanSerahan/{kodcaw}', ['uses'=>'VaultController@updateVaultPendahuluanSerahan']);
     $router->get('TunaiController/{kodcaw}',['uses'=>'TunaiController@listTunai']);
     $router->post('tunai/daftarTunai/{kodcaw}',['uses'=> 'TunaiController@DaftarTunai']);
     $router->put('updateTunai/{kodcaw}',['uses'=>'TunaiController@UpdateTunai']);
@@ -206,6 +207,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->put('gadai/edit/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@deletemarhun']); //deletemarhun edit
     $router->put('gadai/ubah/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@editmarhun']); //editmarhun edit
     $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
 
 
     //API PANJAR KHAZANAH