diff --git a/app/Http/Controllers/ReportAllController.php b/app/Http/Controllers/ReportAllController.php
index 3640efc4..1f334748 100644
--- a/app/Http/Controllers/ReportAllController.php
+++ b/app/Http/Controllers/ReportAllController.php
@@ -34,6 +34,7 @@ use App\Models\Customer;
 use App\Models\LelongCawangan;
 use App\Models\LelongTebus;
 use App\Models\Tetapan;
+use Illuminate\Support\Facades\Http;
 
 
 use Carbon\Carbon;
@@ -763,6 +764,170 @@ class ReportAllController extends Controller
         }
     }
 
+    Public function marhunpermatabycaw (){
+
+        $cawangan_all = Cawangan::orderBy('caw_name','ASC')
+        ->get();
+        // dd($cawangan_all);
+        foreach($cawangan_all as $index3=>$cawangan){
+            $cawangan_all_groupby_caw = $cawangan->groupBy('caw_code');
+
+                $cawangan_all[$index3]["cawangan_info"] = $cawangan;
+        }
+        return view('laporan.marhunpermatabycaw',compact('cawangan_all'));
+    }
+
+    Public function marhunpermatabycawdetail($cawid){
+        $senarai = [];
+        $cawangan = Cawangan::where('id','=',$cawid)->first();
+        $cawanganDetail = $cawangan->caw_name;
+        $kodcaw =  $cawangan->caw_code;
+        $cawid = $cawangan->id;
+        $datalelong = Http::get(config('app.api_url'). 'get/listbatchlelong/'. $kodcaw ,[
+            'kodcaw' => $kodcaw,
+        ])->json();
+        $data = [
+            'kodcaw'=>$kodcaw,
+            'caw_name'=>$cawangan->caw_name,
+            'lelong' => $datalelong ? $datalelong : '',
+        ];
+        array_push($senarai,$data);
+        // dd($bycaw_all);
+        return view('laporan.marhunpermatabycawangan',compact('senarai','cawanganDetail','cawid'));
+    }
+
+    Public function marhunpermatabycawdetailbatch($kodcaw,$batchno){
+        $senarai = [];
+        $cawangan = Cawangan::where('caw_code','=',$kodcaw)->first();
+        $cawanganDetail = $cawangan->caw_name;
+       
+        // $kodcaw =  $cawangan->caw_code;
+        $datalelong = Http::get(config('app.api_url'). 'get/listlelongbybatch/'.$kodcaw.'/'.$batchno ,[
+            'kodcaw' => $kodcaw,
+            'batchno' => $batchno,
+        ])->json();
+        // dd($datalelong);
+        $data = [
+            'kodcaw'=>$kodcaw,
+            'batchno'=>$batchno,
+            'caw_name'=>$cawangan->caw_name,
+            'lelong' => $datalelong ? $datalelong : '',
+        ];
+        array_push($senarai,$data);
+        // dd($senarai);
+        return view('laporan.marhunpermatabycawanganbybatch',compact('senarai','cawanganDetail'));
+       
+
+    }
+
+    Public function marhunpermatabycawdetailall($cawid){
+        $senarai = [];
+        $cawangan = Cawangan::where('id','=',$cawid)->first();
+        $cawanganDetail = $cawangan->caw_name;
+        $kodcaw =  $cawangan->caw_code;
+        $cawid = $cawangan->id;
+        $datalelong = Http::get(config('app.api_url'). 'get/listbatchlelongall/'. $kodcaw ,[
+            'kodcaw' => $kodcaw,
+        ])->json();
+        $data = [
+            'kodcaw'=>$kodcaw,
+            'caw_name'=>$cawangan->caw_name,
+            'lelong' => $datalelong ? $datalelong : '',
+        ];
+        array_push($senarai,$data);
+        // dd($bycaw_all);
+        return view('laporan.marhunpermatabycawanganall',compact('senarai','cawanganDetail','cawid'));
+       
+
+    }
+
+    Public function marhunpermatabycawdetailallpdf($cawid, request $request){
+        $senarai = [];
+        $cawangan = Cawangan::where('id','=',$cawid)->first();
+        // dd($cawangan);
+        $cawanganDetail = $cawangan->caw_name;
+        $kodcaw =  $cawangan->caw_code;
+        $datalelong = Http::get(config('app.api_url'). 'get/listbatchlelongall/'. $kodcaw ,[
+            'kodcaw' => $kodcaw,
+        ])->json();
+        $data = [
+            'kodcaw'=>$kodcaw,
+            'caw_name'=>$cawangan->caw_name,
+            'lelong' => $datalelong ? $datalelong : '',
+        ];
+        array_push($senarai,$data);
+        if($request->type == 'excel')
+        {
+
+            return view('kpi.datakpibycawdetailall_excel',compact('collection_datakpi','kodcaw'));
+
+        }
+        elseif($request->type == 'pdf')
+        {
+            $pdf = PDF::loadView('laporan.keseluruhanmarhunpermata_pdf',compact('senarai','cawanganDetail'))
+            ->setPaper('a4', 'landscape');
+            
+            return $pdf->download('Marhun Permata Keseluruhan '.$cawanganDetail.'.pdf');
+        }
+        return view('laporan.marhunpermatabycawanganall',compact('senarai','cawanganDetail'));
+       
+
+    }
+
+    Public function marhunpermatabycawdetailallT($cawid){
+        $senarai = [];
+        $cawangan = Cawangan::where('id','=',$cawid)->first();
+        $cawanganDetail = $cawangan->caw_name;
+        $kodcaw =  $cawangan->caw_code;
+        $cawid = $cawangan->id;
+        $datalelong = Http::get(config('app.api_url'). 'get/listbatchlelongallT/'. $kodcaw ,[
+            'kodcaw' => $kodcaw,
+        ])->json();
+        $data = [
+            'kodcaw'=>$kodcaw,
+            'caw_name'=>$cawangan->caw_name,
+            'lelong' => $datalelong ? $datalelong : '',
+        ];
+        array_push($senarai,$data);
+        // dd($bycaw_all);
+        return view('laporan.marhunpermatabycawanganallT',compact('senarai','cawanganDetail','cawid'));
+       
+
+    }
+
+    Public function marhunpermatabycawdetailallpdfT($cawid, request $request){
+        $senarai = [];
+        $cawangan = Cawangan::where('id','=',$cawid)->first();
+        // dd($cawangan);
+        $cawanganDetail = $cawangan->caw_name;
+        $kodcaw =  $cawangan->caw_code;
+        $datalelong = Http::get(config('app.api_url'). 'get/listbatchlelongallT/'. $kodcaw ,[
+            'kodcaw' => $kodcaw,
+        ])->json();
+        $data = [
+            'kodcaw'=>$kodcaw,
+            'caw_name'=>$cawangan->caw_name,
+            'lelong' => $datalelong ? $datalelong : '',
+        ];
+        array_push($senarai,$data);
+        if($request->type == 'excel')
+        {
+
+            return view('kpi.datakpibycawdetailall_excel',compact('collection_datakpi','kodcaw'));
+
+        }
+        elseif($request->type == 'pdf')
+        {
+            $pdf = PDF::loadView('laporan.keseluruhanmarhunpermata_pdfT',compact('senarai','cawanganDetail'))
+            ->setPaper('a4', 'landscape');
+            
+            return $pdf->download('Marhun Permata Keseluruhan '.$cawanganDetail.'.pdf');
+        }
+        // return view('laporan.marhunpermatabycawanganall',compact('senarai','cawanganDetail'));
+       
+
+    }
+
 
     
   
diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php
index 341b1239..44b94f1a 100644
--- a/app/Http/Controllers/ReportCawanganController.php
+++ b/app/Http/Controllers/ReportCawanganController.php
@@ -33,6 +33,7 @@ use App\Models\Resit;
 use App\Models\Customer;
 use App\Models\TransaksiKeuntungan;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\Http;
 
 class ReportCawanganController extends Controller
 {
@@ -943,6 +944,167 @@ class ReportCawanganController extends Controller
 
 }
 
+    Public function marhunpermatabycaw (){
+        $user =  Auth::user();
+        $cawangan_all = Cawangan::where('caw_code','=',$user->kodcaw)
+        ->get();
+        // dd($cawangan_all);
+        foreach($cawangan_all as $index3=>$cawangan){
+            $cawangan_all_groupby_caw = $cawangan->groupBy('caw_code');
+
+                $cawangan_all[$index3]["cawangan_info"] = $cawangan;
+        }
+        return view('laporan.marhunpermatabycaw',compact('cawangan_all'));
+    }
+
+    Public function marhunpermatabycawdetail($cawid){
+        $senarai = [];
+        $cawangan = Cawangan::where('id','=',$cawid)->first();
+        $cawanganDetail = $cawangan->caw_name;
+        $kodcaw =  $cawangan->caw_code;
+        $cawid = $cawangan->id;
+        $datalelong = Http::get(config('app.api_url'). 'get/listbatchlelong/'. $kodcaw ,[
+            'kodcaw' => $kodcaw,
+        ])->json();
+        $data = [
+            'kodcaw'=>$kodcaw,
+            'caw_name'=>$cawangan->caw_name,
+            'lelong' => $datalelong ? $datalelong : '',
+        ];
+        array_push($senarai,$data);
+        // dd($bycaw_all);
+        return view('laporan.marhunpermatabycawangan',compact('senarai','cawanganDetail','cawid'));
+    }
+
+    Public function marhunpermatabycawdetailbatch($kodcaw,$batchno){
+        $senarai = [];
+        $cawangan = Cawangan::where('caw_code','=',$kodcaw)->first();
+        $cawanganDetail = $cawangan->caw_name;
+       
+        // $kodcaw =  $cawangan->caw_code;
+        $datalelong = Http::get(config('app.api_url'). 'get/listlelongbybatch/'.$kodcaw.'/'.$batchno ,[
+            'kodcaw' => $kodcaw,
+            'batchno' => $batchno,
+        ])->json();
+        // dd($datalelong);
+        $data = [
+            'kodcaw'=>$kodcaw,
+            'batchno'=>$batchno,
+            'caw_name'=>$cawangan->caw_name,
+            'lelong' => $datalelong ? $datalelong : '',
+        ];
+        array_push($senarai,$data);
+        // dd($senarai);
+        return view('laporan.marhunpermatabycawanganbybatch',compact('senarai','cawanganDetail'));
+       
+
+    }
+
+    Public function marhunpermatabycawdetailall($cawid){
+        $senarai = [];
+        $cawangan = Cawangan::where('id','=',$cawid)->first();
+        $cawanganDetail = $cawangan->caw_name;
+        $kodcaw =  $cawangan->caw_code;
+        $cawid = $cawangan->id;
+        $datalelong = Http::get(config('app.api_url'). 'get/listbatchlelongall/'. $kodcaw ,[
+            'kodcaw' => $kodcaw,
+        ])->json();
+        // dd($datalelong);
+        $data = [
+            'kodcaw'=>$kodcaw,
+            'caw_name'=>$cawangan->caw_name,
+            'lelong' => $datalelong ? $datalelong : '',
+        ];
+        array_push($senarai,$data);
+        // dd($bycaw_all);
+        return view('laporan.marhunpermatabycawanganall',compact('senarai','cawanganDetail','cawid'));
+    }
+
+    Public function marhunpermatabycawdetailallpdf($cawid, request $request){
+        $senarai = [];
+        $cawangan = Cawangan::where('id','=',$cawid)->first();
+        // dd($cawangan);
+        $cawanganDetail = $cawangan->caw_name;
+        $kodcaw =  $cawangan->caw_code;
+        $datalelong = Http::get(config('app.api_url'). 'get/listbatchlelongall/'. $kodcaw ,[
+            'kodcaw' => $kodcaw,
+        ])->json();
+        $data = [
+            'kodcaw'=>$kodcaw,
+            'caw_name'=>$cawangan->caw_name,
+            'lelong' => $datalelong ? $datalelong : '',
+        ];
+        array_push($senarai,$data);
+        if($request->type == 'excel')
+        {
+            return view('kpi.datakpibycawdetailall_excel',compact('collection_datakpi','kodcaw'));
+        }
+        elseif($request->type == 'pdf')
+        {
+            $pdf = PDF::loadView('laporan.keseluruhanmarhunpermata_pdf',compact('senarai','cawanganDetail'))
+            ->setPaper('a4', 'landscape');
+            
+            return $pdf->download('Marhun Permata Keseluruhan '.$cawanganDetail.'.pdf');
+        }
+        return view('laporan.marhunpermatabycawanganall',compact('senarai','cawanganDetail'));
+       
+
+    }
+
+    Public function marhunpermatabycawdetailallT($cawid){
+        $senarai = [];
+        $cawangan = Cawangan::where('id','=',$cawid)->first();
+        $cawanganDetail = $cawangan->caw_name;
+        $kodcaw =  $cawangan->caw_code;
+        $cawid = $cawangan->id;
+        $datalelong = Http::get(config('app.api_url'). 'get/listbatchlelongallT/'. $kodcaw ,[
+            'kodcaw' => $kodcaw,
+        ])->json();
+        $data = [
+            'kodcaw'=>$kodcaw,
+            'caw_name'=>$cawangan->caw_name,
+            'lelong' => $datalelong ? $datalelong : '',
+        ];
+        array_push($senarai,$data);
+        // dd($bycaw_all);
+        return view('laporan.marhunpermatabycawanganallT',compact('senarai','cawanganDetail','cawid'));
+       
+
+    }
+
+    Public function marhunpermatabycawdetailallpdfT($cawid, request $request){
+        $senarai = [];
+        $cawangan = Cawangan::where('id','=',$cawid)->first();
+        // dd($cawangan);
+        $cawanganDetail = $cawangan->caw_name;
+        $kodcaw =  $cawangan->caw_code;
+        $datalelong = Http::get(config('app.api_url'). 'get/listbatchlelongallT/'. $kodcaw ,[
+            'kodcaw' => $kodcaw,
+        ])->json();
+        $data = [
+            'kodcaw'=>$kodcaw,
+            'caw_name'=>$cawangan->caw_name,
+            'lelong' => $datalelong ? $datalelong : '',
+        ];
+        array_push($senarai,$data);
+        if($request->type == 'excel')
+        {
+
+            return view('kpi.datakpibycawdetailall_excel',compact('collection_datakpi','kodcaw'));
+
+        }
+        elseif($request->type == 'pdf')
+        {
+            $pdf = PDF::loadView('laporan.keseluruhanmarhunpermata_pdfT',compact('senarai','cawanganDetail'))
+            ->setPaper('a4', 'landscape');
+            
+            return $pdf->download('Marhun Permata Keseluruhan '.$cawanganDetail.'.pdf');
+        }
+        // return view('laporan.marhunpermatabycawanganall',compact('senarai','cawanganDetail'));
+       
+
+    }
+
 
     
 
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 6b8f458c..5217023f 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -295,6 +295,29 @@
         </li>
       </ul>
     </li>
+    {{-- <li class="{{ (request()->is('')) ? 'active' : '' }}">
+      <a href="#bukasekatanSubmenu" data-toggle="collapse" aria-expanded="false">
+        <div class="sidebar-menu">
+          <div class="sidebar-menu-main-title">
+            <span class="material-symbols-rounded sidebar-menu-item-main">
+              unpublished
+            </span>
+           Buka Sekatan(Tebus)
+          </div>
+          <span class="material-symbols-rounded sidebar-menu-item-expand">expand_more</span>
+        </div>
+      </a>
+      <ul class="list-unstyled collapse {{ (request()->is('bukasekatan/*')) ? 'show' : '' }}" id="bukasekatanSubmenu">
+        <li class="{{ (request()->is('bukasekatan/bukasekatantebus/*') || request()->is('bukasekatan/bukasekatantebus') ) ? 'active' : '' }}">
+          <a href="{{url('bukasekatan/bukasekatantebus')}}">Mohon Buka Sekatan</a>
+        </li>
+      </ul>
+      <ul class="list-unstyled collapse {{ (request()->is('bukasekatan/*')) ? 'show' : '' }}" id="bukasekatanSubmenu">
+        <li class="{{ (request()->is('bukasekatan/listbukasekatantebus/*') || request()->is('bukasekatan/listbukasekatantebus') ) ? 'active' : '' }}">
+          <a href="{{url('bukasekatan/listbukasekatantebus')}}">Senarai Buka Sekatan</a>
+        </li>
+      </ul>
+    </li> --}}
     <li class="{{ (request()->is('')) ? 'active' : '' }}">
       <a href="#tangguhSubmenu" data-toggle="collapse" aria-expanded="false">
         <div class="sidebar-menu">
@@ -409,6 +432,11 @@
           <a href="{{url('reportcaw/indexubahmarhun')}}">Perubahan Marhun</a>
         </li>
       </ul>
+      <ul class="list-unstyled collapse {{ (request()->is('reportcaw/*')) ? 'show' : '' }}" id="reportSubmenu">
+        <li class="{{ (request()->is('reportcaw/marhunpermatabycaw/*') || request()->is('reportcaw/marhunpermatabycaw') ) ? 'active' : '' }}">
+          <a href="{{url('reportcaw/marhunpermatabycaw')}}">Marhun Permata</a>
+        </li>
+      </ul>
 
 
     </li>
@@ -648,6 +676,10 @@
         <li class="{{ (request()->is('tangguhlelong/tangguhlelongoperasi/*') || request()->is('tangguhlelong/tangguhlelongoperasi') ) ? 'active' : '' }}">
           <a href="{{url('tangguhlelong/tangguhlelongoperasi')}}">Tangguh Lelong</a>
         </li>
+        {{-- <li class="{{ (request()->is('batallelong/batallelongoperasi/*') || request()->is('batallelong/batallelongoperasi') ) ? 'active' : '' }}">
+          <a href="{{url('batallelong/batallelongoperasi')}}">Batal Lelong(Batch baru)</a>
+        </li> --}}
+        
         
       </ul>
     </li>
@@ -673,6 +705,11 @@
           <a href="{{url('pengesahan/senarailelongtangguh')}}">Permohonan Tangguh Lelong</a>
         </li>
       </ul>
+      {{-- <ul class="list-unstyled collapse {{ (request()->is('pengesahan/*')) ? 'show' : '' }}" id="pengesahanSubmenu">
+        <li class="{{ (request()->is('pengesahan/senaraibukasekatan/*') || request()->is('pengesahan/senaraibukasekatan') ) ? 'active' : '' }}">
+          <a href="{{url('pengesahan/senaraibukasekatan')}}">Permohonan Buka Sekatan Tebus</a>
+        </li>
+      </ul> --}}
       <ul class="list-unstyled collapse {{ (request()->is('pengesahan/*')) ? 'show' : '' }}" id="pengesahanSubmenu">
         <li class="{{ (request()->is('pengesahan/senaraitlhtangguh/*') || request()->is('pengesahan/senaraitlhtangguh') ) ? 'active' : '' }}">
           <a href="{{url('pengesahan/senaraitlhtangguh')}}">Tangguh Lelong</a>
@@ -806,6 +843,11 @@
           <a href="{{url('reportbycaw/laporanlelongbycaw')}}">Lelong Keseluruhan</a>
         </li>
       </ul>
+      <ul class="list-unstyled collapse {{ (request()->is('reportbycaw/*')) ? 'show' : '' }}" id="reportallcawSubmenu">
+        <li class="{{ (request()->is('reportbycaw/marhunpermatabycaw/*') || request()->is('reportbycaw/marhunpermatabycaw') ) ? 'active' : '' }}">
+          <a href="{{url('reportbycaw/marhunpermatabycaw')}}">Marhun Permata</a>
+        </li>
+      </ul>
     </li>
 
     <li class="{{ (request()->is('reportbydate/')) ? 'active' : '' }}">
diff --git a/resources/views/laporan/keseluruhanmarhunpermata_pdf.blade.php b/resources/views/laporan/keseluruhanmarhunpermata_pdf.blade.php
new file mode 100644
index 00000000..06e63c68
--- /dev/null
+++ b/resources/views/laporan/keseluruhanmarhunpermata_pdf.blade.php
@@ -0,0 +1,252 @@
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<style>
+  #sim {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+      width: 100%;
+  }
+  
+  #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+      border: 0px solid;
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim tr:nth-child(even){}
+  
+  #sim tr {
+    border-bottom: 1px black;
+  }
+  #sim th {
+    border: 1px black;
+    text-align: center;
+  }
+  
+  #sim2 th {
+      text-align: center;
+      border: 0px solid ;
+      table-layout:auto;
+      color: black;
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 0px solid #ddd;
+  }
+  
+  td {
+    /* text-align: right; */
+    padding: 16px;
+    border: 1px solid;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+  }
+  
+  tr:nth-child(even) {
+    
+  }
+
+  .font{
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+  }
+
+</style>
+
+<style>
+  /** Define now the real margins of every page in the PDF **/
+  body {
+      margin-top: 1cm;
+      /* margin-left: 2cm; */
+      /* margin-right: 2cm; */
+      margin-bottom: 2cm;
+  }
+  
+  /** Define the header rules **/
+  header {
+      position: fixed;
+      top: -1cm;
+      left: 0cm;
+      right: 0cm;
+      height: 0cm;
+      /** Extra personal styles **/
+      /* background-color: #eaeaea; */
+      color: black;
+      text-align: center;
+      line-height: 1.5cm;
+  }
+  
+  /** Define the footer rules **/
+  footer {
+      position: fixed;
+      bottom: 0cm;
+      left: 0cm;
+      right: 0cm;
+      height: 2cm;
+  
+      /** Extra personal styles **/
+      /* background-color: #eaeaea; */
+      color: black;
+      text-align: center;
+      line-height: 1.5cm;
+  }
+  footer .pagenum:before {
+      content: counter(page);
+  }
+
+  .font{
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:12px;
+  }
+
+  </style>
+  
+                             <body>
+                             <header>
+                              <div class="font"><u><b><h5>PENGEMASKINIAN MAKLUMAT BATU PERMATA SEBELUM TAWARRUQ</h5></b></u></div>
+                              </header>
+                              <footer>
+                                <div class="pagenum-container"><span class="pagenum"></span></div>
+                              </footer>
+                              
+            <br>
+              <div class="font">CAWANGAN: {{$cawanganDetail}}</div><br>
+                            <table  cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">                        
+                              {{-- <table class="table table-bordered text-center" id="tablenotislelong" style="width:100%"> --}}
+                                <thead class="bg-primary text-white">
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>No.Rujukan</th>
+                                        <th>Batch.No</th>
+                                        <th>No.KP</th>
+                                        <th>Kuantiti</th>
+                                        <th>Tarikh Pembiayaan/Tarikh Gadaian</th>
+                                        <th>Tarikh Lelong</th>
+                                        <th>Baki Lelong(RM)</th>
+                                        <th>Rugi Lelong(RM)</th>
+                                        <th>Tempoh Simpanan Batu Permata Selepas Lelong</th>
+                                        <th>Marhun Gadai</th>
+                                        <th>Marhun Lelong</th>
+                                        <th width='100px' height='10px'>Catatan</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                 {{-- {{dd($senarai[0]['lelong'])}} --}}
+                                 @php $jumlahkuantiti = 0; $jumlahbakilelong = 0; $jumlahrugilelong = 0 @endphp
+                                    @foreach ($senarai[0]['lelong'] as $index=>$bid)
+                                    {{-- {{ \Carbon\Carbon::createFromFormat('created_at', 'd-m-Y')->toDateTimeString() }} --}}
+                                    @php
+                                        $today = date('Y-m-d');
+                                        $get_start_date = new DateTime($today); // New date object
+                                        $get_end_date = date('Y-m-d',strtotime($bid['t_lelong']));
+                                        $end_date = new DateTime($get_end_date); // New date object
+                                        $months = $end_date->diff($get_start_date);
+                                        $months1 = $months->format('%y Tahun %m Bulan %d Hari');
+                                        $jumlahkuantiti += $bid['kuantiti']
+                                    @endphp
+                                    <tr>
+                                        <td>{{$loop->iteration}}   
+                                        <td style='white-space:nowrap;'>{{ $bid['norujukan']}}</td>  
+                                        <td>{{ $bid['batchno']}}</td>      
+                                        <td>{{ $bid['nokp']}}</td>    
+                                        <td>{{ $bid['kuantiti']}}</td>     
+                                        <td>{{ $bid['t_gadai']}}</td>     
+                                        {{-- <td align="center" style='white-space:nowrap;'> @php
+                                            $myDateTime = DateTime::createFromFormat('Y-m-d', $bid['t_gadai'] );
+                                            $t_gadai =  $myDateTime->format('d-m-Y');
+                                            echo($t_gadai);
+                                            @endphp</td>      --}}
+                                        <td align="center" style='white-space:nowrap;'>@php
+                                            $myDateTime = DateTime::createFromFormat('Y-m-d', $bid['t_lelong'] );
+                                            $t_lelong =  $myDateTime->format('d-m-Y');
+                                            echo($t_lelong);
+                                            @endphp</td>     
+                                        <td align="right">@php  if($bid['baki'] > 0){
+                                            $bakilelong = $bid['baki'];
+                                            echo number_format($bakilelong,2);}
+                                          elseif($bid['baki'] < 0){
+                                            $bakilelong = '';
+                                            echo($bakilelong);}
+                                            @endphp
+                                           </td>
+                                        <td align="right">@php  if($bid['baki'] > 0){
+                                            $bakilelong = '';
+                                            echo($bakilelong);}
+                                          elseif($bid['baki'] < 0){
+                                            $bakilelong = $bid['baki'];
+                                            echo number_format($bakilelong,2);}
+                                            @endphp
+                                            </td>    
+                                        <td align="center">{{$months1}}</td>  
+                                        <td align="center">{{$bid['marhungadai']}}</td>                  
+                                        <td align='left' style='white-space:nowrap;'> 
+                                            @foreach ($bid['listmarhun'] as $index1=>$bid2)
+                                            {{$loop->iteration.'. '.$bid2['marhun'].':'.$bid2['nota']}}<br>
+                                            @endforeach
+                                           
+                                        </td>
+                                       <td width='42px' height='10px'>               </td>
+                                    </tr>
+                                    @php  if($bid['baki'] > 0){
+                                            $jumlahbakilelong += $bid['baki'];
+                                          }
+                                          elseif($bid['baki'] < 0){
+                                            $jumlahrugilelong += $bid['baki'];
+                                          }
+                                    @endphp
+                                    @endforeach
+                                </tbody>
+                                <tfoot>
+                                  <tr>
+                                      <td class="text-center" colspan="4"><b>JUMLAH KESELURUHAN</b></td>
+                                      <td class="text-center"><b>{{ $jumlahkuantiti }}</b></td>
+                                      <td class="text-center"></td>
+                                      <td class="text-center"></td>
+                                      <td align="right"><b>{{ number_format($jumlahbakilelong,2) }}</b></td>
+                                      <td align="right"><b>{{ number_format($jumlahrugilelong,2) }}</b></td>
+                                      <td class="text-center"></td>
+                                      <td class="text-center"></td>
+                                      <td class="text-center"></td>
+                                      <td class="text-center"></td>
+                                  </tr>
+                              </tfoot>
+                                
+                            </table>
+  
+                        </div>
+                             </body>
+                         
+    
+                      
+    
+                      
\ No newline at end of file
diff --git a/resources/views/laporan/keseluruhanmarhunpermata_pdfT.blade.php b/resources/views/laporan/keseluruhanmarhunpermata_pdfT.blade.php
new file mode 100644
index 00000000..8301cd29
--- /dev/null
+++ b/resources/views/laporan/keseluruhanmarhunpermata_pdfT.blade.php
@@ -0,0 +1,251 @@
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<style>
+  #sim {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+      width: 100%;
+  }
+  
+  #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+      border: 0px solid;
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim tr:nth-child(even){}
+  
+  #sim tr {
+    border-bottom: 1px black;
+  }
+  #sim th {
+    border: 1px black;
+    text-align: center;
+  }
+  
+  #sim2 th {
+      text-align: center;
+      border: 0px solid ;
+      table-layout:auto;
+      color: black;
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 0px solid #ddd;
+  }
+  
+  td {
+    /* text-align: right; */
+    padding: 16px;
+    border: 1px solid;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+  }
+  
+  tr:nth-child(even) {
+    
+  }
+
+  .font{
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+  }
+
+</style>
+
+<style>
+  /** Define now the real margins of every page in the PDF **/
+  body {
+      margin-top: 1cm;
+      /* margin-left: 2cm; */
+      /* margin-right: 2cm; */
+      margin-bottom: 2cm;
+  }
+  
+  /** Define the header rules **/
+  header {
+      position: fixed;
+      top: -1cm;
+      left: 0cm;
+      right: 0cm;
+      height: 0cm;
+      /** Extra personal styles **/
+      /* background-color: #eaeaea; */
+      color: black;
+      text-align: center;
+      line-height: 1.5cm;
+  }
+  
+  /** Define the footer rules **/
+  footer {
+      position: fixed;
+      bottom: 0cm;
+      left: 0cm;
+      right: 0cm;
+      height: 2cm;
+  
+      /** Extra personal styles **/
+      /* background-color: #eaeaea; */
+      color: black;
+      text-align: center;
+      line-height: 1.5cm;
+  }
+  footer .pagenum:before {
+      content: counter(page);
+  }
+
+  .font{
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:12px;
+  }
+
+  </style>
+  
+                             <body>
+                             <header>
+                              <div class="font"><u><b><h5>PENGEMASKINIAN MAKLUMAT BATU PERMATA SELEPAS TAWARRUQ</h5></b></u></div>
+                              </header>
+                              <footer>
+                                <div class="pagenum-container"><span class="pagenum"></span></div>
+                              </footer>
+                              
+            <br>
+            <div class="font">CAWANGAN: {{$cawanganDetail}}</div><br>
+                            <table  cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">                        
+                              {{-- <table class="table table-bordered text-center" id="tablenotislelong" style="width:100%"> --}}
+                                <thead class="bg-primary text-white">
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>No.Rujukan</th>
+                                        <th>Batch.No</th>
+                                        <th>No.KP</th>
+                                        <th>Kuantiti</th>
+                                        <th>Tarikh Pembiayaan/Tarikh Gadaian</th>
+                                        <th>Tarikh Lelong</th>
+                                        <th>Baki Lelong(RM)</th>
+                                        <th>Rugi Lelong(RM)</th>
+                                        <th>Tempoh Simpanan Batu Permata Selepas Lelong</th>
+                                        <th>Marhun Gadai</th>
+                                        <th>Marhun Lelong</th>
+                                        <th width='100px' height='10px'>Catatan</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                 {{-- {{dd($senarai[0]['lelong'])}} --}}
+                                 @php $jumlahkuantiti = 0; $jumlahbakilelong = 0; $jumlahrugilelong = 0 @endphp
+                                    @foreach ($senarai[0]['lelong'] as $index=>$bid)
+                                    {{-- {{ \Carbon\Carbon::createFromFormat('created_at', 'd-m-Y')->toDateTimeString() }} --}}
+                                    @php
+                                        $today = date('Y-m-d');
+                                        $get_start_date = new DateTime($today); // New date object
+                                        $get_end_date = date('Y-m-d',strtotime($bid['t_lelong']));
+                                        $end_date = new DateTime($get_end_date); // New date object
+                                        $months = $end_date->diff($get_start_date);
+                                        $months1 = $months->format('%y Tahun %m Bulan %d Hari');
+                                        $jumlahkuantiti += $bid['kuantiti']
+                                    @endphp
+                                    <tr>
+                                        <td>{{$loop->iteration}}   
+                                        <td style='white-space:nowrap;'>{{ $bid['norujukan']}}</td>  
+                                        <td>{{ $bid['batchno']}}</td>      
+                                        <td>{{ $bid['nokp']}}</td>    
+                                        <td>{{ $bid['kuantiti']}}</td>     
+                                        <td align="center" style='white-space:nowrap;'> @php
+                                            $myDateTime = DateTime::createFromFormat('Y-m-d', $bid['t_gadai'] );
+                                            $t_gadai =  $myDateTime->format('d-m-Y');
+                                            echo($t_gadai);
+                                            @endphp</td>     
+                                        <td align="center" style='white-space:nowrap;'>@php
+                                            $myDateTime = DateTime::createFromFormat('Y-m-d', $bid['t_lelong'] );
+                                            $t_lelong =  $myDateTime->format('d-m-Y');
+                                            echo($t_lelong);
+                                            @endphp</td>     
+                                        <td align="right">@php  if($bid['baki'] > 0){
+                                            $bakilelong = $bid['baki'];
+                                            echo number_format($bakilelong,2);}
+                                          elseif($bid['baki'] < 0){
+                                            $bakilelong = '';
+                                            echo($bakilelong);}
+                                            @endphp
+                                           </td>
+                                        <td align="right">@php  if($bid['baki'] > 0){
+                                            $bakilelong = '';
+                                            echo($bakilelong);}
+                                          elseif($bid['baki'] < 0){
+                                            $bakilelong = $bid['baki'];
+                                            echo number_format($bakilelong,2);}
+                                            @endphp
+                                            </td>    
+                                        <td align="center">{{$months1}}</td>  
+                                        <td>{{ $bid['marhungadai']}}</td>                   
+                                        <td align='left' style='white-space:nowrap;'> 
+                                            @foreach ($bid['listmarhun'] as $index1=>$bid2)
+                                            {{$loop->iteration.'. '.$bid2['marhun'].':'.$bid2['nota']}}<br>
+                                            @endforeach
+                                           
+                                        </td>
+                                       <td width='42px' height='10px'>               </td>
+                                    </tr>
+                                    @php  if($bid['baki'] > 0){
+                                            $jumlahbakilelong += $bid['baki'];
+                                          }
+                                          elseif($bid['baki'] < 0){
+                                            $jumlahrugilelong += $bid['baki'];
+                                          }
+                                    @endphp
+                                    @endforeach
+                                </tbody>
+                                <tfoot>
+                                  <tr>
+                                      <td class="text-center" colspan="4"><b>JUMLAH KESELURUHAN</b></td>
+                                      <td class="text-center"><b>{{ $jumlahkuantiti }}</b></td>
+                                      <td class="text-center"></td>
+                                      <td class="text-center"></td>
+                                      <td align="right"><b>{{ number_format($jumlahbakilelong,2) }}</b></td>
+                                      <td align="right"><b>{{ number_format($jumlahrugilelong,2) }}</b></td>
+                                      <td class="text-center"></td>
+                                      <td class="text-center"></td>
+                                      <td class="text-center"></td>
+                                      <td class="text-center"></td>
+                                  </tr>
+                              </tfoot>
+                                
+                            </table>
+  
+                        </div>
+                             </body>
+                         
+    
+                      
+    
+                      
\ No newline at end of file
diff --git a/resources/views/laporan/marhunpermatabycaw.blade.php b/resources/views/laporan/marhunpermatabycaw.blade.php
new file mode 100644
index 00000000..761fea2a
--- /dev/null
+++ b/resources/views/laporan/marhunpermatabycaw.blade.php
@@ -0,0 +1,86 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        
+        <div class="col">
+            <div class="card">
+
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        Marhun Permata Mengikut Cawangan
+                    </div>
+                </div>
+
+                <div class="card-body">
+                    @if ($message = Session::get('success'))
+                    <div class="alert alert-success">
+                        {{ $message }}
+                    </div>
+                    @endif
+
+                        <form id="exportform" action="" method="POST">
+                        <input type="hidden" name="type" value="User">
+                        <table class="table table-bordered  table-xl" id="tablenotislelong" style="width:100%">
+                            <thead class="bg-primary text-white">
+                                <tr>
+                                    <th>Bil</th>
+                                    <th>Cawangan</th>
+                                    <th>Senarai Mengikut Batch</th>
+                                    <th>Keseluruhan Sebelum Tawarruq</th>
+                                    <th>Keseluruhan Selepas Tawarruq</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                
+                                @foreach ($cawangan_all as $bid)
+                                <tr>
+                                    @hasrole('operasi')
+                                    <td>{{$loop->iteration}}</td>
+                                    <td>
+                                        <b>{{ $bid->cawangan_info->caw_name}}</b>
+                                    </td>
+                                    <td><a class="btn btn-success btn-sm m-1" href="{{ route('reportbycaw.marhunpermatabycawdetail',['cawid'=>$bid->cawangan_info->id]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong"><i class="fas fa-list"></i></a></td>
+                                    <td><a class="btn btn-success btn-sm m-1" href="{{ route('reportbycaw.marhunpermatabycawdetailall',['cawid'=>$bid->cawangan_info->id]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong"><i class="fas fa-list"></i></a></td>
+                                    <td><a class="btn btn-success btn-sm m-1" href="{{ route('reportbycaw.marhunpermatabycawdetailallT',['cawid'=>$bid->cawangan_info->id]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong"><i class="fas fa-list"></i></a></td>
+                                    @endhasrole
+
+                                    @hasrole('pengurus-cawangan')
+                                    <td>{{$loop->iteration}}</td>
+                                    <td>
+                                        <b>{{ $bid->cawangan_info->caw_name}}</b>
+                                    </td>
+                                    <td><a class="btn btn-success btn-sm m-1" href="{{ route('reportcaw.marhunpermatabycawdetail',['cawid'=>$bid->cawangan_info->id]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong"><i class="fas fa-list"></i></a></td>
+                                    <td><a class="btn btn-success btn-sm m-1" href="{{ route('reportcaw.marhunpermatabycawdetailall',['cawid'=>$bid->cawangan_info->id]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong"><i class="fas fa-list"></i></a></td>
+                                    <td><a class="btn btn-success btn-sm m-1" href="{{ route('reportcaw.marhunpermatabycawdetailallT',['cawid'=>$bid->cawangan_info->id]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong"><i class="fas fa-list"></i></a></td>
+                                    @endhasrole
+                                </tr>
+                                @endforeach
+                            </tbody>
+                            
+                        </table>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+     //Enable tooltips everywhere
+     $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+    var tablenotislelong = $('#tablenotislelong').DataTable({    
+            order: [[0, 'asc']],
+            "info": false,
+            "lengthChange": false,
+            "pageLength": 99,
+            dom: 'Bfrtip',
+    
+    });
+
+      
+</script>
+@endsection
diff --git a/resources/views/laporan/marhunpermatabycawangan.blade.php b/resources/views/laporan/marhunpermatabycawangan.blade.php
new file mode 100644
index 00000000..cd424f7f
--- /dev/null
+++ b/resources/views/laporan/marhunpermatabycawangan.blade.php
@@ -0,0 +1,102 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="card-header header-style">
+                        <a href="javascript:window.history.go(-1);" class="header-style-icon">
+                            <i class="fas fa-arrow-left"></i>
+                        </a>
+                        <div class="header-style-title">
+                            Marhun Permata: {{$cawanganDetail}}
+                        </div>
+                    </div>
+                
+                 
+                </div>
+                <div class="card-body">
+          
+            @if ($message = Session::get('success'))
+            <div class="alert alert-success">
+                <p>{{ $message }}</p>
+            </div>
+            @endif
+            <form id="exportform" action="" method="POST">
+                <input type="hidden" name="type" value="User">
+                <table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>Bil</th>
+                            <th>Tarikh Lelong</th>
+                            <th>Batch Lelong</th>
+                            <th>Bil.Surat</th>
+                            <th>Senarai</th>
+                            {{-- <th>Jenis</th> --}}
+                            
+                        </tr>
+                    </thead>
+                    <tbody>
+                       {{-- {{dd($senarai[0]['lelong'])}} --}}
+                        @foreach ($senarai[0]['lelong'] as $bid)
+                        {{-- {{dd($bid['t_lelong'])}} --}}
+                        {{-- {{dd($bid['lelong_info']['id'])}} --}}
+                        <tr>
+                            <td>{{$loop->iteration}}     
+                            <td>@foreach ($bid['t_lelong'] as $index=>$tlelong)
+                                @php
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $tlelong[0]['t_lelong'] );
+                                $t_lelong =  $myDateTime->format('d-m-Y');
+                                echo($t_lelong);
+                                @endphp
+                                @endforeach
+                            </td>                      
+                            <td>{{ $bid['batchno']}}</td>
+                            <td><span class="badge badge-pill badge-info text-white" style="font-size:100%">{{ $bid['total_lelong']}}</span></td>
+                            @hasrole('operasi')
+                            <td><a class="btn btn-success btn-sm m-1" href="{{ route('reportbycaw.marhunpermatabycawdetailbatch',['kodcaw'=>$bid['kodcaw'],'batchno' =>$bid['batchno']]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong"><i class="fas fa-list"></i></a></td>
+                            @endhasrole
+                            @hasrole('pengurus-cawangan')
+                            <td><a class="btn btn-success btn-sm m-1" href="{{ route('reportcaw.marhunpermatabycawdetailbatch',['kodcaw'=>$bid['kodcaw'],'batchno' =>$bid['batchno']]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Lelong"><i class="fas fa-list"></i></a></td>
+                            @endhasrole
+                            {{-- <td></td> --}}
+                        </tr>
+                        @endforeach
+                    </tbody>
+                    
+                </table>
+            </form>
+        </div>
+        
+    </div>
+</div>
+
+<script>
+     //Enable tooltips everywhere
+     $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+    var tablenotislelong = $('#tablenotislelong').DataTable({
+            "columnDefs": [ 
+                {
+                "targets": 0,
+                "orderable": false
+                }, 
+                {
+                "targets": 3,
+                "orderable": false
+                }
+            ],
+            order: [[0, 'asc']],
+            "info": false,
+            "lengthChange": false,
+            "pageLength": 99999,
+            dom: 'Bfrtip',
+    
+    });
+
+      
+</script>
+@endsection
diff --git a/resources/views/laporan/marhunpermatabycawanganall.blade.php b/resources/views/laporan/marhunpermatabycawanganall.blade.php
new file mode 100644
index 00000000..8455cbb7
--- /dev/null
+++ b/resources/views/laporan/marhunpermatabycawanganall.blade.php
@@ -0,0 +1,177 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="card-header header-style">
+                        <a href="javascript:window.history.go(-1);" class="header-style-icon">
+                            <i class="fas fa-arrow-left"></i>
+                        </a>
+                        <div class="header-style-title">
+                            Marhun Permata: {{$cawanganDetail}}<br>
+                            {{-- BatchNo: {{$senarai[0]['batchno']}} --}}
+                        </div>
+                    </div>
+                
+                 
+                </div>
+                <div class="card-body">
+          
+            @if ($message = Session::get('success'))
+            <div class="alert alert-success">
+                <p>{{ $message }}</p>
+            </div>
+            @endif
+            @hasrole('operasi')
+            <form id="exportpdf" action="{{route('reportbycaw.marhunpermatabycawdetailallpdf',['cawid' => $cawid])}}" method="POST"> 
+            @endhasrole
+            @hasrole('pengurus-cawangan')
+            <form id="exportpdf" action="{{route('reportcaw.marhunpermatabycawdetailallpdf',['cawid' => $cawid])}}" method="POST"> 
+            @endhasrole  
+                @csrf
+                <input type="hidden" name="type" id="typedonwload" value="">
+                {{-- <input type="hidden" name="type" value="User"> --}}
+                <table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>Bil</th>
+                            <th>No.Rujukan</th>
+                            <th>Batch.No</th>
+                            <th>No.KP</th>
+                            <th>Kuantiti</th>
+                            <th>Tarikh Pembiayaan/Tarikh Gadaian</th>
+                            <th>Tarikh Lelong</th>
+                            <th>Baki Lelong(RM)</th>
+                            <th>Rugi Lelong(RM)</th>
+                            <th>Tempoh Simpanan Batu Permata Selepas Lelong</th>
+                            <th>Marhun Gadai</th>
+                            <th>Marhun Lelong</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                     {{-- {{dd($senarai[0]['lelong'])}} --}}
+                        @foreach ($senarai[0]['lelong'] as $index=>$bid)
+                        {{-- {{ \Carbon\Carbon::createFromFormat('created_at', 'd-m-Y')->toDateTimeString() }} --}}
+                        @php
+                            $today = date('Y-m-d');
+                            $get_start_date = new DateTime($today); // New date object
+                            $get_end_date = date('Y-m-d',strtotime($bid['t_lelong']));
+                            $end_date = new DateTime($get_end_date); // New date object
+                            $months = $end_date->diff($get_start_date);
+                            $months1 = $months->format('%y Tahun %m Bulan %d Hari');
+                        @endphp
+                        <tr>
+                            <td>{{$loop->iteration}}   
+                            <td style='white-space:nowrap;'>{{ $bid['norujukan']}}</td>  
+                            <td>{{ $bid['batchno']}}</td>      
+                            <td>{{ $bid['nokp']}}</td>    
+                            <td>{{ $bid['kuantiti']}}</td>     
+                            <td>{{ $bid['t_gadai']}}</td>     
+                            {{-- <td style='white-space:nowrap;'> @php
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $bid['t_gadai'] );
+                                $t_gadai =  $myDateTime->format('d-m-Y');
+                                echo($t_gadai);
+                                @endphp</td>      --}}
+                            <td style='white-space:nowrap;'>@php
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $bid['t_lelong'] );
+                                $t_lelong =  $myDateTime->format('d-m-Y');
+                                echo($t_lelong);
+                                @endphp</td>     
+                            <td>@php  if($bid['baki'] > 0){
+                                $bakilelong = $bid['baki'];
+                                echo($bakilelong);}
+                              elseif($bid['baki'] < 0){
+                                $bakilelong = '';
+                                echo($bakilelong);}
+                                @endphp
+                               </td>
+                            <td>@php  if($bid['baki'] > 0){
+                                $bakilelong = '';
+                                echo($bakilelong);}
+                              elseif($bid['baki'] < 0){
+                                $bakilelong = $bid['baki'];
+                                echo($bakilelong);}
+                                @endphp
+                                </td>    
+                                <td>{{$months1}}</td>   
+                            <td>{{ $bid['marhungadai']}}</td>                   
+                            <td align='left' style='white-space:nowrap;'> 
+                                @foreach ($bid['listmarhun'] as $index1=>$bid2)
+                                {{$loop->iteration.'. '.$bid2['marhun'].':'.$bid2['nota']}}<br>
+                                @endforeach
+                               
+                            </td>
+                           
+                        </tr>
+                        @endforeach
+                    </tbody>
+                    
+                </table>
+            </form>
+        </div>
+        
+    </div>
+</div>
+
+<script>
+    //Enable tooltips everywhere
+    $(function () {
+       $('[data-toggle="tooltip"]').tooltip()
+   })
+   var tablenotislelong = $('#tablenotislelong').DataTable({
+           "columnDefs": [ 
+               {
+               "targets": 0,
+               "orderable": false
+               }, 
+               {
+               "targets": 3,
+               "orderable": false
+               }
+           ],
+           order: [[0, 'asc']],
+           "info": false,
+           "lengthChange": false,
+           "pageLength": 99999,
+           dom: 'Bfrtip',
+           buttons: [
+                      
+                   //    {
+                   //        className: 'btn btn-outline-success pl-4 pr-4 btn-sm  export',
+                   //        target: "_blank",
+                   //        titleAttr: 'Export to Excel',
+                   //        text: '<h8><b>EXCEL</b></h8>',
+                   //        action: function ( e, dt, node, config ) {
+                   //            $('#typedonwload').val('excel');
+                   //            $("#exportpdf").submit();
+                   //            // window.open("_blank");
+                   //        }
+                   //    },
+                      
+                      {
+                          className: 'btn btn-outline-danger pl-4 pr-4 btn-sm  export',
+                          titleAttr: 'Export to PDF',
+                          text: '<h8><b>PDF</b></h8>',
+                          action: function ( e, dt, node, config ) {
+                              $('#typedonwload').val('pdf');
+                              $("#exportpdf").submit();
+                          }
+                      
+              }
+
+                     
+                      
+                  ]
+                   
+               });
+       
+               $('.export').tooltip();
+               $( '.export').removeClass('dt-button');
+   
+
+     
+</script>
+@endsection
diff --git a/resources/views/laporan/marhunpermatabycawanganallT.blade.php b/resources/views/laporan/marhunpermatabycawanganallT.blade.php
new file mode 100644
index 00000000..0675b330
--- /dev/null
+++ b/resources/views/laporan/marhunpermatabycawanganallT.blade.php
@@ -0,0 +1,176 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="card-header header-style">
+                        <a href="javascript:window.history.go(-1);" class="header-style-icon">
+                            <i class="fas fa-arrow-left"></i>
+                        </a>
+                        <div class="header-style-title">
+                            Marhun Permata Tawarruq: {{$cawanganDetail}}<br>
+                            {{-- BatchNo: {{$senarai[0]['batchno']}} --}}
+                        </div>
+                    </div>
+                
+                 
+                </div>
+                <div class="card-body">
+          
+            @if ($message = Session::get('success'))
+            <div class="alert alert-success">
+                <p>{{ $message }}</p>
+            </div>
+            @endif
+            @hasrole('operasi')
+            <form id="exportpdf" action="{{route('reportbycaw.marhunpermatabycawdetailallpdfT',['cawid' => $cawid])}}" method="POST"> 
+            @endhasrole
+            @hasrole('pengurus-cawangan')
+            <form id="exportpdf" action="{{route('reportcaw.marhunpermatabycawdetailallpdfT',['cawid' => $cawid])}}" method="POST"> 
+            @endhasrole  
+                @csrf
+                <input type="hidden" name="type" id="typedonwload" value="">
+                {{-- <input type="hidden" name="type" value="User"> --}}
+                <table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>Bil</th>
+                            <th>No.Rujukan</th>
+                            <th>Batch.No</th>
+                            <th>No.KP</th>
+                            <th>Kuantiti</th>
+                            <th>Tarikh Pembiayaan/Tarikh Gadaian</th>
+                            <th>Tarikh Lelong</th>
+                            <th>Baki Lelong(RM)</th>
+                            <th>Rugi Lelong(RM)</th>
+                            <th>Tempoh Simpanan Batu Permata Selepas Lelong</th>
+                            <th>Marhun Gadai</th>
+                            <th>Marhun Lelong</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                     {{-- {{dd($senarai[0]['lelong'])}} --}}
+                        @foreach ($senarai[0]['lelong'] as $index=>$bid)
+                        {{-- {{ \Carbon\Carbon::createFromFormat('created_at', 'd-m-Y')->toDateTimeString() }} --}}
+                        @php
+                            $today = date('Y-m-d');
+                            $get_start_date = new DateTime($today); // New date object
+                            $get_end_date = date('Y-m-d',strtotime($bid['t_lelong']));
+                            $end_date = new DateTime($get_end_date); // New date object
+                            $months = $end_date->diff($get_start_date);
+                            $months1 = $months->format('%y Tahun %m Bulan %d Hari');
+                        @endphp
+                        <tr>
+                            <td>{{$loop->iteration}}   
+                            <td style='white-space:nowrap;'>{{ $bid['norujukan']}}</td>  
+                            <td>{{ $bid['batchno']}}</td>      
+                            <td>{{ $bid['nokp']}}</td>    
+                            <td>{{ $bid['kuantiti']}}</td>     
+                            <td style='white-space:nowrap;'> @php
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $bid['t_gadai'] );
+                                $t_gadai =  $myDateTime->format('d-m-Y');
+                                echo($t_gadai);
+                                @endphp</td>     
+                            <td style='white-space:nowrap;'>@php
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $bid['t_lelong'] );
+                                $t_lelong =  $myDateTime->format('d-m-Y');
+                                echo($t_lelong);
+                                @endphp</td>     
+                            <td>@php  if($bid['baki'] > 0){
+                                $bakilelong = $bid['baki'];
+                                echo($bakilelong);}
+                              elseif($bid['baki'] < 0){
+                                $bakilelong = '';
+                                echo($bakilelong);}
+                                @endphp
+                               </td>
+                            <td>@php  if($bid['baki'] > 0){
+                                $bakilelong = '';
+                                echo($bakilelong);}
+                              elseif($bid['baki'] < 0){
+                                $bakilelong = $bid['baki'];
+                                echo($bakilelong);}
+                                @endphp
+                                </td>    
+                                <td>{{$months1}}</td> 
+                                <td>{{ $bid['marhungadai']}}</td>                      
+                            <td align='left' style='white-space:nowrap;'> 
+                                @foreach ($bid['listmarhun'] as $index1=>$bid2)
+                                {{$loop->iteration.'. '.$bid2['marhun'].':'.$bid2['nota']}}<br>
+                                @endforeach
+                               
+                            </td>
+                           
+                        </tr>
+                        @endforeach
+                    </tbody>
+                    
+                </table>
+            </form>
+        </div>
+        
+    </div>
+</div>
+
+<script>
+    //Enable tooltips everywhere
+    $(function () {
+       $('[data-toggle="tooltip"]').tooltip()
+   })
+   var tablenotislelong = $('#tablenotislelong').DataTable({
+           "columnDefs": [ 
+               {
+               "targets": 0,
+               "orderable": false
+               }, 
+               {
+               "targets": 3,
+               "orderable": false
+               }
+           ],
+           order: [[0, 'asc']],
+           "info": false,
+           "lengthChange": false,
+           "pageLength": 99999,
+           dom: 'Bfrtip',
+           buttons: [
+                      
+                   //    {
+                   //        className: 'btn btn-outline-success pl-4 pr-4 btn-sm  export',
+                   //        target: "_blank",
+                   //        titleAttr: 'Export to Excel',
+                   //        text: '<h8><b>EXCEL</b></h8>',
+                   //        action: function ( e, dt, node, config ) {
+                   //            $('#typedonwload').val('excel');
+                   //            $("#exportpdf").submit();
+                   //            // window.open("_blank");
+                   //        }
+                   //    },
+                      
+                      {
+                          className: 'btn btn-outline-danger pl-4 pr-4 btn-sm  export',
+                          titleAttr: 'Export to PDF',
+                          text: '<h8><b>PDF</b></h8>',
+                          action: function ( e, dt, node, config ) {
+                              $('#typedonwload').val('pdf');
+                              $("#exportpdf").submit();
+                          }
+                      
+              }
+
+                     
+                      
+                  ]
+                   
+               });
+       
+               $('.export').tooltip();
+               $( '.export').removeClass('dt-button');
+   
+
+     
+</script>
+@endsection
diff --git a/resources/views/laporan/marhunpermatabycawanganbybatch.blade.php b/resources/views/laporan/marhunpermatabycawanganbybatch.blade.php
new file mode 100644
index 00000000..2e21ce59
--- /dev/null
+++ b/resources/views/laporan/marhunpermatabycawanganbybatch.blade.php
@@ -0,0 +1,135 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="card-header header-style">
+                        <a href="javascript:window.history.go(-1);" class="header-style-icon">
+                            <i class="fas fa-arrow-left"></i>
+                        </a>
+                        <div class="header-style-title">
+                            Marhun Permata: {{$cawanganDetail}}<br>
+                            BatchNo: {{$senarai[0]['batchno']}}
+                        </div>
+                    </div>
+                
+                 
+                </div>
+                <div class="card-body">
+          
+            @if ($message = Session::get('success'))
+            <div class="alert alert-success">
+                <p>{{ $message }}</p>
+            </div>
+            @endif
+            <form id="exportform" action="" method="POST">
+                <input type="hidden" name="type" value="User">
+                <table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>Bil</th>
+                            <th>No.Rujukan</th>
+                            <th>No.KP</th>
+                            <th>Kuantiti</th>
+                            <th>Tarikh Pembiayaan/Tarikh Gadaian</th>
+                            <th>Tarikh Lelong</th>
+                            <th>Baki Lelong(RM)</th>
+                            <th>Rugi Lelong(RM)</th>
+                            <th>Tempoh Simpanan Batu Permata Selepas Lelong</th>
+                            <th>Marhun</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                     {{-- {{dd($senarai[0]['lelong'])}} --}}
+                        @foreach ($senarai[0]['lelong'] as $index=>$bid)
+                        {{-- {{ \Carbon\Carbon::createFromFormat('created_at', 'd-m-Y')->toDateTimeString() }} --}}
+                        @php
+                             $today = date('Y-m-d');
+                            $get_start_date = new DateTime($today); // New date object
+                            $get_end_date = date('Y-m-d',strtotime($bid['t_lelong']));
+                            $end_date = new DateTime($get_end_date); // New date object
+                            $months = $end_date->diff($get_start_date);
+                            $months1 = $months->format('%y Tahun %m Bulan %d Hari');
+
+                        @endphp
+                        <tr>
+                            <td>{{$loop->iteration}}     
+                            <td style='white-space:nowrap;'>{{ $bid['norujukan']}}</td>     
+                            <td>{{ $bid['nokp']}}</td>    
+                            <td>{{ $bid['kuantiti']}}</td>     
+                            <td style='white-space:nowrap;'> @php
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $bid['t_gadai'] );
+                                $t_gadai =  $myDateTime->format('d-m-Y');
+                                echo($t_gadai);
+                                @endphp</td>     
+                            <td style='white-space:nowrap;'>@php
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $bid['t_lelong'] );
+                                $t_lelong =  $myDateTime->format('d-m-Y');
+                                echo($t_lelong);
+                                @endphp</td>     
+                            <td>@php  if($bid['baki'] > 0){
+                                $bakilelong = $bid['baki'];
+                                echo($bakilelong);}
+                              elseif($bid['baki'] < 0){
+                                $bakilelong = '';
+                                echo($bakilelong);}
+                                @endphp
+                               </td>
+                            <td>@php  if($bid['baki'] > 0){
+                                $bakilelong = '';
+                                echo($bakilelong);}
+                              elseif($bid['baki'] < 0){
+                                $bakilelong = $bid['baki'];
+                                echo($bakilelong);}
+                                @endphp
+                                </td>    
+                                <td>{{$months1}}</td>                  
+                            <td align='left' style='white-space:nowrap;'> 
+                               
+                                @foreach ($bid['listmarhun'] as $index1=>$bid2)
+                                {{$loop->iteration.'. '.$bid2['marhun'].':'.$bid2['nota']}}<br>
+                                @endforeach
+                               
+                            </td>
+                           
+                        </tr>
+                        @endforeach
+                    </tbody>
+                    
+                </table>
+            </form>
+        </div>
+        
+    </div>
+</div>
+
+<script>
+     //Enable tooltips everywhere
+     $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+    var tablenotislelong = $('#tablenotislelong').DataTable({
+            "columnDefs": [ 
+                {
+                "targets": 0,
+                "orderable": false
+                }, 
+                {
+                "targets": 3,
+                "orderable": false
+                }
+            ],
+            order: [[0, 'asc']],
+            "info": false,
+            "lengthChange": false,
+            "pageLength": 99999,
+            dom: 'Bfrtip',
+    
+    });
+
+      
+</script>
+@endsection
diff --git a/routes/web.php b/routes/web.php
index bb5b1e69..040a3c89 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -367,6 +367,8 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'],
     Route::get('/opsenaraisahtangguh/{lelong_id}/{caw_code}',['as'=>'pengesahan.opsenaraisahtangguh','uses'=>'TangguhLelongController@operasisenmohontangguh']);
     Route::get('/senaraitlhtangguh',['as'=>'pengesahan.senaraitlhtangguh','uses'=>'TangguhLelongController@senaraitlhtangguh']);
     Route::get('/opsenaraitangguh/{lelong_id}/{caw_code}',['as'=>'pengesahan.opsenaraitangguh','uses'=>'TangguhLelongController@operasisenlulustangguh']);
+    // Route::get('/senaraibukasekatan',['as'=>'pengesahan.senaraibukasekatan','uses'=>'TangguhLelongController@senaraibukasekatan']);
+    // Route::get('/opsenaraisahbukasekatan/{lelong_id}/{caw_code}',['as'=>'pengesahan.opsenaraisahbukasekatan','uses'=>'TangguhLelongController@operasisenmohonbukasekatan']);
 });
 
 Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notistamatkontrak'], function () {
@@ -433,6 +435,8 @@ Route::group(['middleware' => ['permission:tangguhlelong'],'prefix'=>'tangguhlel
     Route::get('/tangguhlelongoperasi', ['as'=>'tangguhlelong.tangguhlelongoperasi','uses'=>'TangguhLelongController@tangguhlelongoperasi']);
     Route::post('/tangguhlelongsearchsag', ['as'=>'tangguhlelong.tangguhlelongsearchsag','uses'=>'TangguhLelongController@tangguhlelongsearchsag']);
     Route::post('/tangguhlelongsubmitform', ['as'=>'tangguhlelong.tangguhlelongsubmitform','uses'=>'TangguhLelongController@tangguhlelongsubmitform']);
+    // Route::get('/bukasekatantebus', ['as'=>'tangguhlelong.bukasekatantebus','uses'=>'TangguhLelongController@senleluntuktangguh']);
+   
 });
 
 //pengurus cawangan KHAS
@@ -616,6 +620,15 @@ Route::get('laporanbrglelpembidacaw/{lelong_id}',['as'=>'reportcaw.laporanbrglel
     
 Route::get('indexubahmarhun',['as'=>'reportcaw.indexubahmarhun','uses'=>'ReportCawanganController@indexubahmarhun']);
 
+//marhun permata cawangan
+Route::get('/marhunpermatabycaw',['as' =>'reportcaw.marhunpermatabycaw','uses'=>'ReportCawanganController@marhunpermatabycaw']);
+Route::get('/marhunpermatabycawdetail/{cawid}',['as'=>'reportcaw.marhunpermatabycawdetail','uses'=>'ReportCawanganController@marhunpermatabycawdetail']);
+Route::get('/marhunpermatabycawdetailbatch/{kodcaw}/{batchno}',['as'=>'reportcaw.marhunpermatabycawdetailbatch','uses'=>'ReportCawanganController@marhunpermatabycawdetailbatch']);
+Route::get('/marhunpermatabycawdetailall/{cawid}',['as'=>'reportcaw.marhunpermatabycawdetailall','uses'=>'ReportCawanganController@marhunpermatabycawdetailall']);
+Route::post('/marhunpermatabycawdetailallpdf/{cawid}',['as'=>'reportcaw.marhunpermatabycawdetailallpdf','uses'=>'ReportCawanganController@marhunpermatabycawdetailallpdf']);
+Route::get('/marhunpermatabycawdetailallT/{cawid}',['as'=>'reportcaw.marhunpermatabycawdetailallT','uses'=>'ReportCawanganController@marhunpermatabycawdetailallT']);
+Route::post('/marhunpermatabycawdetailallpdfT/{cawid}',['as'=>'reportcaw.marhunpermatabycawdetailallpdfT','uses'=>'ReportCawanganController@marhunpermatabycawdetailallpdfT']);
+
 });
 
 //Report by cawangan KHAS
@@ -685,7 +698,14 @@ Route::group(['middleware' => ['permission:reportbycaw'],'prefix'=>'reportbycaw'
     Route::get('/laporanlelongbycaw',['as' =>'reportbycaw.laporanlelongbycaw','uses'=>'ReportAllController@laporanlelongbycaw']);
     Route::get('/laporanlelongbycawdetail/{cawid}',['as'=>'reportbycaw.laporanlelongbycawdetail','uses'=>'ReportAllController@laporanlelongbycawdetail']);
     Route::get('/laporanlelongbycawdetailpdf/{lelong_id}/{kodcaw}',['as'=>'reportbycaw.laporanlelongbycawdetailpdf','uses'=>'ReportAllController@laporanlelongbycawdetailpdf']);
-    });
+    Route::get('/marhunpermatabycaw',['as' =>'reportbycaw.marhunpermatabycaw','uses'=>'ReportAllController@marhunpermatabycaw']);
+    Route::get('/marhunpermatabycawdetail/{cawid}',['as'=>'reportbycaw.marhunpermatabycawdetail','uses'=>'ReportAllController@marhunpermatabycawdetail']);
+    Route::get('/marhunpermatabycawdetailbatch/{kodcaw}/{batchno}',['as'=>'reportbycaw.marhunpermatabycawdetailbatch','uses'=>'ReportAllController@marhunpermatabycawdetailbatch']);
+    Route::get('/marhunpermatabycawdetailall/{cawid}',['as'=>'reportbycaw.marhunpermatabycawdetailall','uses'=>'ReportAllController@marhunpermatabycawdetailall']);
+    Route::post('/marhunpermatabycawdetailallpdf/{cawid}',['as'=>'reportbycaw.marhunpermatabycawdetailallpdf','uses'=>'ReportAllController@marhunpermatabycawdetailallpdf']);
+    Route::get('/marhunpermatabycawdetailallT/{cawid}',['as'=>'reportbycaw.marhunpermatabycawdetailallT','uses'=>'ReportAllController@marhunpermatabycawdetailallT']);
+    Route::post('/marhunpermatabycawdetailallpdfT/{cawid}',['as'=>'reportbycaw.marhunpermatabycawdetailallpdfT','uses'=>'ReportAllController@marhunpermatabycawdetailallpdfT']);
+});
 
     // Route::get('/', 'ChartController@index');
 
@@ -743,4 +763,14 @@ Route::group(['middleware' => ['permission:reportbycaw'],'prefix'=>'reportbydate
     Route::post('/docaribydate',['as'=>'reportbydate.docaribydate','uses'=>'ReportAllController@docaribydate']); 
     Route::post('/senaraitemplaporanbydate',['as'=>'reportbydate.senaraitemplaporanbydate','uses'=>'ReportAllController@senaraitemplaporanbydate']); 
     Route::post('/docaribydate2',['as'=>'reportbydate.docaribydate2','uses'=>'ReportAllController@docaribydate2']); 
-    });
\ No newline at end of file
+    });
+
+// Route::group(['middleware' => ['permission:bukasekatan'],'prefix'=>'bukasekatan'], function () {
+//         Route::get('/bukasekatantebus', ['as'=>'bukasekatan.bukasekatantebus','uses'=>'TangguhLelongController@bukasekatantebus']);
+//         Route::get('/carian/{lelong_id}', ['as'=>'bukasekatan.carian','uses'=>'TangguhLelongController@carianbukasekatan']);
+//         Route::get('/docarianbukasekatan', ['as'=>'bukasekatan.docarianbukasekatan','uses'=>'TangguhLelongController@docarianbukasekatan']);
+//         Route::post('/searchbyicbukasekatan', ['as'=>'bukasekatan.searchbyicbukasekatan','uses'=>'TangguhLelongController@searchbyicbukasekatan']);
+//         Route::post('/mohonbukasekatan', ['as'=>'bukasekatan.mohonbukasekatan','uses'=>'TangguhLelongController@mohonbukasekatan']);
+//         Route::get('/listbukasekatantebus', ['as'=>'bukasekatan.listbukasekatantebus','uses'=>'TangguhLelongController@listbukasekatantebus']);
+//         Route::post('/operasisahbukasekatan', ['as'=>'bukasekatan.operasisahbukasekatan','uses'=>'TangguhLelongController@operasisahbukasekatan']);
+//     });
\ No newline at end of file