diff --git a/app/Http/Controllers/AutoSerahanController.php b/app/Http/Controllers/AutoSerahanController.php
index 5fabcc5..8db8872 100644
--- a/app/Http/Controllers/AutoSerahanController.php
+++ b/app/Http/Controllers/AutoSerahanController.php
@@ -123,7 +123,7 @@ class AutoSerahanController extends Controller
         
                 $bakiakhir = $bakiawal - $keluar + $masuk + $totalpendahuluan - $serahan - $totpanjaran;
         
-                $denopendser = DenoPendSer::on('mysql7')->where('no',$approval['denopendser_id_v3'])->first();
+                $denopendser = DenoPendSer::on('mysql7')->where('no',$pendserid)->first();
 
                 $this->updateDenominasi($kodcaw,$denopendser,$jenis);
 
@@ -243,7 +243,12 @@ class AutoSerahanController extends Controller
         $current = Carbon::now();
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-        $current_denominasi = $this->checkDenominasi($kodcaw);
+        $version = ($jenis == 'pendahuluan') ? 'v3' : 'v2';
+        $current_denominasi = $this->checkDenominasi($kodcaw,$version);
+        Log::info('denopendser:');
+        Log::debug($denopendser);
+        Log::info('current_denominasi:');
+        Log::debug($current_denominasi);
 
         if($jenis == 'pendahuluan'){
             $k1 = ($denopendser['txtring1'] * 1) + $current_denominasi['k1'];
@@ -341,7 +346,9 @@ class AutoSerahanController extends Controller
         $this->checkVault($request->kodcaw,'v2');
         $this->checkDenominasi($request->kodcaw,'v2');
 
-        $updated_serahan = $this->autoSerahanEngine('serahan',$request->kodcaw,$request->teller,$request->amaun,$request->id,$request->denopendser_id);
+        $kodcaw = $this->interchangeCawangan($request->kodcaw,'v3');
+
+        $updated_serahan = $this->autoSerahanEngine('serahan',$kodcaw,$request->teller,$request->amaun,$request->id,$request->denopendser_id);
 
         return response()->json(['status' => 'success','gldetail_id' => $updated_serahan['gldetail_id']],200);
      }
@@ -351,7 +358,9 @@ class AutoSerahanController extends Controller
         $this->checkVault($request->kodcaw,'v3');
         $this->checkDenominasi($request->kodcaw,'v3');
 
-        $updated_pendahuluan = $this->autoSerahanEngine('pendahuluan',$request->kodcaw,$request->teller,$request->amaun,$request->id,$request->denopendser_id);
+        $kodcaw = $this->interchangeCawangan($request->kodcaw,'v3');
+
+        $updated_pendahuluan = $this->autoSerahanEngine('pendahuluan',$kodcaw,$request->teller,$request->amaun,$request->id,$request->denopendser_id);
         
         return response()->json(['status' => 'success','gldetail_id' => $updated_pendahuluan['gldetail_id']],200); 
     }
@@ -504,6 +513,7 @@ class AutoSerahanController extends Controller
                     'nota' => 0,
                     'jumlahkeping' => 0
                  ]);
+                 return $savedeno;
             }
 
             $savedeno = Denominasi::on($cawangan['mysql'])->create([