From 9b87170ca129a81985e692c8fbd5cad0cec06911 Mon Sep 17 00:00:00 2001
From: Hafifie PKB <muhdhafifie97@gmail.com>
Date: Mon, 10 Mar 2025 01:47:20 +0800
Subject: [PATCH] interchangecawangan for checkVault and checkDenominasi

---
 app/Http/Controllers/AutoSerahanController.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/AutoSerahanController.php b/app/Http/Controllers/AutoSerahanController.php
index 4196af1..c043831 100644
--- a/app/Http/Controllers/AutoSerahanController.php
+++ b/app/Http/Controllers/AutoSerahanController.php
@@ -338,8 +338,8 @@ class AutoSerahanController extends Controller
 
      public function serahanAutoSerahan(Request $request){
 
-        $this->checkVault($request->kodcaw);
-        $this->checkDenominasi($request->kodcaw);
+        $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);
 
@@ -348,8 +348,8 @@ class AutoSerahanController extends Controller
 
      public function pendahuluanAutoSerahan(Request $request){
 
-        $this->checkVault($request->kodcaw);
-        $this->checkDenominasi($request->kodcaw);
+        $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);
         
@@ -379,7 +379,9 @@ class AutoSerahanController extends Controller
         return response()->json($query,200);
     }
 
-    private function checkVault($kodcaw){
+    private function checkVault($kodcaw,$version){
+
+        $kodcaw = $this->interchangeCawangan($kodcaw,$version);
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         
         /* Check Tarikh Harini */
@@ -446,7 +448,9 @@ class AutoSerahanController extends Controller
         }
     }
 
-    private function checkDenominasi($kodcaw){
+    private function checkDenominasi($kodcaw,$version){
+        $kodcaw = $this->interchangeCawangan($kodcaw,$version);
+
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $current = Carbon::now();
         $denominasi = Denominasi::on($cawangan['mysql'])->where('tarikh',$current->toDateString())->first();