diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 2903a88b..de48022c 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -709,7 +709,7 @@ class LelongController extends Controller
                             $lelongbidmarhun->old_marhun = $simbidmarhun->marhun;
                             $lelongbidmarhun->old_karat = $simbidmarhun->karat;
                             $lelongbidmarhun->old_berat = $simbidmarhun->berat;
-                            $lelongbidmarhun->old_harga = $simbidmarhun->harga;
+                            $lelongbidmarhun->old_harga = $simbidmarhun->old_harga;
                             $lelongbidmarhun->old_nmarhun = $simbidmarhun->n_marhun;
                             $lelongbidmarhun->old_hargaasas = $simbidmarhun->hargaasas;
                             $lelongbidmarhun->karat = $simbidmarhun->karat;
diff --git a/app/Http/Controllers/LelongUjrahController.php b/app/Http/Controllers/LelongUjrahController.php
index 3e5a11da..13fda146 100644
--- a/app/Http/Controllers/LelongUjrahController.php
+++ b/app/Http/Controllers/LelongUjrahController.php
@@ -143,7 +143,7 @@ class LelongUjrahController extends Controller
                             $lelongbidmarhun->old_marhun = $simbidmarhun->marhun;
                             $lelongbidmarhun->old_karat = $simbidmarhun->karat;
                             $lelongbidmarhun->old_berat = $simbidmarhun->berat;
-                            $lelongbidmarhun->old_harga = $simbidmarhun->harga;
+                            $lelongbidmarhun->old_harga = $simbidmarhun->old_harga;
                             $lelongbidmarhun->old_nmarhun = $simbidmarhun->n_marhun;
                             $lelongbidmarhun->old_hargaasas = $simbidmarhun->hargaasas;
                             $lelongbidmarhun->karat = $simbidmarhun->karat;
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 6603d1e8..7ac1d92a 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -1006,49 +1006,56 @@ class ReportController extends Controller
     }
 
 
-    public function lapubahmarhunlelongindex ($lelong_id, $kodcaw){
-
-        $cawangan = Pengesahan::join('lelongbid','lelongbid.norujukan','=','pengesahan.norujukan')
+    public function lapubahmarhunlelongindex($lelong_id, $kodcaw)
+{
+    $cawangan = Pengesahan::join('lelongbid', 'lelongbid.norujukan', '=', 'pengesahan.norujukan')
         ->where('pengesahan.lelong_id', $lelong_id)
         ->where('pengesahan.status', 1)
-        ->where('pengesahan.norujukan', 'LIKE', '%'.$kodcaw.'%')
+        ->where('pengesahan.norujukan', 'LIKE', '%' . $kodcaw . '%')
         ->whereNotNull('pengesahan.disahkan_oleh')
-        ->select('pengesahan.lelongbid_id','pengesahan.lelongbidmarhun_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id')
-        ->orderBy('pengesahan.lelongbid_id')
+        ->select(
+            'pengesahan.lelongbid_id',
+            'pengesahan.lelongbidmarhun_id',
+            'pengesahan.diminta_oleh',
+            'pengesahan.disahkan_oleh',
+            'pengesahan.disahkan_pada',
+            'pengesahan.norujukan',
+            'pengesahan.lelong_id'
+        )
+        ->groupBy('pengesahan.norujukan') // Group by norujukan to ensure uniqueness
         ->distinct()
         ->get();
 
-        foreach($cawangan as $index1=>$caw)
-        {
-            
-            $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
-
-            $getdisahkanoleh = User::where('id', $caw['disahkan_oleh'])->first();
-            $getdimintaoleh = User::where('id', $caw['diminta_oleh'])->first();
-
-            $status = Pengesahan::where('lelongbid_id', $caw['lelongbid_id'])
-            ->select('id as sahid','status_ubah', 'request_karat', 'request_berat', 'request_marhun')
-            ->orderBy('pengesahan.lelongbidmarhun_id','asc')
-            ->get();
-
-          
-            $marhuns = LelongBidMarhun::join('pengesahan','pengesahan.lelongbidmarhun_id','=','lelongbidmarhun.id')
-            ->where('pengesahan.lelongbid_id', $caw['lelongbid_id'])
-            ->orderBy('pengesahan.lelongbidmarhun_id','asc')
-            ->get()
-            ->toArray();
-            $cawangan[$index1]['namacaw'] = $getpengesahan['caw_name'];
-            $cawangan[$index1]['disahkan_oleh'] = $getdisahkanoleh['name'];
-            $cawangan[$index1]['diminta_oleh'] = $getdimintaoleh['name'];
-            $cawangan[$index1]['detailmarhun']=$status;
-            $cawangan[$index1]['detail']=$marhuns;
-        }
-
+    foreach ($cawangan as $index1 => $caw) {
         $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
 
+        $getdisahkanoleh = User::where('id', $caw['disahkan_oleh'])->first();
+        $getdimintaoleh = User::where('id', $caw['diminta_oleh'])->first();
 
-       return view('marhun.ubahmarhun', compact('cawangan','lelong_id','getpengesahan'));
+        $status = Pengesahan::where('lelongbid_id', $caw['lelongbid_id'])
+            ->select('id as sahid', 'status_ubah', 'request_karat', 'request_berat', 'request_marhun')
+            ->orderBy('pengesahan.lelongbidmarhun_id', 'asc')
+            ->get();
+
+        $marhuns = LelongBidMarhun::join('pengesahan', 'pengesahan.lelongbidmarhun_id', '=', 'lelongbidmarhun.id')
+            ->where('pengesahan.lelongbid_id', $caw['lelongbid_id'])
+            ->orderBy('pengesahan.lelongbidmarhun_id', 'asc')
+            ->get()
+            ->toArray();
+
+        $cawangan[$index1]['namacaw'] = $getpengesahan['caw_name'];
+        $cawangan[$index1]['disahkan_oleh'] = $getdisahkanoleh['name'];
+        $cawangan[$index1]['diminta_oleh'] = $getdimintaoleh['name'];
+        $cawangan[$index1]['detailmarhun'] = $status;
+        $cawangan[$index1]['detail'] = $marhuns;
     }
+    $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
+
+    return view('marhun.ubahmarhun', compact('cawangan', 'lelong_id', 'getpengesahan'));
+}
+
+   
+   
 
     public function exportubahmarhun (){
 
@@ -1266,16 +1273,25 @@ class ReportController extends Controller
 
     public function lapubahmarhunlelongindexpdf ($lelong_id, $kodcaw, $t_lelong){
 
-        $cawangan = Pengesahan::join('lelongbid','lelongbid.norujukan','=','pengesahan.norujukan')
+        $cawangan = Pengesahan::join('lelongbid', 'lelongbid.norujukan', '=', 'pengesahan.norujukan')
         ->where('pengesahan.lelong_id', $lelong_id)
         ->where('pengesahan.status', 1)
-        ->where('pengesahan.norujukan', 'LIKE', '%'.$kodcaw.'%')
+        ->where('pengesahan.norujukan', 'LIKE', '%' . $kodcaw . '%')
         ->whereNotNull('pengesahan.disahkan_oleh')
-        ->select('pengesahan.lelongbid_id','pengesahan.lelongbidmarhun_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id')
-        ->orderBy('pengesahan.lelongbid_id')
+        ->select(
+            'pengesahan.lelongbid_id',
+            'pengesahan.lelongbidmarhun_id',
+            'pengesahan.diminta_oleh',
+            'pengesahan.disahkan_oleh',
+            'pengesahan.disahkan_pada',
+            'pengesahan.norujukan',
+            'pengesahan.lelong_id'
+        )
+        ->groupBy('pengesahan.norujukan') // Group by norujukan to ensure uniqueness
         ->distinct()
         ->get();
 
+
         foreach($cawangan as $index1=>$caw)
         {
             
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 518f05bc..2623402a 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -390,6 +390,7 @@ class SimulasiController extends Controller
                         $simmarhun->nota = $marhun->nota;
                         $simmarhun->karat = $marhun->karat;
                         $simmarhun->berat = $marhun->berat;
+                        $simmarhun->old_harga = $marhun->harga;
                         $simmarhun->harga = $simkarattemp[$marhun->karat]->harga;
                         $simmarhun->n_marhun = $marhun->n_marhun;
                         $simmarhun->hargaasas = $val;
diff --git a/app/Http/Controllers/SimulasiUjrahController.php b/app/Http/Controllers/SimulasiUjrahController.php
index 757d7469..7b12db4a 100644
--- a/app/Http/Controllers/SimulasiUjrahController.php
+++ b/app/Http/Controllers/SimulasiUjrahController.php
@@ -329,6 +329,7 @@ class SimulasiUjrahController extends Controller
                         $simmarhun->nota = $marhun->nota;
                         $simmarhun->karat = $marhun->karat;
                         $simmarhun->berat = $marhun->berat;
+                        $simmarhun->old_harga = $marhun->harga;
                         $simmarhun->harga = $simkarattemp[$marhun->karat]->harga;
                         $simmarhun->n_marhun = $marhun->n_marhun;
                         $simmarhun->hargaasas = $val;
diff --git a/database/migrations/2025_01_20_162907_add_old_harga_column_to_simulasibidmarhun.php b/database/migrations/2025_01_20_162907_add_old_harga_column_to_simulasibidmarhun.php
new file mode 100644
index 00000000..d37c8f3c
--- /dev/null
+++ b/database/migrations/2025_01_20_162907_add_old_harga_column_to_simulasibidmarhun.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddOldHargaColumnToSimulasibidmarhun extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('simulasibidmarhun', function (Blueprint $table) {
+            $table->decimal('old_harga', $precision = 9, $scale = 2)->nullable();
+            //
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('simulasibidmarhun', function (Blueprint $table) {
+            $table->dropColumn('old_harga');
+            //
+        });
+    }
+}
diff --git a/resources/views/marhun/ubahmarhun.blade.php b/resources/views/marhun/ubahmarhun.blade.php
index 07db5462..7b39d821 100644
--- a/resources/views/marhun/ubahmarhun.blade.php
+++ b/resources/views/marhun/ubahmarhun.blade.php
@@ -14,164 +14,144 @@
                     </div>
                 </div>
                 <div class="card-body">
-            @if ($message = Session::get('success'))
-                <div class="alert alert-success">
-                    <p>{{ $message }}</p>
+                    @if ($message = Session::get('success'))
+                        <div class="alert alert-success">
+                            <p>{{ $message }}</p>
+                        </div>
+                    @endif
+                    <div class="table-responsive">
+                        <table class="table table-bordered table-hover align-middle text-center" id="tablelelong" style="width:100%">
+                            <thead class="bg-primary text-white">
+                                <tr>
+                                    <th>Bil</th>
+                                    <th>No Rujukan</th>
+                                    <th>Perubahan</th>
+                                    <th>Marhun Asal</th>
+                                    <th>Marhun Baru</th>
+                                    <th>Mutu Asal</th>
+                                    <th>Mutu Baru</th>
+                                    <th>Harga Asal</th>
+                                    <th>Harga Baru</th>
+                                    <th>Berat Asal (gm)</th>
+                                    <th>Berat Baru (gm)</th>
+                                    <th>Diminta Oleh</th>
+                                    <th>Disahkan Oleh</th>
+                                    <th>Status</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                @forelse($cawangan as $marhun)
+                                    <tr>
+                                        <td>{{ $loop->iteration }}</td>
+                                        <td style="white-space: nowrap;">{{ $marhun['norujukan'] }}</td>
+                                        <td style="white-space: nowrap;">
+                                            @foreach ($marhun['detailmarhun'] as $index => $item)
+                                                {{ $index + 1 }}. {{ statusUbahText($item['status_ubah']) }}<br>
+                                            @endforeach
+                                        </td>
+                                        <td>
+                                            @foreach ($marhun['detail'] as $item)
+                                                {{ $item['old_marhun'] }}<br>
+                                            @endforeach
+                                        </td>
+                                        <td style="white-space: nowrap;">
+                                            @foreach ($marhun['detailmarhun'] as $item)
+                                                @if ($item['request_marhun'])
+                                                    <i class="btn fa fa-arrow-right" style="font-size: 10px"></i> 
+                                                    {{ $item['request_marhun'] }}
+                                                @endif
+                                                <br>
+                                            @endforeach
+                                        </td>
+                                        <td>
+                                            @foreach ($marhun['detail'] as $item)
+                                                {{ $item['old_karat'] }}<br>
+                                            @endforeach
+                                        </td>
+                                        <td style="white-space: nowrap;">
+                                            @foreach ($marhun['detailmarhun'] as $item)
+                                                @if ($item['request_karat'])
+                                                    <i class="btn fa fa-arrow-right" style="font-size: 10px"></i> 
+                                                    {{ $item['request_karat'] }}
+                                                @endif
+                                                <br>
+                                            @endforeach
+                                        </td>
+                                        <td>
+                                            @foreach ($marhun['detail'] as $item)
+                                                {{ $item['old_harga'] }}<br>
+                                            @endforeach
+                                        </td>
+                                        <td>
+                                            @foreach ($marhun['detail'] as $item)
+                                                {{ $item['harga'] }}<br>
+                                            @endforeach
+                                        </td>
+                                        <td>
+                                            @foreach ($marhun['detail'] as $item)
+                                                {{ $item['old_berat'] }}<br>
+                                            @endforeach
+                                        </td>
+                                        <td style="white-space: nowrap;">
+                                            @foreach ($marhun['detailmarhun'] as $item)
+                                                @if ($item['request_berat'])
+                                                    <i class="btn fa fa-arrow-right" style="font-size: 10px"></i> 
+                                                    {{ $item['request_berat'] }}
+                                                @endif
+                                                <br>
+                                            @endforeach
+                                        </td>
+                                        <td>{{ $marhun['diminta_oleh'] }}</td>
+                                        <td>{{ $marhun['disahkan_oleh'] }}</td>
+                                        <td>
+                                            <button class="btn btn-success btn-sm" disabled>BERJAYA DISAHKAN</button>
+                                        </td>
+                                    </tr>
+                                @empty
+                                    <tr>
+                                        <td colspan="14">No Data</td>
+                                    </tr>
+                                @endforelse
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
-            @endif
-                <table class='table text-center table-bordered table-hover' id="tablelelong" style="width:100%">
-                    <thead class="bg-primary text-white">
-                        <tr>
-                            <th>Bil</th>
-                            <th>No Rujukan</th>
-                            <th>Perubahan</th>
-                            <th>Marhun Asal</th>
-                            <th>Marhun Baru</th>
-                            <th>Mutu Asal</th>
-                            <th>Mutu Baru</th>
-                            <th>Berat Asal (gm)</th>
-                            <th>Berat Baru (gm)</th>
-                            <th>Diminta Oleh</th>
-                            <th>Disahkan Oleh</th>
-                            <th>Status</th>
-                           
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @forelse($cawangan as $marhun)
-                        <tr>
-                            <td>{{ $loop->iteration }}</td>
-                            <td style="white-space: nowrap;">{{ $marhun['norujukan'] }}</td>
-                            <td style="white-space: nowrap;">
-                                @php
-                                    $count = 1;
-                                @endphp
-                            @foreach ($marhun['detailmarhun'] as $item)
-                                {{ $count++ }}.
-                                    @if($item['status_ubah'] == 1)
-                                    Mutu 
-                                    @elseif($item['status_ubah'] == 2)
-                                    Tambah Marhun 
-                                    @elseif($item['status_ubah'] == 3)
-                                    Hapus Marhun 
-                                    @elseif($item['status_ubah'] == 4)
-                                    Berat 
-                                    @elseif($item['status_ubah'] == 5)
-                                    Mutu & Berat 
-                                    @elseif($item['status_ubah'] == 7)
-                                    Marhun 
-                                    @elseif($item['status_ubah'] == 8)
-                                    Mutu, Berat & Marhun 
-                                    @elseif($item['status_ubah'] == 9)
-                                    Mutu & Marhun 
-                                    @elseif($item['status_ubah'] == 10)
-                                    Berat & Marhun
-                                @endif
-                                <br>
-                              @endforeach</td>
-                              <td>@foreach ($marhun['detail'] as $item)
-                                {{$item['old_marhun']}}<br>
-                                @endforeach</td>
-                              <td style="white-space: nowrap;">@foreach ($marhun['detailmarhun'] as $item)
-                                @if($item['request_marhun'] == null)
-                                @else
-                                 <i class="btn fa fa-arrow-right" aria-hidden="true" style="font-size: 10px"></i> 
-                                @endif {{$item['request_marhun']}}<br>
-                                @endforeach</td>
-                                <td>@foreach ($marhun['detail'] as $item)
-                                    {{$item['old_karat']}}<br>
-                                    @endforeach</td>
-                                <td style="white-space: nowrap;">@foreach ($marhun['detailmarhun'] as $item)
-                                    @if($item['request_karat'] == null)
-                                    @else
-                                     <i class="btn fa fa-arrow-right" aria-hidden="true" style="font-size: 10px"></i> 
-                                    @endif{{$item['request_karat']}}<br>
-                                @endforeach</td>
-                                <td>@foreach ($marhun['detail'] as $item)
-                                    {{$item['old_berat']}}<br>
-                                    @endforeach</td>
-                              <td style="white-space: nowrap;">@foreach ($marhun['detailmarhun'] as $item)
-                                @if($item['request_berat'] == null)
-                                @else
-                                 <i class="btn fa fa-arrow-right" aria-hidden="true" style="font-size: 10px"></i> 
-                                @endif{{$item['request_berat']}}<br>
-                                @endforeach</td>
-                            
-                                <td>{{ $marhun['diminta_oleh'] }}</td>
-                                <td>{{ $marhun['disahkan_oleh'] }}</td>
-                            <td><button class="btn btn-success btn-sm hovernone-success" disabled>BERJAYA DISAHKAN</button></td>
-                        
-                        </tr>
-                        @empty
-                        <tr>
-                            <td colspan="12">No Data</td>
-                        </tr>
-    
-                @endforelse
-                    </tbody>
-                    
-                </table>
-            <div class="modal-footer" style="margin-top:2%;">
+                <div class="modal-footer mt-4"></div>
             </div>
         </div>
     </div>
 </div>
+@php
+function statusUbahText($statusUbah) {
+    switch ($statusUbah) {
+        case 1: return 'Mutu';
+        case 2: return 'Tambah Marhun';
+        case 3: return 'Hapus Marhun';
+        case 4: return 'Berat';
+        case 5: return 'Mutu & Berat';
+        case 7: return 'Marhun';
+        case 8: return 'Mutu, Berat & Marhun';
+        case 9: return 'Mutu & Marhun';
+        case 10: return 'Berat & Marhun';
+        default: return '';
+    }
+}
+@endphp
+
 <script>
-    //Enable tooltips everywhere
     $(function () {
-        $('[data-toggle="tooltip"]').tooltip()
-    })
-    
-    var tablelelong = $('#tablelelong').DataTable( {
-        "columnDefs": [ 
-            {
-            "targets": 0,
-            "orderable": false
-            }, 
-            {
-            "targets": 4,
-            "orderable": false
-            }
-        ],
-        order: [[0, 'asc']],
-        // "ordering": false,
-        "info": false,
-        "lengthChange": false,
-        "pageLength": 15,
-        // dom: 'Bfrtip',
-        // buttons: [
-        //     // 'copy', 'excel', 'pdf'
-        //     // { text: 'copy', className: 'btn btn-primary' },
-        //     {
-        //         className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
-        //         text: '<i class="fas fa-plus" id="test"></i>',
-        //         titleAttr: 'Tambah Simulasi',
-        //         action: function ( e, dt, node, config ) {
-        //             alert( 'Button activated' );
-        //         }
-        //     },
-        //     {
-        //         className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
-        //         titleAttr: 'Export to CSV',
-        //         text: '<i class="fas fa-download"></i>',
-        //         action: function ( e, dt, node, config ) {
-        //             $("#exportform").submit();
-        //         }
-        //     }
-        // ]
+        $('[data-toggle="tooltip"]').tooltip();
     });
 
-    // $('.addsim').tooltip();
-    // $('.export').tooltip();
-    // // $( '.dt-buttons').addClass('btn-group');
-    // $( '.addsim').removeClass('dt-button');
-    // $( '.export').removeClass('dt-button');
-
-    // function selectall(cb) {
-    //     tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
-    //         $(this).prop('checked', cb.checked);
-    //     })
-    // }
+    $('#tablelelong').DataTable({
+        columnDefs: [
+            { targets: 0, orderable: false },
+            { targets: 4, orderable: false },
+        ],
+        order: [[0, 'asc']],
+        info: false,
+        lengthChange: false,
+        pageLength: 15,
+    });
 </script>
-     
 @endsection
diff --git a/resources/views/pdf/laporanubahmarhun.blade.php b/resources/views/pdf/laporanubahmarhun.blade.php
index 5615d121..0dcd93cd 100644
--- a/resources/views/pdf/laporanubahmarhun.blade.php
+++ b/resources/views/pdf/laporanubahmarhun.blade.php
@@ -124,6 +124,8 @@ tr:nth-child(even) {
                             <th align="left">Marhun Baru</th>
                             <th align="center">Mutu Asal</th>
                             <th align="center">Mutu Baru</th>
+                            <th align="center">Harga Asal</th>
+                            <th align="center">Harga Baru</th>
                             <th align="right">Berat Asal (gm)</th>
                             <th align="right">Berat Baru (gm)</th>
                             <th align="left">Diminta Oleh</th>
@@ -177,6 +179,16 @@ tr:nth-child(even) {
                                      <i class="btn fa fa-arrow-right" aria-hidden="true" style="font-size: 10px"></i> 
                                     @endif{{$item['request_karat']}}<br>
                                 @endforeach</td>
+                                <td>
+                                            @foreach ($marhun['detail'] as $item)
+                                                {{ $item['old_harga'] }}<br>
+                                            @endforeach
+                                        </td>
+                                        <td>
+                                            @foreach ($marhun['detail'] as $item)
+                                                {{ $item['harga'] }}<br>
+                                            @endforeach
+                                        </td>
                                 <td align="right">@foreach ($marhun['detail'] as $item)
                                     {{$item['old_berat']}}<br>
                                     @endforeach</td>