diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index a4454b27..8ae61494 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -592,8 +592,14 @@ class MarhunController extends Controller
 
     public function senaraiLelongTerimaSerah()
     {
-
-        $lelong = Lelong::orderBy('id', 'desc')->get();
+        $user = Auth::user();
+        $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
+        ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
+        ->where('cawangan.caw_code', $user->kodcaw)
+        ->where('sts_lelong', 0)
+        ->get();
+        
+        // $lelong = Lelong::orderBy('id', 'desc')->get();
 
         return view('marhun.senarailelongterimaserah', compact('lelong'));
     }
@@ -825,10 +831,13 @@ class MarhunController extends Controller
     //Operasi
     public function senarailelongubahmutu()
     {
+        $user = Auth::user();
         $arrayinfo = [];
        
         $lelong = pengesahan::join('lelong','lelong.id','=','pengesahan.lelong_id')
-        // ->where('sts_lelong', 0)
+        ->join('lelongbid','lelongbid.id','=','pengesahan.lelongbid_id')
+        ->where('sts_lelong', 0)
+         ->where('lelongbid.kodcaw', $user->kodcaw)
         ->whereIn('pengesahan.status_ubah', [1,2,3,4,5])
         ->select('lelong.fasa','pengesahan.lelong_id','lelong.id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','sts_lelong')
         // ->groupBy('pengesahan.lelong_id')
@@ -842,6 +851,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]);
@@ -976,14 +986,15 @@ class MarhunController extends Controller
 
             // dd($id);
             foreach ($marhuns as $index1 => $marhun) {
-                // dd($marhun);
+                // dd($lelbidmarhun);
                 
                 $status = Pengesahan::where('lelongbidmarhun_id', $lelbidmarhun->lelongbidmarhun_id)
                     ->where('lelongbid_id', $marhun['lelongbid_id'])
                     ->select('status_ubah', 'request_karat', 'request_berat', 'request_marhun')
                     ->first();
-                    // dd($status);
-                    if(isset($status['status_ubah']) == 8 && isset($status['request_karat']) != NULL && isset($status['request_berat']) != NULL && isset($status['request_marhun']) != NULL)//jika mutu,berat dan marhun
+                    // dump($lelbidmarhun->lelongbidmarhun_id);
+                if($status){
+                    if($status->status_ubah == 8 )//jika mutu,berat dan marhun
                     {
                         // dd($status['request_karat']);
                         // if($status['request'])
@@ -992,9 +1003,9 @@ class MarhunController extends Controller
                                         ->first();
                         
                         $newhargaasas = bcdiv($status['request_berat'] * $getkaratnew['harga2'], 1);
-                        // dd($newhargaasas);
+                        // dump($lelbidmarhun->lelongbidmarhun_id);
                     }
-                    else if(isset($status['status_ubah']) == 10 && isset($status['request_berat']) != NULL && isset($status['request_marhun']) != NULL)//jika berat dan marhun
+                    else if($status->status_ubah == 10)//jika berat dan marhun
                     {
                         // dd($status['request_karat']);
                         // if($status['request'])
@@ -1005,7 +1016,7 @@ class MarhunController extends Controller
                         $newhargaasas = bcdiv($status['request_berat'] * $marhun['harga'], 1);
                         // dd($newhargaasas);
                     }
-                    else if(isset($status['status_ubah']) == 9 && isset($status['request_karat']) != NULL && isset($status['request_marhun']) != NULL)//jika mutu dan marhun
+                    else if($status->status_ubah == 9)//jika mutu dan marhun
                     {
                         // dd($status['request_karat']);
                         // if($status['request'])
@@ -1017,7 +1028,7 @@ class MarhunController extends Controller
                         // dd($newhargaasas);
                     }
                    
-                    elseif (isset($status['status_ubah']) == 7 && isset($status['request_marhun']) != NULL) //jika ubah marhun
+                    elseif ($status->status_ubah == 7) //jika ubah marhun
                     {
                         $getkaratnew = LelKarat::where('karat', $marhun['karat'])
                         ->where('lelong_id', $id)
@@ -1026,7 +1037,7 @@ class MarhunController extends Controller
                         $newhargaasas = bcdiv($marhun['berat'] * $marhun['harga'], 1);
                         // dd($newhargaasas);
                     }
-                    elseif(isset($status['status_ubah']) == 5 && isset($status['request_karat']) != NULL && isset($status['request_berat']) != NULL)//jika mutu dan berat berubah
+                    elseif($status->status_ubah == 5)//jika mutu dan berat berubah
                     {
                         // dd($status['request_karat']);
                         // if($status['request'])
@@ -1037,25 +1048,34 @@ class MarhunController extends Controller
                         $newhargaasas = bcdiv($status['request_berat'] * $getkaratnew['harga2'], 1);
                         // dd($newhargaasas);
                     }
-                    elseif(isset($status['status_ubah']) == 1 && isset($status['request_karat']) != NULL)//jika karat berubah
+                    elseif($status->status_ubah == 1)//jika karat berubah
                     {
                         $getkaratnew = LelKarat::where('karat', $status['request_karat'])
                                         ->where('lelong_id', $id)
                                         ->first();
                         $newhargaasas = bcdiv($getkaratnew['harga2'] * $marhun['berat'], 1);
                     }
-                    elseif(isset($status['status_ubah']) == 4 && (isset($status['request_berat'])) != NULL)//jika berat berubah
+                    elseif($status->status_ubah == 4)//jika berat berubah
                     {
                         $getkaratnew = LelKarat::where('karat', $marhun['karat'])
                         ->where('lelong_id', $id)
                         ->first();
                         $newhargaasas = bcdiv($status['request_berat'] * $marhun['harga'], 1);
-                    }elseif (isset($status['status_ubah']) == 2) //jika add marhun
+                    }elseif ($status->status_ubah == 2) //jika add marhun
                     {
+                        // dd($marhun['berat']);
                         $getkaratnew = LelKarat::where('karat', $marhun['karat'])
                         ->where('lelong_id', $id)
                         ->first();
-                        $newhargaasas = bcdiv($status['berat'] * $marhun['harga'], 1);
+                        $newhargaasas = bcdiv($marhun['berat'] * $marhun['harga'], 1);
+                    
+                    }elseif ($status->status_ubah == 3) //jika hapus marhun
+                    {
+                        // dd($marhun['berat']);
+                        $getkaratnew = LelKarat::where('karat', $marhun['karat'])
+                        ->where('lelong_id', $id)
+                        ->first();
+                        $newhargaasas = 0.00;
                     }
                     else
                     {
@@ -1065,41 +1085,51 @@ class MarhunController extends Controller
                         $newhargaasas = bcdiv($marhun['berat'] * $marhun['harga'], 1);
                     }
                    
-                
-                    $totalnewhargaasas =  $totalnewhargaasas  + $newhargaasas;
-                    // dd($totalnewhargaasas);
-                    $lelong = Lelong::where('id', $id)->get();
-                    $sumcajlelong =  $totalnewhargaasas * ($lelong[0]['cajlelong'] / 100);
-                    $totalbaki = $totalnewhargaasas - $lelongbid->pinjaman - $lelongbid->bakiupah - bcdiv($sumcajlelong, 1, 1);
-                    if ($totalbaki > 0) {
-                        $bakilelong = $totalbaki;
-                    } else {
-                        $rugilelong = $totalbaki;
-                    }
-                    
-                    
-              
-                // $marhuns[$index1]['harga_gadai'] = $marhunsgadai['harga'];
-                $marhuns[$index1]['nmarhun_gadai'] = $marhun['old_nmarhun'];
-                $marhuns[$index1]['old_marhun'] = $marhun['marhun'];
-                $marhuns[$index1]['status_ubah'] = $status;
-                $marhuns[$index1]['karatnew'] = $getkaratnew;
-                $marhuns[$index1]['newhargaasas'] = $newhargaasas;
-                $marhuns[$index1]['totalnewhargaasas'] = $totalnewhargaasas;
-                $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman;
-                $marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah;
-                $marhuns[$index1]['baki_lelong'] = $bakilelong;
-                $marhuns[$index1]['rugi_lelong'] = $rugilelong;
-                $marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong, 1, 1);
+                    $marhuns[$index1]['status_ubah'] = $status;
+                }
+                else{ //jika tiada $status
+                    $getkaratnew = LelKarat::where('karat', $marhun['karat'])
+                    ->where('lelong_id', $id)
+                    ->first();
+                    $newhargaasas = bcdiv($marhun['berat'] * $marhun['harga'], 1);
+                }
+                // dump($newhargaasas);
+               
+               
+                $totalnewhargaasas =  $totalnewhargaasas  + $newhargaasas;
+                $lelong = Lelong::where('id', $id)->get();
+                $sumcajlelong =  $totalnewhargaasas * ($lelong[0]['cajlelong'] / 100);
+                $totalbaki = $totalnewhargaasas - $lelongbid->pinjaman - $lelongbid->bakiupah - bcdiv($sumcajlelong, 1, 1);
+                // dd($totalnewhargaasas);
+                if ($totalbaki > 0) {
+                    $bakilelong = $totalbaki;
+                    $rugilelong = 0.00;
+                } else  if ($totalbaki < 0) {
+                    $rugilelong = $totalbaki;
+                    $bakilelong = 0.00;
+                }
+
+                    $marhuns[$index1]['nmarhun_gadai'] = $marhun['old_nmarhun'];
+                    $marhuns[$index1]['old_marhun'] = $marhun['marhun'];
+                    $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman;
+                    $marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah;
+                    $marhuns[$index1]['karatnew'] = $getkaratnew;
+                    $marhuns[$index1]['newhargaasas'] = $newhargaasas;
+                    $marhuns[$index1]['totalnewhargaasas'] = $totalnewhargaasas;
+                    $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman;
+                    $marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah;
+                    $marhuns[$index1]['baki_lelong'] = $bakilelong;
+                    $marhuns[$index1]['rugi_lelong'] = $rugilelong;
+                    $marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong, 1, 1);
             }
             
             array_push($arraylelbidmarhun, $marhuns);
             //  dd($arraylelbidmarhun);
-
-
-           
-
+            
+            
         } 
+        // dd($lelbidmarhun->lelongbidmarhun_id);
+        // dd($totalnewhargaasas);
         return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraylelbidmarhun', 'marhuns', 'gadai'));
     }
 
@@ -1254,6 +1284,21 @@ class MarhunController extends Controller
                         $updatemarhun->n_marhun = $nilaimarhunnew;
                         $updatemarhun->hargaasas =  $hargaasasnew;
                         $updatemarhun->save();
+                    }
+                    else if ($terimalel->status_ubah == 2) //tambah marhun
+                    {
+                        $getkarat = LelKarat::where('karat', $lelongbidmarhuns->karat)
+                        ->where('lelong_id', $request->lelong_id)
+                        ->first();
+                        // dd($getkarat['harga2']);
+                        $nilaimarhunnew =  $lelongbidmarhuns->berat * $getkarat['harga2'];
+                        $hargaasasnew = bcdiv($nilaimarhunnew, 1);
+
+                        $updatemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id)->first();
+                        $updatemarhun->harga = $getkarat['harga2'];
+                        $updatemarhun->n_marhun = $nilaimarhunnew;
+                        $updatemarhun->hargaasas =  $hargaasasnew;
+                        $updatemarhun->save();
                     } else {
                         //
                     }
diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php
index f3d9c29f..46e4155f 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -21,7 +21,7 @@
             <form id="formdelete" action="{{ route('marhun.submitdelete') }}" method="POST">
                 @csrf
                 <input type="hidden" name="type" value="User">
-                <input type="hidden" name="lelongbidmarhun_id" id="lelongbidmarhun_id">
+                <input type="hidden" name="lelongbidmarhun_id" id="lelongbidmarhun_id" >
                 <input type="hidden" name="lelongbid_id" id="lelongbid_id">
             </form>
 
diff --git a/resources/views/marhun/senarailelongterimaserah.blade.php b/resources/views/marhun/senarailelongterimaserah.blade.php
index f394d1ec..ef6abd78 100644
--- a/resources/views/marhun/senarailelongterimaserah.blade.php
+++ b/resources/views/marhun/senarailelongterimaserah.blade.php
@@ -29,7 +29,7 @@
                             @foreach ($lelong as $index)
                             <tr>
                                 <td>{{$loop->iteration}}</td>
-                                <td>{{$index->id}}</td>
+                                <td>{{$index->lelong_id}}</td>
                                 <td>{{$index->tarikh_lelong}}</td>
                                 @if($index->sts_lelong == 0)
                                 <td>
@@ -37,7 +37,7 @@
                                 </td>
                                 @endif
                                 <td>
-                                    <a href="{{route('marhun.terimaserahmarhun', ['lelong_id'=>$index->id])}}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun"><i class="far fa-edit"></i></a>
+                                    <a href="{{route('marhun.terimaserahmarhun', ['lelong_id'=>$index->lelong_id])}}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun"><i class="far fa-edit"></i></a>
                                 </td>
                             </tr>
                             @endforeach
diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php
index 275b8b8a..a5a7f4bd 100644
--- a/resources/views/pengesahan/mutumarhun.blade.php
+++ b/resources/views/pengesahan/mutumarhun.blade.php
@@ -68,35 +68,47 @@
                     <tr>
                         <td>{{ $loop->iteration }}</td>
                         <td>
-                            @if(isset($detail[0]['status_ubah']['request_marhun']) == NULL)
-                                {{ $detail[0]['old_marhun'] }} 
-                            @elseif($detail[0]['old_marhun'] != $detail[0]['status_ubah']['request_marhun'])
-                            {{ $detail[0]['old_marhun'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>{{ $detail[0]['status_ubah']['request_marhun'] }}
-                            @elseif($detail[0]['old_marhun'] == $detail[0]['status_ubah']['request_marhun'])
-                            {{ $detail[0]['old_marhun'] }}
-                            @else
+                            @if(empty($detail[0]['status_ubah']['status_ubah']))
                             {{ $detail[0]['old_marhun'] }} 
+                            @elseif(!empty($detail[0]['status_ubah']['status_ubah']))
+                                @if($detail[0]['status_ubah']['request_marhun'] == NULL)
+                                    {{ $detail[0]['old_marhun'] }} 
+                                @elseif($detail[0]['old_marhun'] != $detail[0]['status_ubah']['request_marhun'])
+                                {{ $detail[0]['old_marhun'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>{{ $detail[0]['status_ubah']['request_marhun'] }}
+                                @elseif($detail[0]['old_marhun'] == $detail[0]['status_ubah']['request_marhun'])
+                                {{ $detail[0]['old_marhun'] }}
+                                @else
+                                {{ $detail[0]['old_marhun'] }} 
+                                @endif
                             @endif
                             {{-- {{ $detail[0]['status_ubah'] }} --}}
                         </td>
                         <td>
-                            @if(isset($detail[0]['status_ubah']['request_karat']) == NULL)
-                                {{ $detail[0]['old_karat'] }} 
-                            @elseif($detail[0]['old_karat'] != $detail[0]['status_ubah']['request_karat'])
-                                {{ $detail[0]['old_karat'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ $detail[0]['status_ubah']['request_karat'] }}
-                            @elseif($detail[0]['old_karat'] == $detail[0]['status_ubah']['request_karat'])
-                                {{ $detail[0]['old_karat'] }}
+                            @if(empty($detail[0]['status_ubah']['status_ubah']))
+                            {{ $detail[0]['old_karat'] }}
+                            @elseif(!empty($detail[0]['status_ubah']['status_ubah']))
+                                @if($detail[0]['status_ubah']['request_karat'] == NULL)
+                                    {{ $detail[0]['old_karat'] }} 
+                                @elseif($detail[0]['old_karat'] != $detail[0]['status_ubah']['request_karat'])
+                                    {{ $detail[0]['old_karat'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ $detail[0]['status_ubah']['request_karat'] }}
+                                @elseif($detail[0]['old_karat'] == $detail[0]['status_ubah']['request_karat'])
+                                    {{ $detail[0]['old_karat'] }}
+                                @endif
                             @endif
                             {{-- {{ $detail[0]['karat'] }} --}}
                         </td>
                      
                         <td>
-                            @if(isset($detail[0]['status_ubah']['request_berat']) == NULL)
-                                {{ $detail[0]['old_berat'] }} 
-                            @elseif($detail[0]['old_berat'] != $detail[0]['status_ubah']['request_berat'])
-                                {{ $detail[0]['old_berat'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ $detail[0]['status_ubah']['request_berat'] }}
-                            @elseif($detail[0]['old_berat'] == $detail[0]['status_ubah']['request_berat'])
-                                {{ $detail[0]['old_berat'] }}
+                            @if(empty($detail[0]['status_ubah']['status_ubah']))
+                            {{ $detail[0]['old_berat'] }}
+                            @elseif(!empty($detail[0]['status_ubah']['status_ubah']))
+                                @if($detail[0]['status_ubah']['request_berat'] == NULL)
+                                    {{ $detail[0]['old_berat'] }} 
+                                @elseif($detail[0]['old_berat'] != $detail[0]['status_ubah']['request_berat'])
+                                    {{ $detail[0]['old_berat'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ $detail[0]['status_ubah']['request_berat'] }}
+                                @elseif($detail[0]['old_berat'] == $detail[0]['status_ubah']['request_berat'])
+                                    {{ $detail[0]['old_berat'] }}
+                                @endif
                             @endif
                             {{-- {{ $detail[0]['berat'] }} --}}
                         </td>
@@ -106,43 +118,34 @@
                              @elseif(!empty($gadai[$index1]['harga']))
                                 {{ number_format ($gadai[$index1]['harga'], 2, '.', ',')  }}
                             @endif</td>
-                        {{-- <td>
-                            @if($detail[0]['old_harga'] != $detail[0]['harga'])
-                                {{ number_format($detail[0]['old_harga'], 2, '.', ',') }}  <i class="btn fa fa-arrow-right" aria-hidden="true"></i>  {{number_format($detail[0]['harga'], 2, '.', ',') }}
-                            @elseif(isset($detail[0]['status_ubah']['request_karat']) == NULL)
-                                {{ $detail[0]['old_harga'] }} 
-                            @elseif($detail[0]['old_harga'] != $detail[0]['karatnew']['harga2'])
-                                {{ number_format($detail[0]['old_harga'], 2, '.', ',') }}  <i class="btn fa fa-arrow-right" aria-hidden="true"></i>  {{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }}
-                            @elseif($detail[0]['old_harga'] == $detail[0]['status_ubah']['request_karat'])
-                                {{ $detail[0]['old_harga'] }}
-                           
-                            @endif
-                        </td> --}}
                         <td>
                             {{-- {{dd($detail[0]['karatnew']['harga2'])}} --}}
-                            @if(isset($detail[0]['status_ubah']['status_ubah']) == 8 && (isset($detail[0]['status_ubah']['request_marhun'])) != NULL && (isset($detail[0]['status_ubah']['request_berat'])) != NULL && (isset($detail[0]['status_ubah']['request_karat'])) != NULL)
-                                {{ number_format($detail[0]['old_harga'], 2, '.', ',') }}  <i class="btn fa fa-arrow-right" aria-hidden="true"></i>  {{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }}
-
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 9 && (isset($detail[0]['status_ubah']['request_marhun'])) != NULL && (isset($detail[0]['status_ubah']['request_karat'])) != NULL)
-                                {{ number_format($detail[0]['old_harga'], 2, '.', ',') }}  <i class="btn fa fa-arrow-right" aria-hidden="true"></i>  {{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }}
-
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 10 && (isset($detail[0]['status_ubah']['request_marhun'])) != NULL && (isset($detail[0]['status_ubah']['request_berat'])) != NULL)
-                                {{ number_format($detail[0]['old_harga'], 2, '.', ',') }}  <i class="btn fa fa-arrow-right" aria-hidden="true"></i>  {{number_format($detail[0]['harga'], 2, '.', ',') }}
-
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 5 && (isset($detail[0]['status_ubah']['request_berat'])) != NULL && (isset($detail[0]['status_ubah']['request_karat'])) != NULL)
-                                {{ number_format($detail[0]['old_harga'], 2, '.', ',') }}  <i class="btn fa fa-arrow-right" aria-hidden="true"></i>  {{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }}
-
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 1 && (isset($detail[0]['status_ubah']['request_karat'])) != NULL)
-                                {{ number_format($detail[0]['old_harga'], 2, '.', ',') }}  <i class="btn fa fa-arrow-right" aria-hidden="true"></i>  {{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }}
-
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 4 && (isset($detail[0]['status_ubah']['request_berat'])) != NULL)
-                                {{ number_format($detail[0]['old_harga'], 2, '.', ',') }}  <i class="btn fa fa-arrow-right" aria-hidden="true"></i>  {{number_format($detail[0]['harga'], 2, '.', ',') }}
-
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 7 && (isset($detail[0]['status_ubah']['request_marhun'])) != NULL)
+                            @if(empty($detail[0]['status_ubah']['status_ubah']))
                                 {{number_format($detail[0]['harga'], 2, '.', ',') }}
-                           
-                            @else
-                              {{number_format($detail[0]['harga'], 2, '.', ',') }}
+                            @elseif(!empty($detail[0]['status_ubah']['status_ubah']))
+                                @if($detail[0]['status_ubah']['status_ubah'] == 8)
+                                    {{ number_format($detail[0]['old_harga'], 2, '.', ',') }}  <i class="btn fa fa-arrow-right" aria-hidden="true"></i>  {{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }}
+
+                                @elseif($detail[0]['status_ubah']['status_ubah'] == 9)
+                                    {{ number_format($detail[0]['old_harga'], 2, '.', ',') }}  <i class="btn fa fa-arrow-right" aria-hidden="true"></i>  {{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }}
+
+                                @elseif($detail[0]['status_ubah']['status_ubah'] == 10)
+                                    {{ number_format($detail[0]['old_harga'], 2, '.', ',') }}  <i class="btn fa fa-arrow-right" aria-hidden="true"></i>  {{number_format($detail[0]['harga'], 2, '.', ',') }}
+
+                                @elseif($detail[0]['status_ubah']['status_ubah'] == 5)
+                                    {{ number_format($detail[0]['old_harga'], 2, '.', ',') }}  <i class="btn fa fa-arrow-right" aria-hidden="true"></i>  {{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }}
+
+                                @elseif($detail[0]['status_ubah']['status_ubah'] == 1)
+                                    {{ number_format($detail[0]['old_harga'], 2, '.', ',') }}  <i class="btn fa fa-arrow-right" aria-hidden="true"></i>  {{number_format($detail[0]['karatnew']['harga2'], 2, '.', ',') }}
+
+                                @elseif($detail[0]['status_ubah']['status_ubah'] == 4)
+                                    {{ number_format($detail[0]['old_harga'], 2, '.', ',') }}  <i class="btn fa fa-arrow-right" aria-hidden="true"></i>  {{number_format($detail[0]['harga'], 2, '.', ',') }}
+
+                                @elseif($detail[0]['status_ubah']['status_ubah'] == 7)
+                                    {{number_format($detail[0]['harga'], 2, '.', ',') }}
+                                @else
+                                 {{number_format($detail[0]['harga'], 2, '.', ',') }}
+                                @endif
                             @endif
                         </td>
                         <td>@if(empty($gadai[$index1]['n_marhun']))
@@ -151,83 +154,63 @@
                             {{ number_format($gadai[$index1]['n_marhun'], 2, '.', ',') }} 
                             @endif
                         </td>
-                        {{-- <td>
-                            @if($detail[0]['status_ubah']['request_karat'] == NULL)
-                                {{ $detail[0]['old_nmarhun'] }} 
-                            @elseif($detail[0]['old_harga'] != $detail[0]['karatnew']['harga2'])
-                                 @php $nilaimarhunnew = ($detail[0]['old_berat'])*($detail[0]['karatnew']['harga2']); @endphp
-                                {{ number_format($detail[0]['old_nmarhun'], 2, '.', ',') }}  <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ number_format($nilaimarhunnew, 2, '.', ',') }}
-                                @elseif($detail[0]['old_harga'] == $detail[0]['status_ubah']['request_karat'])
-                                {{ $detail[0]['old_harga'] }}
-                                @endif
-                        </td> --}}
                         <td>
                             
                             {{-- {{dd($detail[0]['karatnew']['harga2'])}} --}}
-                            @if(isset($detail[0]['status_ubah']['status_ubah']) == 8 && (isset($detail[0]['status_ubah']['request_marhun']) != NULL && isset($detail[0]['status_ubah']['request_berat'])) != NULL && (isset($detail[0]['status_ubah']['request_karat'])) != NULL)
-                                @php 
-                                    // $sumhargaasas = 0;
-                                    $newhargaasas = bcdiv($detail[0]['status_ubah']['request_berat'] * $detail[0]['karatnew']['harga2'], 1);
-                                @endphp
-                                {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ number_format($newhargaasas, 2, '.', ',') }} 
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 9 && (isset($detail[0]['status_ubah']['request_marhun'])) != NULL && (isset($detail[0]['status_ubah']['request_karat'])) != NULL)
-                                @php 
-                                    // $sumhargaasas = 0;
-                                    $newhargaasas = bcdiv($detail[0]['berat'] * $detail[0]['karatnew']['harga2'], 1);
-                                @endphp
-                                {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ number_format($newhargaasas, 2, '.', ',') }} 
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 9 && (isset($detail[0]['status_ubah']['request_marhun'])) != NULL && (isset($detail[0]['status_ubah']['request_berat'])) != NULL)
-                                @php 
-                                    // $sumhargaasas = 0;
-                                    $newhargaasas = bcdiv($detail[0]['status_ubah']['request_berat'] * $detail[0]['karatnew']['harga2'], 1);
-                                @endphp
-                                {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ number_format($newhargaasas, 2, '.', ',') }} 
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 5 && (isset($detail[0]['status_ubah']['request_berat'])) != NULL && (isset($detail[0]['status_ubah']['request_karat'])) != NULL)
-                                @php 
-                                    // $sumhargaasas = 0;
-                                    $newhargaasas = bcdiv($detail[0]['status_ubah']['request_berat'] * $detail[0]['karatnew']['harga2'], 1);
-                                @endphp
-                                {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ number_format($newhargaasas, 2, '.', ',') }} 
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 1 && (isset($detail[0]['status_ubah']['request_karat'])) != NULL)
-                                @php 
-                                    $newhargaasas = bcdiv($detail[0]['berat'] * $detail[0]['karatnew']['harga2'], 1);
-                                @endphp
-                                {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ number_format($newhargaasas, 2, '.', ',') }}
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 4 && (isset($detail[0]['status_ubah']['request_berat'])) != NULL)
-                                @php 
-                                    $newhargaasas = bcdiv($detail[0]['status_ubah']['request_berat'] * $detail[0]['karatnew']['harga2'], 1);
-                                 @endphp
-                                {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ number_format($newhargaasas, 2, '.', ',') }}
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 7 && (isset($detail[0]['status_ubah']['request_marhun'])) != NULL)
-                            @php 
-                                $newhargaasas = bcdiv($detail[0]['berat'] * $detail[0]['karatnew']['harga2'], 1);
-                             @endphp
-                                {{ number_format($newhargaasas, 2, '.', ',') }}
-                        @else
-                                {{ number_format($detail[0]['hargaasas'], 2, '.', ',') }}
+                            @if(empty($detail[0]['status_ubah']['status_ubah']))
+                            {{ number_format($detail[0]['hargaasas'], 2, '.', ',') }}
+                            @elseif(!empty($detail[0]['status_ubah']['status_ubah']))
+                                @if($detail[0]['status_ubah']['status_ubah'] == 8)
+                                    {{-- @php 
+                                        $newhargaasas = bcdiv($detail[0]['status_ubah']['request_berat'] * $detail[0]['karatnew']['harga2'], 1);
+                                    @endphp --}}
+                                    {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }} 
+                                @elseif($detail[0]['status_ubah']['status_ubah'] == 9)
+                                    {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }} 
+                                @elseif($detail[0]['status_ubah']['status_ubah'] == 10)
+                                    {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }} 
+                                @elseif($detail[0]['status_ubah']['status_ubah'] == 5)
+                                    {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }} 
+                                @elseif($detail[0]['status_ubah']['status_ubah'] == 1)
+                                    {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }}
+                                @elseif($detail[0]['status_ubah']['status_ubah'] == 4)
+                                    {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> {{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }}
+                                @elseif($detail[0]['status_ubah']['status_ubah'] == 7)
+                                    {{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }}
+                                @elseif($detail[0]['status_ubah']['status_ubah'] == 3)
+                                    {{ number_format($detail[0]['old_hargaasas'], 2, '.', ',') }}
+                                @else
+                                    {{ number_format($detail[0]['newhargaasas'], 2, '.', ',') }}
+                                @endif
                             @endif
                            
                         </td>
                         <td>
-                            {{-- {{$detail[0]['status_ubah']['status_ubah']}} --}}
-                            @if(isset($detail[0]['status_ubah']['status_ubah']) == 8 && (isset($detail[0]['status_ubah']['request_berat'])) != NULL && (isset($detail[0]['status_ubah']['request_karat'])) != NULL && (isset($detail[0]['status_ubah']['request_marhun'])) != NULL)
-                                <button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU,BERAT & MARHUN</button>
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 10 && (isset($detail[0]['status_ubah']['request_berat'])) != NULL && (isset($detail[0]['status_ubah']['request_marhun'])) != NULL)
-                                <button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN BERAT & MARHUN</button>
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 9 && (isset($detail[0]['status_ubah']['request_karat'])) != NULL && (isset($detail[0]['status_ubah']['request_marhun'])) != NULL)
-                                <button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU & MARHUN</button>
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 5 && (isset($detail[0]['status_ubah']['request_berat'])) != NULL && (isset($detail[0]['status_ubah']['request_karat'])) != NULL)
-                                <button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGURANGAN MUTU & BERAT</button>
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 1 && (isset($detail[0]['status_ubah']['request_karat'])) != NULL)
-                                <button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU</button>
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 4 && (isset($detail[0]['status_ubah']['request_berat'])) != NULL)
-                                <button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGURANGAN BERAT</button>
-                            @elseif(isset($detail[0]['status_ubah']['status_ubah']) == 7 && (isset($detail[0]['status_ubah']['request_marhun'])) != NULL)
-                               
-                                <button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MARHUN</button>
-                            @else
-                               
-                                <button class="btn btn-warning btn-sm hovernone-warning" disabled>TIADA PERUBAHAN</button>
+                            {{-- {{dd($detail[$index1]['status_ubah']['status_ubah'])}} --}}
+                            @if(empty($detail[0]['status_ubah']['status_ubah']))
+                                <button class="btn btn-info btn-sm hovernone-info" disabled>TIADA PERUBAHAN</button>
+                            @elseif(!empty($detail[0]['status_ubah']['status_ubah']))
+                                @if($detail[0]['status_ubah']['status_ubah'] == 8)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU,BERAT & MARHUN</button>
+                                @elseif($detail[0]['status_ubah']['status_ubah']== 10)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN BERAT & MARHUN</button>
+                                @elseif($detail[0]['status_ubah']['status_ubah']== 9)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU & MARHUN</button>
+                                @elseif($detail[0]['status_ubah']['status_ubah']== 5)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGURANGAN MUTU & BERAT</button>
+                                @elseif($detail[0]['status_ubah']['status_ubah']== 1)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU</button>
+                                @elseif($detail[0]['status_ubah']['status_ubah']== 4)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGURANGAN BERAT</button>
+                                @elseif($detail[0]['status_ubah']['status_ubah']== 7)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MARHUN</button>
+                                @elseif($detail[0]['status_ubah']['status_ubah']== 3)
+                                    <button class="btn btn-danger btn-sm hovernone-danger" disabled>MOHON HAPUS MARHUN</button>
+                                @elseif($detail[0]['status_ubah']['status_ubah']== 2)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PENAMBAHAN MARHUN</button>
+                                @else
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>TIADA PERUBAHAN</button>
+                                @endif
                             @endif
                         </td>
                         {{-- <td>
@@ -246,7 +229,7 @@
                             @endif
                         </td> --}}
                     </tr>
-                    @php  $sumhargaasas += $newhargaasas @endphp
+                    {{-- @php  $sumhargaasas += $newhargaasas @endphp --}}
                     {{-- {{ $sumhargaasas }} --}}
                     
                     @endforeach