diff --git a/app/Http/Controllers/OperasiController.php b/app/Http/Controllers/OperasiController.php
index 001324f..4cad65d 100644
--- a/app/Http/Controllers/OperasiController.php
+++ b/app/Http/Controllers/OperasiController.php
@@ -338,4 +338,81 @@ class OperasiController extends Controller
         
         return view('operasi.edit_marginmutu', compact('cawangan_info', 'api_url'));
     }
+
+    public function laporanAudit()
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        
+        return view('homepage.operasi.laporan-audit', compact('cawangan_info', 'api_url'));
+    }
+
+    public function cetakLaporanAuditTrail(Request $request)
+    {
+        $api_url = config('api.url');
+        $auth_user = Auth::user();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh_cetak = $current->toDateString();
+
+        if($request->dateaudit == null){
+            $date = $current->toDateString();
+        }else{
+            $split_date = explode('-', $request->dateaudit);
+            $date = $split_date[0] . '-' . $split_date[1] . '-' . $split_date[2];
+        }
+
+        if($request->dateaudit_till == null){
+            $date_till = $current->toDateString();
+        }else{
+            $split_date_till = explode('-', $request->dateaudit_till);
+            $date_till = $split_date_till[0] . '-' . $split_date_till[1] . '-' . $split_date_till[2];
+        }
+
+        $audittrail_raw = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/reports/audittrail/operasi',['date' => $date,'date_till' => $date_till])->json();
+        if(!$audittrail_raw){
+            return redirect()->back()->with('errormessage', 'Tiada data pada tarikh tersebut.');
+        }
+
+        // Transform the data to match view format
+        $audittrail = [];
+        foreach($audittrail_raw as $item) {
+            $created_at = \Carbon\Carbon::parse($item['created_at']);
+            
+            // Format differences for display
+            $differences_text = '-';
+            if (isset($item['differences']) && !empty($item['differences'])) {
+                $diff_parts = [];
+                foreach ($item['differences'] as $field => $changes) {
+                    $old = $changes['old'] ?? 'null';
+                    $new = $changes['new'] ?? 'null';
+                    $diff_parts[] = "{$field}: {$old} → {$new}";
+                }
+                $differences_text = implode('; ', $diff_parts);
+            }
+            
+            $audittrail[] = [
+                'tarikh' => $created_at->format('d/m/Y'),
+                'masa' => $created_at->format('H:i:s'),
+                'users' => $item['users'],
+                'actions' => $item['actions'],
+                'differ' => $differences_text
+            ];
+        }
+
+        $cawangan_detail = [
+            'kodcaw' => 'operasi',
+            'namacaw' => 'Operasi Ar-Rahn',
+            'alamat1' => 'Lot 107, Jalan Parit Dalam,',
+            'alamat2' => 'Seksyen 8',
+            'poskod' => '15000',
+            'bandar' => 'Kota Bahru',
+            'negeri' => 'Kelantan',
+            'notel' => '03-12345678',
+            'nofaks' => '03-12345678',
+        ];
+
+        return view('print.laporan_audittrail_operasi', compact('audittrail','cawangan_detail','tarikh_cetak','date','date_till','api_url'));
+    }
 }
diff --git a/resources/views/gadaian/v2/index.blade.php b/resources/views/gadaian/v2/index.blade.php
index ce1d84f..3cf5f94 100644
--- a/resources/views/gadaian/v2/index.blade.php
+++ b/resources/views/gadaian/v2/index.blade.php
@@ -107,8 +107,8 @@
                                 <th>Nilai Marhun</th>
                                 <th>Margin Teller (%)</th>
                                 <th>Margin PC (%)</th>
-                                <th>Nilai Marhun Teller</th>
-                                <th>Nilai Marhun PC</th>
+                                <th>Pembiayaan Teller</th>
+                                <th>Pembiayaan PC</th>
                             </tr>
                         </thead>
                         <tbody id="marginTableBody">
@@ -1915,18 +1915,35 @@
     
     $('#toggleTableBtn').on('click', function() {
         if (!isMarginTableVisible) {
+            // Check if main table has data before showing margin table
+            let tableData = $('#myTable').DataTable().data();
+            if (tableData.length === 0) {
+                Swal.fire({
+                    icon: 'warning',
+                    title: 'Amaran!',
+                    text: 'Tiada data marhun untuk papar margin. Sila daftar marhun terlebih dahulu.'
+                });
+                return;
+            }
+            
             // Show margin table, hide main table
             $('#myTable_wrapper').hide();
             $('#marginTable').show();
             $(this).html('<i class="fas fa-exchange-alt"></i> Papar Marhun');
             loadMarginData();
             isMarginTableVisible = true;
+            
+            // Disable Daftar Marhun button when margin table is visible
+            $('button[data-target="#daftar_marhun"]').prop('disabled', true);
         } else {
             // Show main table, hide margin table
             $('#marginTable_wrapper').hide();
             $('#myTable_wrapper').show();
             $(this).html('<i class="fas fa-exchange-alt"></i> Papar Margin');
             isMarginTableVisible = false;
+            
+            // Enable Daftar Marhun button when main table is visible
+            $('button[data-target="#daftar_marhun"]').prop('disabled', false);
         }
     });
     
diff --git a/resources/views/homepage/operasi/home.blade.php b/resources/views/homepage/operasi/home.blade.php
index a86275b..b327950 100644
--- a/resources/views/homepage/operasi/home.blade.php
+++ b/resources/views/homepage/operasi/home.blade.php
@@ -3,7 +3,7 @@
 @section('content')
 <div class="container">
     <div class="row justify-content-center  mt-5">
-        <div class="col-md-8">
+        <div class="col-md-12">
             <div class="card">
                
                 <nav aria-label="breadcrumb">
@@ -19,7 +19,9 @@
                     <a href="{{ route('parameter') }}" class="btn btn-info btn-lg">Parameter</a>
                     <a href="{{ route('komuditi') }}" class="btn btn-info btn-lg">Komoditi</a>
                     <a href="{{ route('perubatan') }}" class="btn btn-info btn-lg">Perubatan</a>
+                    <a href="{{ route('operasi.laporan.audit') }}" class="btn btn-info btn-lg">Laporan Audit</a>
                 </div>
+                
             </div>
         </div>
     </div>
diff --git a/resources/views/homepage/operasi/laporan-audit.blade.php b/resources/views/homepage/operasi/laporan-audit.blade.php
new file mode 100644
index 0000000..afffb68
--- /dev/null
+++ b/resources/views/homepage/operasi/laporan-audit.blade.php
@@ -0,0 +1,46 @@
+@extends('layouts.app_operasi')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center mt-5">
+        <div class="col-md-10">
+            <div class="card">
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                        <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                        <li class="breadcrumb-item active" aria-current="page">Laporan Audit</li>
+                    </ol>
+                </nav>
+
+                <div class="card-header">
+                    <h4 class="text-center">Laporan Audit</h4>
+                </div>
+
+                <div class="card-body">
+                    <form action="{{ route('operasi.audittrail.laporancetak') }}" method="GET">
+                        <div class="row">
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    <label for="dateaudit">Tarikh Mula:</label>
+                                    <input type="date" class="form-control" id="dateaudit" name="dateaudit" required>
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    <label for="dateaudit_till">Tarikh Akhir:</label>
+                                    <input type="date" class="form-control" id="dateaudit_till" name="dateaudit_till" required>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="text-center">
+                            <button type="submit" class="btn btn-info btn-lg">
+                                <i class="fas fa-route"></i> Generate Audit Trail
+                            </button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/modal/editmarhun.blade.php b/resources/views/modal/editmarhun.blade.php
index a40407c..5b95402 100644
--- a/resources/views/modal/editmarhun.blade.php
+++ b/resources/views/modal/editmarhun.blade.php
@@ -63,7 +63,7 @@
                     @endforeach
                   </select>
                 </div>
-                <div class="col-md-4">Berat</div>
+                <div class="col-md-4">Berat Bersih</div>
                 <div class="col-md-8"><input type="text" class="form-control" name="berat_edit" id="berat_edit" onkeyup="calculationharga(this)"/></div>
                 <div class="col-md-4">Harga</div>
                 <div class="col-md-8"><input type="text" name="harga_edit" id="harga_edit" class="form-control" readonly/></div>
diff --git a/resources/views/print/laporan_audittrail_operasi.blade.php b/resources/views/print/laporan_audittrail_operasi.blade.php
new file mode 100644
index 0000000..bb19ab3
--- /dev/null
+++ b/resources/views/print/laporan_audittrail_operasi.blade.php
@@ -0,0 +1,261 @@
+<style>
+#header {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#header td, #customers th {
+ 
+  padding:4px;
+  font-size:10px;
+}
+
+#header tr:nth-child(even){background-color: #ffffff;}
+
+#header tr:hover {background-color: #ddd;}
+
+#header th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+<style>
+#scan {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#scan td, #scan th {
+ 
+  padding: 8px;
+  font-size:11px;
+}
+
+#scan tr:nth-child(even){background-color: #ffffff;}
+
+#scan tr:hover {background-color: #ddd;}
+
+#scan th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+<style>
+#scan {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#scan td, #scan th {
+  border-collapse: collapse;
+  padding: 8px;
+  font-size:11px;
+}
+
+#scan tr:nth-child(even){background-color: #ffffff;}
+
+#scan tr:hover {background-color: #ddd;}
+
+#scan th {
+  border-collapse: collapse;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+<style>
+#details {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#details td, #details th {
+ 
+  padding: 8px;
+  font-size:8px;
+}
+
+#details tr:nth-child(even){background-color: #ffffff;}
+
+#details tr:hover {background-color: #ddd;}
+
+#details th {
+  padding-top: 12px;
+ font-style:bold;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+<style>
+#sign {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#sign td, #sign th {
+
+  padding: 8px;
+  font-size:11px;
+  text-align: center;
+}
+
+#sign tr:nth-child(even){background-color: #ffffff;}
+
+#sign tr:hover {background-color: #ddd;}
+
+#sign th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+
+@media print {
+  .new-page {
+    page-break-before: always;
+  }
+}
+
+</style>
+
+
+
+
+
+
+
+
+<table id="header">
+  <tr>
+    {{-- <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th> --}}
+    <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
+  </tr>
+  <tr>
+    <td style="font-size:20px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td>
+    <th colspan="1">{{ $cawangan_detail['namacaw'] }}</th>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['alamat1'] }}</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
+    <td></td>
+  </tr>
+</table>
+<br>
+
+<table id="scan">
+  <tr>
+    <th colspan ="5"><b>LAPORAN AUDIT TRAIL OPERASI (arOS V3)</b></th>
+    <th> </th>
+    <th> </th>
+    <th></th>
+  </tr>
+  <tr>
+    <th colspan="5"><b> TARIKH CETAK:</b>
+      @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+        $formattedweddingdate = $myDateTime->format('d-m-Y');
+        echo($formattedweddingdate);
+      @endphp
+  </th>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  </tr>
+  <tr>
+    <td style="width:20px"> <b>TARIKH MULA:</b></td>
+    <td>@php 
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $date);
+          $formattedweddingdate = $myDateTime->format('d-m-Y');
+          echo($formattedweddingdate);
+        @endphp</td>
+    <td style="width:20px"> <b>HINGGA:</b></td>
+    <td>@php 
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $date_till);
+          $formattedweddingdate = $myDateTime->format('d-m-Y');
+          echo($formattedweddingdate);
+        @endphp</td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+  </tr>
+</table>
+
+<br>
+<table id="details">
+  <tr>
+    <th>Bil</th>
+    <th>Tarikh</th>
+    <th>Masa</th>
+    <th>Pengguna</th>
+    <th>Tindakan</th>
+    <th>Perbezaan</th>
+  </tr>
+  @php $counter = 1; @endphp
+  @foreach($audittrail as $index=>$item)
+    <tr>
+      <td>{{ $counter }}</td>
+      <td>{{ $item['tarikh'] }}</td>
+      <td>{{ $item['masa'] }}</td>
+      <td>{{ $item['users'] }}</td>
+      <td>{{ $item['actions'] }}</td>
+      <td>{{ $item['differ'] }}</td>
+    </tr>
+    @php $counter++;@endphp
+  @endforeach
+</table>
+<br><br>
+
+<br>
+<br><br><br>
+<table id="sign">
+  <tr>
+    <td></td>
+    <td colspan="2"> .................................................................. </td>
+    <td> </td>
+    <td colspan="2"> .................................................................. </td>
+    <td> </td>
+    <td colspan="2">.................................................................. </td>
+    <td> </td>
+  </tr>
+  <tr>
+    <td></td>
+    <td colspan="2"><B> Disediakan </B> </td>
+    <td></td>
+    <td colspan="2"><B> Disemak </B> </td>
+    <td> </td>
+    <td colspan="2"><B> Disahkan </B></td>
+    <td> </td>
+  </tr>
+</table>
diff --git a/routes/web.php b/routes/web.php
index b29ec1d..423f3a7 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -269,6 +269,8 @@ Route::post('laporan/saghilang/cetak',['as'=>'saghilang.laporancetak','uses'=>'K
 // Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah');
 // Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah');
 
+Route::get('laporan/operasi/audittrail/cetak',['as'=>'operasi.audittrail.laporancetak','uses'=>'OperasiController@cetakLaporanAuditTrail'])->middleware('auth','operasi');
+
 Route::get('/laporan/stokauditbackdate',['as'=>'laporan.stokauditbackdate','uses'=>'KhazanahController@laporanStokAuditBackdate'])->middleware('auth','khazanah');
 Route::get('laporan/stokauditbackdate/cetak',['as'=>'stokauditbackdate.laporancetak','uses'=>'KhazanahController@cetakLaporanStokAuditBackdate'])->middleware('auth','khazanah');
 
@@ -344,6 +346,7 @@ Route::post('/operasi/createkelulusan-by-khazanah',['as'=>'operasi.createkelulus
 Route::get('/operasi/getkelulusan',['as'=>'operasi.getkelulusan','uses'=>'OperasiController@getkelulusan'])->middleware('auth','teller');
 Route::put('/operasi/updatekelulusan',['as'=>'operasi.updatekelulusan','uses'=>'OperasiController@updatekelulusan'])->middleware('auth','operasi');
 Route::get('/operasi/parameter','OperasiController@parameter')->name('parameter')->middleware('auth','operasi');
+Route::get('/operasi/laporan-audit','OperasiController@laporanAudit')->name('operasi.laporan.audit')->middleware('auth','operasi');
 Route::get('/operasi/hargaemas',['as'=>'operasi.hargaemas','uses'=>'OperasiController@hargaemas'])->middleware('auth','operasi');
 Route::post('/operasi/hargaemas/update',['as'=>'hargaemas.update','uses'=>'OperasiController@updatehargaemas'])->middleware('auth','operasi');
 Route::post('/operasi/hargaemas',['as'=>'hargaemas.create','uses'=>'OperasiController@createhargaemas'])->middleware('auth','operasi');