diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index d4c0ef8..526a511 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -61,38 +61,42 @@ class MarhunController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
 
-        $harga = HargaEmas::on('mysql7')->where('karat',$request->karat)->first();
+        $request_data = json_decode($request->getContent(), false);
+
+        $harga = HargaEmas::on('mysql7')->where('karat',$request_data->karat)->first();
 
         $hargaemas = $harga['harga'];
-        if(isset($request->jenisAT)){
-            if($request->jenisAT == 'hargalama'){
-                $hargaemas = $request->harga;
-                // $nilai_marhun = $request->berat_emas * $request->harga;
+        if(isset($request_data->jenisAT)){
+            if($request_data->jenisAT == 'hargalama'){
+                $hargaemas = $request_data->harga;
+                // $nilai_marhun = $request_data->berat_emas * $request_data->harga;
             }else $hargaemas = $harga['harga'];
-            // $nilai_marhun = $request->berat_emas * $harga['harga'];
+            // $nilai_marhun = $request_data->berat_emas * $harga['harga'];
         }else $hargaemas = $harga['harga']; 
         
-        $nilai_marhun = $request->berat_emas * $hargaemas;
+        $nilai_marhun = $request_data->berat_emas * $hargaemas;
         
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $marhun = Marhun::on($cawangan['mysql'])->create([
             'kodcaw'=> $kodcaw,
-            'norujukan'=> $request->norujukan,
+            'norujukan'=> $request_data->norujukan,
             't_gadai' => $current->toDateString(),
             'bil' => 1,
-            'marhun' => $request->marhun,
-            'nota' => $request->nota,
-            'karat' => $request->karat,
-            'berat' => $request->berat_emas,
+            'marhun' => $request_data->marhun,
+            'nota' => $request_data->nota,
+            'batu_permata' => $request_data->batu_permata,
+            'berat_batu_permata' => $request_data->berat_batu_permata,
+            'karat' => $request_data->karat,
+            'berat' => $request_data->berat_emas,
             'harga' => $hargaemas,
             'n_marhun' => $nilai_marhun
         ]);
 
         $audit = new Audit();
-        $audit->users = $request->teller;
+        $audit->users = $request_data->teller;
         $audit->actions = 'Daftar Marhun';
-        $audit->norujukan = $request->norujukan;
+        $audit->norujukan = $request_data->norujukan;
         $audit->new_data = $marhun;
         $audit->kodcaw = $kodcaw;
         $audit->created_at = $current;
@@ -159,6 +163,8 @@ class MarhunController extends Controller
                 'karat' => $request->karat,
                 'marhun' => $request->marhun,
                 'nota' => $request->nota,
+                'batu_permata' => $request->batu_permata,
+                'berat_batu_permata' => $request->berat_batu_permata,
                 'berat' => $request->berat,
                 'harga' => $harga['harga'],
                 'n_marhun' => $nilai_marhun
@@ -184,7 +190,7 @@ class MarhunController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $marhun = Marhun::on($cawangan['mysql'])
-                ->select('marhun.norujukan','gadai.nokp','customer.nama','marhun.marhun','marhun.nota','marhun.berat','marhun.karat','marhun.harga','marhun.n_marhun','marhun.t_gadai')
+                ->select('marhun.norujukan','gadai.nokp','customer.nama','marhun.marhun','marhun.nota','marhun.berat','marhun.karat','marhun.harga','marhun.n_marhun','marhun.t_gadai','marhun.batu_permata', 'marhun.berat_batu_permata')
                 ->rightJoin('gadai', 'gadai.norujukan', '=', 'marhun.norujukan')
                 ->rightJoin('online_arrahn.customer as customer', 'customer.kpbaru','=','gadai.nokp')                
                 ->where('marhun.t_gadai','=',$tarikh)