diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 7fdc7b57..8ec34ebb 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -268,51 +268,56 @@ class MarhunController extends Controller
 
     public function sahubahmutu($id)
     {
-        // dd($request->all());
+
         $mutumarhun = Lelong::join('pengesahan', 'lelong.id', '=', 'pengesahan.lelong_id')
         ->where('lelong.id', $id)
         ->whereNull('disahkan_oleh')
-        ->select(
-            'pengesahan.disahkan_oleh',
-            'pengesahan.id as pengesahan_id',
-            'pengesahan.norujukan',
-            'lelong.id',
-            'lelong.tarikh_lelong',
-            'lelong.harga_emas_asas',
-            'lelong.jbg',
-            'lelong.cajlelong'
-        )
-        ->get();
-
-        return view('pengesahan.perubahanmutumarhun', compact('mutumarhun', 'id'));
-    }
-
-    public function mutumarhun($pengesahan_id, $norujukan, $id)
-    {
-        $pengesahan = Pengesahan::where('id', $pengesahan_id)
-        ->where('lelong_id', $id)
-        ->where('norujukan', $norujukan)
-        ->first();
-
-        $marhuns = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)
-        // ->where('id', $pengesahan->lelongbidmarhun_id)
+        ->selectRaw('count(*) as total, sum(status) as tstat,norujukan')
+        ->groupBy('pengesahan.norujukan')
         ->get()->toArray();
 
-        $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first();
-        $karat = Lelkarat::where('lelong_id', $id)->get();
+        // foreach($mutumarhun as $index1=>$marhun)
+        // {
+        //     $pengesahan = Pengesahan::where('lelong_id', $id)
+        //     ->where('norujukan', $marhun['norujukan'])
+        //     ->select('id as pengesahan_id')
+        //     ->get();
 
-        foreach($marhuns as $index1=>$marhun)
-        {          
-            $status = Pengesahan::where('id', $pengesahan_id)
-            ->where('lelongbid_id', $marhun['lelongbid_id'])
-            ->select('status_ubah')
-            ->value('status_ubah');
+        //     $mutumarhun[$index1]['pengesahan_id'] = $pengesahan;
+        // }
 
-            $gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun'])
-            ->where('norujukan', $lelongbid->norujukan)
-            ->first();
-            if($gadaimarhun)
-            {
+        return view('pengesahan.perubahanmutumarhun', compact('mutumarhun', 'id'));
+
+    }
+
+    public function mutumarhun($norujukan, $id)
+    {
+        $pengesahans = Pengesahan::where('lelong_id', $id)
+        ->where('norujukan', $norujukan)
+        ->get();
+
+        $arraypengesahan = [];
+        foreach($pengesahans as $pengesahan)
+        {
+            // dd($pengesahan);
+            $marhuns = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)
+            ->where('id', $pengesahan->lelongbidmarhun_id)
+            ->get()->toArray();
+
+            $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first();
+            $karat = Lelkarat::where('lelong_id', $id)->get();
+    
+            foreach($marhuns as $index1=>$marhun)
+            {          
+                $status = Pengesahan::where('id', $pengesahan->id)
+                ->where('lelongbid_id', $marhun['lelongbid_id'])
+                ->select('status_ubah')
+                ->value('status_ubah');
+    
+                $gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun'])
+                ->where('norujukan', $lelongbid->norujukan)
+                ->first();
+    
                 $karat = $karat->where('karat', $gadaimarhun->karat)->first();
     
                 $total = $karat->harga * $gadaimarhun->berat;
@@ -326,29 +331,16 @@ class MarhunController extends Controller
                 $marhuns[$index1]['old_hargaasas'] = $hargaasas;
                 $marhuns[$index1]['status_ubah'] = $status;
             }
-            else
-            {
-                $karat = $karat->where('karat', $marhun['karat'])->first();
-    
-                $total = $karat->harga * $marhun['berat'];
-                $hargaasas = round($total); 
-                
-                $marhuns[$index1]['old_marhun'] = $marhun{'marhun'};
-                $marhuns[$index1]['old_karat'] = $marhun['karat'];
-                $marhuns[$index1]['old_berat'] = $marhun['berat'];
-                $marhuns[$index1]['old_harga'] = $karat->harga;
-                $marhuns[$index1]['old_nilaimarhun'] = $total;
-                $marhuns[$index1]['old_hargaasas'] = $hargaasas;
-                $marhuns[$index1]['status_ubah'] = $status;
-            }
-
+            
+            array_push($arraypengesahan,$marhuns);
         }
-        return view('pengesahan.mutumarhun', compact('marhuns', 'lelongbid', 'pengesahan_id', 'norujukan', 'id'));
+
+        return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraypengesahan', 'marhuns'));
     }
 
     public function terimaperubahan(Request $request)
     {
-        // dd($request->all());
+        dd($request->all());
         //update mutu marhun - gadaimarhun
         $user =  Auth::user();
 
diff --git a/resources/views/excel/listnotis_excel.blade.php b/resources/views/excel/listnotis_excel.blade.php
index 8e985d83..d0723604 100644
--- a/resources/views/excel/listnotis_excel.blade.php
+++ b/resources/views/excel/listnotis_excel.blade.php
@@ -77,7 +77,7 @@
                             <td align="left">{{ $loop->iteration }} </td>
                             <td align="left">{{ $pay['nama']}}</td>
                             <td align="left">{{ $pay['norujukan']}}</td>
-                            <td align="left">{{ $pay['telefon']}}</td>
+                            <td align="left">6{{ $pay['telefon']}}</td>
                             <td align="left">{{ $pay['jbg']}}</td>
                             <td align="left">{{ $pay['nokp']}}</td>
                             <td align="left">{{ $pay['pinjaman']}}</td>
diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php
index 33b9ff82..a7309b2b 100644
--- a/resources/views/pengesahan/mutumarhun.blade.php
+++ b/resources/views/pengesahan/mutumarhun.blade.php
@@ -6,7 +6,7 @@
         <div class="col-md-11 mx-auto card p-4">
         <form action="{{ route('pengesahan.terimaperubahan') }}" method="POST" id="formmutumarhun">
                                 @csrf
-                    <input type="hidden" name="pengesahan_id" value="{{ $pengesahan_id }}" />
+                    <input type="hidden" name="norujukan" value="{{ $norujukan }}" />
                     <input type="hidden" name="norujukan" value="{{ $norujukan }}" />
                     <input type="hidden" name="lelong_id" value="{{ $id }}" />
                     <input type="hidden" name="jenis_button" value="terima" id="jenis_button" />
@@ -31,52 +31,52 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach($marhuns as $marhun)
+                        @foreach($arraypengesahan as $index1=>$detail)
                         <tr>
                             <td>{{ $loop->iteration }}</td>
                             <td>{{ $lelongbid->norujukan }}</td>
                             <td>
-                                @if($marhun['old_marhun'] != $marhun['marhun'])
-                                    {{ $marhun['old_marhun'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>
+                                @if($detail[0]['old_marhun'] != $detail[0]['marhun'])
+                                    {{ $detail['old_marhun'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i>
                                 @endif
-                                {{ $marhun['marhun'] }}
+                                {{ $detail[0]['marhun'] }}
                             </td>
                             <td>
-                                @if($marhun['old_karat'] != $marhun['karat'])
-                                    {{ $marhun['old_karat'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> 
+                                @if($detail[0]['old_karat'] != $detail[0]['karat'])
+                                    {{ $detail[0]['old_karat'] }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> 
                                 @endif
-                                {{ $marhun['karat'] }}
+                                {{ $detail[0]['karat'] }}
                             </td>
                             <td>
-                                @if($marhun['old_berat'] != $marhun['berat'])
-                                    {{ number_format($marhun['old_berat'], 2, '.', '') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> 
+                                @if($detail[0]['old_berat'] != $detail[0]['berat'])
+                                    {{ number_format($detail[0]['old_berat'], 2, '.', '') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> 
                                 @endif
-                                {{ $marhun['berat'] }}
+                                {{ $detail[0]['berat'] }}
                             </td>
                             <td>
-                                @if($marhun['old_harga'] != $marhun['harga'])
-                                    {{ number_format($marhun['old_harga'], 2, '.', '') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> 
+                                @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> 
                                 @endif
-                                {{ $marhun['harga'] }}
+                                {{ $detail[0]['harga'] }}
                             </td>
                             <td>
-                                @if($marhun['old_nilaimarhun'] != $marhun['n_marhun'])
-                                    {{ number_format($marhun['old_nilaimarhun'], 2, '.', '') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> 
+                                @if($detail[0]['old_nilaimarhun'] != $detail[0]['n_marhun'])
+                                    {{ number_format($detail[0]['old_nilaimarhun'], 2, '.', '') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> 
                                 @endif
-                                {{ $marhun['n_marhun'] }}
+                                {{ $detail[0]['n_marhun'] }}
                             </td>
                             <td>
-                                @if($marhun['old_hargaasas'] !=  $marhun['hargaasas'])
-                                    {{ number_format($marhun['old_hargaasas'], 2, '.', '') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> 
+                                @if($detail[0]['old_hargaasas'] !=  $detail[0]['hargaasas'])
+                                    {{ number_format($detail[0]['old_hargaasas'], 2, '.', '') }} <i class="btn fa fa-arrow-right" aria-hidden="true"></i> 
                                 @endif
-                                {{ $marhun['hargaasas'] }}
+                                {{ $detail[0]['hargaasas'] }}
                             </td>
                             <td>
-                                @if($marhun['status_ubah'] ==  1)
+                                @if($detail[0]['status_ubah'] ==  1)
                                     <button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU</button>
-                                @elseif($marhun['status_ubah'] == 2)
+                                @elseif($detail[0]['status_ubah'] == 2)
                                     <button class="btn btn-warning btn-sm hovernone-warning" disabled>PENAMBAHAN MARHUN</button>
-                                @elseif($marhun['status_ubah'] == 3)
+                                @elseif($detail[0]['status_ubah'] == 3)
                                     <button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGHAPUSAN MARHUN</button>
                                 @endif
                             </td>
diff --git a/resources/views/pengesahan/perubahanmutumarhun.blade.php b/resources/views/pengesahan/perubahanmutumarhun.blade.php
index e61b1b5e..2e9413e6 100644
--- a/resources/views/pengesahan/perubahanmutumarhun.blade.php
+++ b/resources/views/pengesahan/perubahanmutumarhun.blade.php
@@ -15,22 +15,28 @@
                         <tr>
                             <th>Bil</th>
                             <th>No Rujukan</th>
-                            <th></th>
-                            <th>JBG</th>
-                            <th>Caj Lelong</th>
+                            <th>Status</th>
                             <th class="text-center">Action</th>
                         </tr>
                     </thead>
                     <tbody>
                         @foreach($mutumarhun as $marhun)
                         <tr>
-                            <td>{{ $loop->iteration }}</td>
+                            <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
                             <td>{{ $marhun['norujukan'] }}</td>
-                            <td>{{ $marhun['harga_emas_asas'] }}</td>
-                            <td>{{ $marhun['jbg'] }}</td>
-                            <td>{{ $marhun['cajlelong'] }}</td>
                             <td>
-                                <a href=" {{ route('pengesahan.mutumarhun', ['pengesahan_id'=>$marhun['pengesahan_id'], 'norujukan'=>$marhun['norujukan'], 'id'=>$marhun['id']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Mutu Marhun"><i class="far fa-edit"></i></a>
+                                @if($marhun['total'] === intval($marhun['tstat']))
+                                    <button class="btn btn-success btn-sm hovernone-success" disabled>TERIMA</button>
+                                @else
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>BELUM SAHKAN</button>
+                                @endif
+                            </td>
+                            <td>
+                                @if($marhun['total'] !== intval($marhun['tstat']))
+                                    <a href=" {{ route('pengesahan.mutumarhun', ['norujukan'=>$marhun['norujukan'], $id]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Mutu Marhun"><i class="far fa-edit"></i></a>
+                                @else
+                                    <button class="btn btn-success btn-sm hovernone-success" disabled>BERJAYA DISAHKAN</button>
+                                @endif
                             </td>
                         </tr>
                         @endforeach
diff --git a/routes/web.php b/routes/web.php
index 9ae74ef5..1cddffab 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -169,7 +169,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid
 Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () {
     Route::get('/senarailelongubahmutu',['as'=>'pengesahan.senarailelongubahmutu','uses'=>'MarhunController@senarailelongubahmutu']); 
     Route::get('/perubahanmutumarhun/{id}',['as'=>'pengesahan.perubahanmutumarhun','uses'=>'MarhunController@sahubahmutu']);
-    Route::get('/mutumarhun/{pengesahan_id}/{norujukan}/{id}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']);
+    Route::get('/mutumarhun/{norujukan}/{id}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']);
     Route::post('/terimaperubahan',['as'=>'pengesahan.terimaperubahan','uses'=>'MarhunController@terimaperubahan']);
     Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']);
     Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']);