diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index d85daa48..3e862859 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -316,6 +316,7 @@ class MarhunController extends Controller
 
             $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id',$info['lelong_id'])
+            ->where('cawangan.caw_code', $user->kodcaw)
             ->get()
             ->toArray();
             array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
@@ -470,6 +471,7 @@ class MarhunController extends Controller
 
             $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id',$info['lelong_id'])
+            ->where('cawangan.caw_code', $user->kodcaw)
             ->get()
             ->toArray();
             array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php
index 51478209..7f61bcbe 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -336,9 +336,9 @@
                 {
                     console.log(item);
                     var beratemas = $('#berat_emastambahan').val();
-                    var total_tambahan = item.harga * parseFloat(beratemas);
+                    var total_tambahan = item.harga2 * parseFloat(beratemas);
                     var harga_asastambahan = Math.round(total_tambahan);
-                    $('#hargatambahan').val(parseFloat(item.harga).toFixed(2));
+                    $('#hargatambahan').val(parseFloat(item.harga2).toFixed(2));
                     $('#nilai_marhuntambahan').val(parseFloat(total_tambahan).toFixed(2));
                     $('#harga_asastambahan').val(parseFloat(harga_asastambahan).toFixed(2));
                 }
@@ -388,9 +388,9 @@
             karatall.forEach((item) =>{
                 if(item.karat == $(e).val())
                 {
-                    var total = item.harga * $('#berat_emas').val();
+                    var total = item.harga2 * $('#berat_emas').val();
                     var hargaasas = Math.round(total);
-                    $('#harga').val(parseFloat(item.harga).toFixed(2));
+                    $('#harga').val(parseFloat(item.harga2).toFixed(2));
                     $('#nilai_marhun').val(parseFloat(total).toFixed(2));
                     $('#harga_asas').val(parseFloat(hargaasas).toFixed(2));
                 }