diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 5d2f2d3..6eb13d0 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -723,32 +723,6 @@ class KhazanahController extends Controller
 
         $bakiperubatan = 0;
 
-        switch ($request->jenismodal) {
-            case "selenggara":
-                $kategori = "Baiki dan Selenggara";
-                $tag = 2;
-               break;
-            case "keraian":
-                $kategori = "Keraian & Promosi";
-                $tag = 3;
-               break;
-            case "belanjaam":
-                $kategori = "Belanja AM";
-                $tag = 1;
-               break;
-            case "perubatan":
-                $kategori = "Belanja AM - Perubatan";
-                $tag = 1;
-               break;
-            case "dapur":
-                $kategori = "Belanja AM - Barangan Dapur";
-                $tag = 1;
-               break;
-            case "pos":
-                $kategori = "Belanja AM - Postage";
-                $tag = 1;
-               break;
-          }
 
 
         if($request->jenismodal === 'perubatan')
@@ -761,146 +735,28 @@ class KhazanahController extends Controller
             }
         }
 
+        $request->merge(['kodlaluan' => $auth_user['name']]);
+        $data_request = $request->except('_token');
 
-
-        $denominasilist = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/DenominasiController/'. $auth_user['cawangan'])->json();
-
-        //bundle initialize
-        $rekodb1 = $denominasilist[0]['bd1']; $rekodb5 = $denominasilist[0]['bd5']; $rekodb10 = $denominasilist[0]['bd10']; $rekodb20 = $denominasilist[0]['bd20'];
-        $rekodb50 = $denominasilist[0]['bd50']; $rekodb100 = $denominasilist[0]['bd100'];
-
-        //wang Syilling Initialize
-        $rekodsen1 = $denominasilist[0]['txtsen1']; $rekodsen5 = $denominasilist[0]['txtsen5']; $rekodsen10 = $denominasilist[0]['txtsen10'];
-        $rekodsen20 = $denominasilist[0]['txtsen20']; $rekodsen50 = $denominasilist[0]['txtsen50'];
-
-        //Wang Ringgit Initialize
-        $rekodring1 = $denominasilist[0]['txtring1']; $rekodring5 = $denominasilist[0]['txtring5']; $rekodring10 = $denominasilist[0]['txtring10'];
-        $rekodring20 = $denominasilist[0]['txtring20']; $rekodring50 = $denominasilist[0]['txtring50']; $rekodring100 = $denominasilist[0]['txtring100'];
-
-        //Tolok Rekod
-        $rekodsen1 -= intval($request->ambilansen1);
-        $rekodsen5 -= intval($request->ambilansen5);
-        $rekodsen10 -= intval($request->ambilansen10);
-        $rekodsen20 -= intval($request->ambilansen20);
-        $rekodsen50 -= intval($request->ambilansen50);
-
-        $rekodring1 -= intval($request->ambilanring1);
-        $rekodring5 -= intval($request->ambilanring5);
-        $rekodring10 -= intval($request->ambilanring10);
-        $rekodring20 -= intval($request->ambilanring20);
-        $rekodring50 -= intval($request->ambilanring50);
-        $rekodring100 -= intval($request->ambilanring100);
-
-        $denominasicreate = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[
-            'bd1' => $rekodb1,
-            'bd5'=> $rekodb5,
-            'bd10'=> $rekodb10,
-            'bd20'=> $rekodb20,
-            'bd50'=> $rekodb50,
-            'bd100'=> $rekodb100,
-            'txtring1'=> $rekodring1,
-            'txtring5'=> $rekodring5,
-            'txtsen1'=> $rekodsen1,
-            'txtsen5'=> $rekodsen5,
-            'txtsen10'=> $rekodsen10,
-            'txtsen20'=> $rekodsen20,
-            'txtsen50'=> $rekodsen50,
-            'txtring10'=> $rekodring10,
-            'txtring20'=> $rekodring20,
-            'txtring50'=> $rekodring50,
-            'txtring100'=> $rekodring100,
-            'txtring1000'=> "0",
-            'jumlahbundle'=> "0",
-            'txtjumlah'=> "0",
-            'jumlahkeping' => "0"
-          ]);
-
-        $myDateTime = DateTime::createFromFormat('Y-m-d', $request->tarikhbil);
-        $tarikhbil = $myDateTime->format('dmY');
-
-        $panjar = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/CreatePanjar/'. $auth_user['cawangan'],[
-
-            'deskripsi' => $request->deskripsi,
-            'bayaran' => $request->bayaran,
-            'tag' => $tag,
-            'kategori' => $kategori,
-            'id' => $auth_user['name'],
-            'bakiperubatan' => $bakiperubatan,
-            'nobaucer' => $request->baucer,
-            'nobil' => $tarikhbil,
-            'tuntutoleh' => $request->tuntutan
-
-        ])->json();
-
-        $updateVault = Http::withOptions(['verify' => config('app.api_verify')])->put( config('api.url').'/api/UpdateVault/Panjar/'.$auth_user['cawangan'],[
-            'totpanjar'=>$request->bayaran
-        ]);
-
-        $panjareach = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/SenaraiPanjar/listeach/'. $auth_user['cawangan'],['nobaucer' => $request->baucer])->json();
-
-        $recnopanjar = $panjareach['recno'];
-
-        $rekodsen1 -= intval($request->ambilansen1);
-        $rekodsen5 -= intval($request->ambilansen5);
-        $rekodsen10 -= intval($request->ambilansen10);
-        $rekodsen20 -= intval($request->ambilansen20);
-        $rekodsen50 -= intval($request->ambilansen50);
-
-        $rekodring1 -= intval($request->ambilanring1);
-        $rekodring5 -= intval($request->ambilanring5);
-        $rekodring10 -= intval($request->ambilanring10);
-        $rekodring20 -= intval($request->ambilanring20);
-        $rekodring50 -= intval($request->ambilanring50);
-        $rekodring100 -= intval($request->ambilanring100);
-
-        $denopanjar = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/requestdenopanjar/'.$auth_user['cawangan'],[
-            'kodlaluan' => $auth_user['name'],
-            'serahan' => floatval($request->bayaran),
-            'bd1' => 0,
-            'bd5' => 0,
-            'bd10' => 0,
-            'bd20' => 0,
-            'bd50' => 0,
-            'bd100' => 0,
-            'txtring1' => intval($request->ambilanring1),
-            'txtring5' => intval($request->ambilanring5),
-            'txtring10' => intval($request->ambilanring10),
-            'txtring20' => intval($request->ambilanring20),
-            'txtring50' => intval($request->ambilanring50),
-            'txtring100' => intval($request->ambilanring100),
-            'txtring1000' => 0,
-            'txtsen1' => intval($request->ambilansen1),
-            'txtsen5' => intval($request->ambilansen5),
-            'txtsen10' => intval($request->ambilansen10),
-            'txtsen20' => intval($request->ambilansen20),
-            'txtsen50' => intval($request->ambilansen50),
-            'jenis' => $request->jenismodal,
-            'recno' => intval($recnopanjar)
-          ]);
-
-        $upVault = $updateVault->getStatusCode();
-        $upDeno = $denominasicreate->getStatusCode();
-        $updenopanjar = $denopanjar->getStatusCode();
-
-        if($upVault == 200 && empty($panjar) == false && $upDeno == 200 && $updenopanjar == 200)
+        $updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/test/createpanjar/'. $auth_user['cawangan'],$data_request)->json();
+        
+        if($updatepanjar['result'] == 'success')
         {
             if($request->jenismodal === 'perubatan')
             {
                 $listUser=User::where('name','=',$request->tuntutan)->get();
-
-                $totalsebenar = floatval($listUser[0]->perubatan) - floatval($request->bayaran);
-
+                // $totalsebenar = floatval($listUser[0]->perubatan) - floatval($request->bayaran);
                 $overrideuser = User::where('cawangan','=',$auth_user['cawangan'])
                 ->where('name','=',$request->tuntutan)
                 ->update(array(
-                    'perubatan' => $totalsebenar
+                    'perubatan' => $updatepanjar['bakiperubatan']
                 ));
             }
 
-            return redirect('/panjar')->with('messageinformation','Panjar Berjaya Disimpan.');
+            return redirect('/panjar')->with('messageinformation',['message' => 'Panjar Berjaya Disimpan.','status' => 'success']);
         }else{
 
-            return redirect('/panjar')->with('messageinformation','Panjar Mengalami Masalah Untuk Disimpan.');
+            return redirect('/panjar')->with('messageinformation',['message' => 'Panjar Mengalami Masalah Untuk Disimpan.','status' => 'error']);
         }
 
         return response($updateVault);
@@ -912,78 +768,12 @@ class KhazanahController extends Controller
         $api_url = config('api.url');
         $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
 
-        $denopanjar = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/getdenopanjar/'. $auth_user['cawangan'],['recno' => $request->recno])->json();
+        $request->merge(['kodlaluan' => $auth_user['name']]);
+        $data_request = $request->except('_token');
+        dd($data_request);
 
-        $senaraipanjar = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/SenaraiPanjar/listeach/'. $auth_user['cawangan'],['nobaucer' => $request->nobaucer])->json();
-
-        if(sizeof($denopanjar) > 0)
-            $denopanjar = $denopanjar[0];
-
-        $denominasilist = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/DenominasiController/'. $auth_user['cawangan'])->json();
-
-        //bundle initialize
-        $rekodb1 = $denominasilist[0]['bd1']; $rekodb5 = $denominasilist[0]['bd5']; $rekodb10 = $denominasilist[0]['bd10']; $rekodb20 = $denominasilist[0]['bd20'];
-        $rekodb50 = $denominasilist[0]['bd50']; $rekodb100 = $denominasilist[0]['bd100'];
-
-        //wang Syilling Initialize
-        $rekodsen1 = $denominasilist[0]['txtsen1']; $rekodsen5 = $denominasilist[0]['txtsen5']; $rekodsen10 = $denominasilist[0]['txtsen10'];
-        $rekodsen20 = $denominasilist[0]['txtsen20']; $rekodsen50 = $denominasilist[0]['txtsen50'];
-
-        //Wang Ringgit Initialize
-        $rekodring1 = $denominasilist[0]['txtring1']; $rekodring5 = $denominasilist[0]['txtring5']; $rekodring10 = $denominasilist[0]['txtring10'];
-        $rekodring20 = $denominasilist[0]['txtring20']; $rekodring50 = $denominasilist[0]['txtring50']; $rekodring100 = $denominasilist[0]['txtring100'];
-
-        //Tolok Rekod
-        $rekodsen1 += intval($denopanjar['txtsen1']);
-        $rekodsen5 += intval($denopanjar['txtsen5']);
-        $rekodsen10 += intval($denopanjar['txtsen10']);
-        $rekodsen20 += intval($denopanjar['txtsen20']);
-        $rekodsen50 += intval($denopanjar['txtsen50']);
-
-        $rekodring1 += intval($denopanjar['txtring1']);
-        $rekodring5 += intval($denopanjar['txtring5']);
-        $rekodring10 += intval($denopanjar['txtring10']);
-        $rekodring20 += intval($denopanjar['txtring20']);
-        $rekodring50 += intval($denopanjar['txtring50']);
-        $rekodring100 += intval($denopanjar['txtring100']);
-
-        $denominasicreate = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[
-            'bd1' => $rekodb1,
-            'bd5'=> $rekodb5,
-            'bd10'=> $rekodb10,
-            'bd20'=> $rekodb20,
-            'bd50'=> $rekodb50,
-            'bd100'=> $rekodb100,
-            'txtring1'=> $rekodring1,
-            'txtring5'=> $rekodring5,
-            'txtsen1'=> $rekodsen1,
-            'txtsen5'=> $rekodsen5,
-            'txtsen10'=> $rekodsen10,
-            'txtsen20'=> $rekodsen20,
-            'txtsen50'=> $rekodsen50,
-            'txtring10'=> $rekodring10,
-            'txtring20'=> $rekodring20,
-            'txtring50'=> $rekodring50,
-            'txtring100'=> $rekodring100,
-            'txtring1000'=> "0",
-            'jumlahbundle'=> "0",
-            'txtjumlah'=> "0",
-            'jumlahkeping' => "0"
-          ]);
-
-        $deletepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/DeletePanjar/'. $auth_user['cawangan'],[
-            'recno' => $request->recno,
-            'users' => $auth_user['name']
-        ])->json();
-
-        $updateVault = Http::withOptions(['verify' => config('app.api_verify')])->put( config('api.url').'/api/UpdateVault/DeletePanjar/'.$auth_user['cawangan'],[
-            'totpanjar'=>$denopanjar['serahan']
-        ]);
-
-        $upVault = $updateVault->getStatusCode();
-        $upDeno = $denominasicreate->getStatusCode();
-
-        if($upVault == 200 && $upDeno == 200)
+        $updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/test/createpanjar/'. $auth_user['cawangan'],$data_request)->json();
+        if($updatepanjar['result'] == 'success')
         {
             if($denopanjar['jenis'] === 'perubatan')
             {
@@ -994,7 +784,7 @@ class KhazanahController extends Controller
                 $overrideuser = User::where('cawangan','=',$auth_user['cawangan'])
                 ->where('name','=',$senaraipanjar['tuntutoleh'])
                 ->update(array(
-                    'perubatan' => $totalsebenar
+                    'perubatan' => $bakiperubatan
                 ));
 
             }
diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php
index 6e4dbb8..c3a35c5 100644
--- a/resources/views/khazanah/panjar.blade.php
+++ b/resources/views/khazanah/panjar.blade.php
@@ -20,10 +20,13 @@
                 <div class="card-body text-center">
 
                     @if(Session::has('messageinformation'))
+                    @php
+                        $session = Session::get("messageinformation");
+                    @endphp
                     <script>  Swal.fire({
-                        icon: 'info',
+                        icon: '{!! $session["status"] !!}',
                         title: 'Status!',
-                        text: '{!! Session::get("messageinformation") !!}'
+                        text: '{!! $session["message"] !!}'
                     });
                     </script>
                     @endif