From 65024489b1d44d497e7bd67cc07f1834dc6fa451 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Tue, 29 Nov 2022 00:21:15 +0800
Subject: [PATCH] update page laporan role caw

---
 .../Controllers/ReportCawanganController.php  |   3 +-
 .../views/account/listbayaranonline.blade.php |  23 ++-
 .../views/account/senarailelongan.blade.php   |  18 +-
 .../views/home/listbayaranonline.blade.php    |   6 +-
 .../lelong/indexbrgleldetailscaw.blade.php    |  19 +-
 .../lelong/indexbrglelpembidacaw.blade.php    |  19 +-
 .../views/lelong/indexlelfullcaw.blade.php    |  19 +-
 .../lelong/indexnamapembidacaw.blade.php      |  19 +-
 .../views/lelong/laporancawindex.blade.php    |  20 +-
 resources/views/pdf/brglelcaw.blade.php       |  41 ++--
 .../pdf/laporanbrgleldetailscaw.blade.php     | 132 +++++++++----
 .../pdf/laporanbrglelpembidacaw.blade.php     |  97 +++++++---
 .../views/pdf/laporanlelfullcaw.blade.php     | 177 +++++++++++-------
 .../views/pdf/laporannamapembidacaw.blade.php |  98 +++++++---
 14 files changed, 468 insertions(+), 223 deletions(-)

diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php
index 0a9024ac..a15d9e0e 100644
--- a/app/Http/Controllers/ReportCawanganController.php
+++ b/app/Http/Controllers/ReportCawanganController.php
@@ -252,6 +252,7 @@ class ReportCawanganController extends Controller
         $laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
         ->select('lelongbid_id','norujukan','hargaasas')
         ->where('lelongbid.lelong_id','=',$lelong_id)
+        ->where('lelongbid.kodcaw','=',$user['kodcaw'])
         ->groupBy('lelongbid_id')
         ->get()
         ->toArray();
@@ -350,7 +351,7 @@ class ReportCawanganController extends Controller
         $pdf = PDF::loadView('pdf.laporanlelfullcaw',compact('info','lelong_id','laporanlelong','lelong_id','total_nmarhun','total_pembiayaan',
         'total_upahsimpan','total_cajlelong','total_hargalelong','total_bakirugi','total_hargaasas','arrayinfocaw'))
 
-        ->setPaper('a4', 'potrait');
+        ->setPaper('a4', 'landscape');
         return $pdf->download('Laporan Lelong Keseluruhan.pdf');
 
 
diff --git a/resources/views/account/listbayaranonline.blade.php b/resources/views/account/listbayaranonline.blade.php
index 08015fcb..68141115 100644
--- a/resources/views/account/listbayaranonline.blade.php
+++ b/resources/views/account/listbayaranonline.blade.php
@@ -4,10 +4,17 @@
 
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
-              </div><br>
+        <div class="col">
+            <div class="card">
+                <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">
+                        Senarai Bayaran Atas Talian
+                    </div>
+                </div>
+                <div class="card-body">
         @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -15,7 +22,7 @@
         @endif
         <h4> Senarai Bayaran Atas Talian </h4>
             <p><i class="fas fa-caret-right"></i>  {{ $getkodcaw['caw_name'] }}</p>
-        <table class="table table-striped  table-xl text-center" id="sahsagonline" style="width:100%">
+        <table class="table table-bordered text-center" id="sahsagonline" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
@@ -39,17 +46,17 @@
                             <td>{{ number_format($winner['totalPay'], 2, '.', ',')}}</td>
                             <td>{{ number_format($winner['totalBid'], 2, '.', ',')}}</td>
                             <td>
-                                <a href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'caw_code'=>$kodcaw]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                                <a  href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'caw_code'=>$kodcaw]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
                 @endforeach
             </tbody>
         </table>
-        <div class="modal-footer" style="margin-top:2%;">
+        {{-- <div class="modal-footer" style="margin-top:2%;">
                     <a  href="{{ route('account.senarailelongan') }}" class="btn btn-primary">Kembali</a>
                 </div>
         </div>
-    </div>
+    </div> --}}
 </div>
 
 <script>
diff --git a/resources/views/account/senarailelongan.blade.php b/resources/views/account/senarailelongan.blade.php
index 918cb77d..ae215d64 100644
--- a/resources/views/account/senarailelongan.blade.php
+++ b/resources/views/account/senarailelongan.blade.php
@@ -3,15 +3,23 @@
 @section('content')
 
 <div class="container-fluid">
-    <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
+    <div class="row">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                 
+                    <div class="header-style-title">
+                        Senarai Lelongan
+                    </div>
+                </div>
+                <div class="card-body">
         @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
                 </div>
         @endif
-        <h4 style="margin-left:1%;"> Senarai Lelongan </h4>
-        <table class="table table-striped  table-xl text-center" id="senarailelongan" style="width:100%">
+
+        <table class="table text-center table-bordered" id="senarailelongan" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
@@ -34,7 +42,7 @@
                     @endphp</td>
                     <td align='left'>
                         @foreach($data['detailsinfo'] as $details)
-                        <a href=" {{ route('account.listbayaranonline', ['lelong_id'=>$data['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                        <a class="btn m-1 btn-primary" href=" {{ route('account.listbayaranonline', ['lelong_id'=>$data['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
                         <span class="m-2">{{ $details['caw_name']}}
                         </span><br>
                         @endforeach
diff --git a/resources/views/home/listbayaranonline.blade.php b/resources/views/home/listbayaranonline.blade.php
index 08015fcb..23761e48 100644
--- a/resources/views/home/listbayaranonline.blade.php
+++ b/resources/views/home/listbayaranonline.blade.php
@@ -39,16 +39,16 @@
                             <td>{{ number_format($winner['totalPay'], 2, '.', ',')}}</td>
                             <td>{{ number_format($winner['totalBid'], 2, '.', ',')}}</td>
                             <td>
-                                <a href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'caw_code'=>$kodcaw]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                                <a class="btn m-1 btn-primary"  href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'caw_code'=>$kodcaw]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
                 @endforeach
             </tbody>
         </table>
-        <div class="modal-footer" style="margin-top:2%;">
+        {{-- <div class="modal-footer" style="margin-top:2%;">
                     <a  href="{{ route('account.senarailelongan') }}" class="btn btn-primary">Kembali</a>
                 </div>
-        </div>
+        </div> --}}
     </div>
 </div>
 
diff --git a/resources/views/lelong/indexbrgleldetailscaw.blade.php b/resources/views/lelong/indexbrgleldetailscaw.blade.php
index cceca29d..82f3752b 100644
--- a/resources/views/lelong/indexbrgleldetailscaw.blade.php
+++ b/resources/views/lelong/indexbrgleldetailscaw.blade.php
@@ -3,10 +3,17 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            @foreach($cawname as $cawname)
-            <h4 class="pt-3" style="margin-left:1%;">Butiran Laporan Barang Lelong: {{$cawname->caw_name}} </h4>
-            @endforeach
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        @foreach($cawname as $cawname)
+                        BUTIRAN BARANG LELONGAN: {{$cawname->caw_name}}
+                        @endforeach
+                    </div>
+                </div>
+                <div class="card-body">
+          
             @if ($message = Session::get('success'))
             <div class="alert alert-success">
                 <p>{{ $message }}</p>
@@ -14,7 +21,7 @@
             @endif
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl" id="tablenotislelong" style="width:100%">
+                <table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
@@ -37,7 +44,7 @@
                             @endphp</td>
                             <td>{{ $bid->fasa }}</td>
                             <td class="text-center">
-                            <a  href="{{ route('reportcaw.laporanbrgleldetailscaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Laporan Barang Lelong" ><i class="fas fa-download"></i></a>
+                            <a class="btn m-1 btn-info"  href="{{ route('reportcaw.laporanbrgleldetailscaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Maklumat Lanjut" ><i class="fas fa-download"></i></a>
                             </td>
                         </tr>
                         @endforeach
diff --git a/resources/views/lelong/indexbrglelpembidacaw.blade.php b/resources/views/lelong/indexbrglelpembidacaw.blade.php
index bd835699..e5fc83d2 100644
--- a/resources/views/lelong/indexbrglelpembidacaw.blade.php
+++ b/resources/views/lelong/indexbrglelpembidacaw.blade.php
@@ -3,10 +3,17 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            @foreach($cawname as $cawname)
-            <h4 class="pt-3" style="margin-left:1%;">Laporan Barang Lelong Pembida: {{$cawname->caw_name}} </h4>
-            @endforeach
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        @foreach($cawname as $cawname)
+                        BARANG LELONGAN PEMBIDA: {{$cawname->caw_name}}
+                        @endforeach
+                    </div>
+                </div>
+                <div class="card-body">
+           
             @if ($message = Session::get('success'))
             <div class="alert alert-success">
                 <p>{{ $message }}</p>
@@ -14,7 +21,7 @@
             @endif
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl" id="tablenotislelong" style="width:100%">
+                <table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
@@ -37,7 +44,7 @@
                             @endphp</td>
                             <td>{{ $bid->fasa }}</td>
                             <td class="text-center">
-                            <a  href="{{ route('reportcaw.laporanbrglelpembidacaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="fas fa-download"></i></a>
+                            <a class="btn m-1 btn-info"  href="{{ route('reportcaw.laporanbrglelpembidacaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="fas fa-download"></i></a>
                             </td>
                         </tr>
                         @endforeach
diff --git a/resources/views/lelong/indexlelfullcaw.blade.php b/resources/views/lelong/indexlelfullcaw.blade.php
index c1768832..e16076ca 100644
--- a/resources/views/lelong/indexlelfullcaw.blade.php
+++ b/resources/views/lelong/indexlelfullcaw.blade.php
@@ -3,10 +3,17 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            @foreach($cawname as $cawname)
-            <h4 class="pt-3" style="margin-left:1%;">Laporan Lelong Keseluruhan: {{$cawname->caw_name}} </h4>
-            @endforeach
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        @foreach($cawname as $cawname)
+                        LAPORAN LELONGAN: {{$cawname->caw_name}}
+                        @endforeach
+                    </div>
+                </div>
+                <div class="card-body">
+          
             @if ($message = Session::get('success'))
             <div class="alert alert-success">
                 <p>{{ $message }}</p>
@@ -14,7 +21,7 @@
             @endif
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl" id="tablenotislelong" style="width:100%">
+                <table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
@@ -37,7 +44,7 @@
                             @endphp</td>
                             <td>{{ $bid->fasa }}</td>
                             <td class="text-center">
-                            <a  href="{{ route('reportcaw.laporanlelfullcaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="fas fa-download"></i></a>
+                            <a class="btn m-1 btn-info" href="{{ route('reportcaw.laporanlelfullcaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="fas fa-download"></i></a>
                             </td>
                         </tr>
                         @endforeach
diff --git a/resources/views/lelong/indexnamapembidacaw.blade.php b/resources/views/lelong/indexnamapembidacaw.blade.php
index 78d3bdee..971c44c6 100644
--- a/resources/views/lelong/indexnamapembidacaw.blade.php
+++ b/resources/views/lelong/indexnamapembidacaw.blade.php
@@ -3,10 +3,17 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            @foreach($cawname as $cawname)
-            <h4 class="pt-3" style="margin-left:1%;">Laporan Nama Pembida: {{$cawname->caw_name}} </h4>
-            @endforeach
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        @foreach($cawname as $cawname)
+                        Laporan Nama Pembida: {{$cawname->caw_name}}
+                        @endforeach
+                    </div>
+                </div>
+                <div class="card-body">
+           
             @if ($message = Session::get('success'))
             <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -14,7 +21,7 @@
             @endif
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl" id="tablenotislelong" style="width:100%">
+                <table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
@@ -37,7 +44,7 @@
                             @endphp</td>
                             <td>{{ $bid->fasa }}</td>
                             <td class="text-center">
-                            <a  href="{{ route('reportcaw.laporannamapembidacaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="fas fa-download"></i></a>
+                            <a class="btn m-1 btn-info" href="{{ route('reportcaw.laporannamapembidacaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="fas fa-download"></i></a>
                             </td>
                         </tr>
                         @endforeach
diff --git a/resources/views/lelong/laporancawindex.blade.php b/resources/views/lelong/laporancawindex.blade.php
index 09d15f52..30928448 100644
--- a/resources/views/lelong/laporancawindex.blade.php
+++ b/resources/views/lelong/laporancawindex.blade.php
@@ -3,10 +3,18 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            @foreach($cawname as $cawname)
-            <h4 class="pt-3" style="margin-left:1%;">Laporan Barang Lelong: {{$cawname['caw_name']}} </h4>
-            @endforeach
+        <div class="col mx-auto p-4">
+            <div class="card">
+            <div class="card-header header-style">
+                
+                <div class="header-style-title">
+                    @foreach($cawname as $cawname)
+                        SENARAI BARANG LELONGAN : {{$cawname['caw_name']}}
+                    @endforeach
+                </div>
+            </div>
+            <div class="card-body">
+           
             @if ($message = Session::get('success'))
             <div class="alert alert-success">
                 <p>{{ $message }}</p>
@@ -14,7 +22,7 @@
             @endif
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl" id="tablenotislelong" style="width:100%">
+                <table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
@@ -37,7 +45,7 @@
                             @endphp</td>
                             <td>{{ $bid->fasa }}</td>
                             <td class="text-center">
-                            <a  href="{{ route('reportcaw.laporanbrglelcaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="fas fa-download"></i></a>
+                            <a class="btn m-1 btn-info" href="{{ route('reportcaw.laporanbrglelcaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Maklumat Lanjut" ><i class="fas fa-download"></i></a>
                             </td>
                         </tr>
                         @endforeach
diff --git a/resources/views/pdf/brglelcaw.blade.php b/resources/views/pdf/brglelcaw.blade.php
index e85ff781..6a4af57a 100644
--- a/resources/views/pdf/brglelcaw.blade.php
+++ b/resources/views/pdf/brglelcaw.blade.php
@@ -11,7 +11,7 @@
 #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
     border: 0px solid;
     padding: 1px;
-    text-align: left;
+    /* text-align: left; */
     
 }
 
@@ -20,7 +20,7 @@
 #sim tr:hover {}
 
 #sim th {
-    text-align: left;
+    /* text-align: left; */
     border: 0px solid;
 	table-layout:auto;
     color: black;
@@ -37,7 +37,7 @@
 }
   
 .column {
-  float: left;
+  /* float: left; */
   width: 100%;
   padding: 5px;
 }
@@ -57,18 +57,18 @@ table {
 }
 
 td {
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
 }
 
 th{
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
-  background-color:gainsboro;
+  /* background-color:gainsboro; */
 }
 
 tr:nth-child(even) {
-  background-color: #f2f2f2;
+  /* background-color: #f2f2f2; */
 }
 
 </style>
@@ -81,7 +81,7 @@ tr:nth-child(even) {
                         </tr>
 
                         <tr>
-                          <td colspan="2"><u><b>LAPORAN BARANG LELONG</b></u></td>
+                          <td colspan="2"><u><b>SENARAI BARANG LELONG</b></u></td>
 
                         </tr>
                     </table>
@@ -92,13 +92,16 @@ tr:nth-child(even) {
                         <tr>
                           @foreach ($info as $info)
                           <td>Batch Lelong: {{$info['lelong_id']}}</td>
+                          <td>Cawangan : {{$info['caw_name']}}    
+                          <tr>
                           <td>Tarikh Lelong : @php
                             $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
                             $t_lelong =  $myDateTime->format('d-m-Y');
                             echo($t_lelong);
                         @endphp</td>
-                          <td>Fasa: {{$info['fasa']}}
-                          <td>Nama Cawangan : {{$info['caw_name']}}                          
+                        <tr>
+                          {{-- <td>Fasa: {{$info['fasa']}} --}}
+                          {{-- <td>Nama Cawangan : {{$info['caw_name']}}                           --}}
                         @endforeach
                         </tr>
                       </thead>
@@ -111,10 +114,11 @@ tr:nth-child(even) {
                         <thead>
                         <tr> 
                           <th width="5%" align="left">No</th> 
-                          <th width="25%" align="left">No Rujukan</th> 
+                          <th width="25%" align="center">No Rujukan</th> 
                           <th width="25%" align="left">Marhun</th>
-                          <th width="25%" align="left">Berat (gm)</th>
-                          <th width="25%" align="left">Harga Asas</th>
+                          <th width="25%" align="right">Berat (gm)</th>
+                          <th width="25%" align="right">Harga Asas</th>
+                          <th width="25%" align="center">Harga Tawaran</th>
                         </tr>
                         </thead>
 
@@ -123,16 +127,17 @@ tr:nth-child(even) {
 
                             <td width="5%" align="center">{{ $loop->iteration }} </td>
                             <td width="14%" align="center">{{ $brg['norujukan']}}</td>
-                            <td width="17%" align="center">{{ $brg['marhun']}}</td>  
-                            <td width="17%" align="center">{{ number_format($brg['berat'], 2, '.', ',') }}</td>
-                            <td width="12%" align="center">{{ number_format($brg['hargaasas'], 2, '.', ',') }}</td>
+                            <td width="17%" align="left">{{ $brg['marhun']}}</td>  
+                            <td width="17%" align="right">{{ number_format($brg['berat'], 2, '.', ',') }}</td>
+                            <td width="12%" align = 'right'>{{ number_format($brg['hargaasas'], 2, '.', ',') }}</td>
+                            <td width="12%" align = 'center'>________________</td>
                         </tr>
                         @endforeach
 
                         <tr>
                           <td colspan="3"><b>JUMLAH KESELURUHAN</b></td> 
-                          <td>{{ number_format($total_berat, 2, '.', ',') }}</td>
-                          <td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>          
+                          <td align = 'right'><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                          <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>          
                         </tr>
                        
 
diff --git a/resources/views/pdf/laporanbrgleldetailscaw.blade.php b/resources/views/pdf/laporanbrgleldetailscaw.blade.php
index c8c7f626..dd7a626e 100644
--- a/resources/views/pdf/laporanbrgleldetailscaw.blade.php
+++ b/resources/views/pdf/laporanbrgleldetailscaw.blade.php
@@ -11,19 +11,54 @@
 #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
     border: 0px solid;
     padding: 1px;
-    text-align: left;
+    
+    /* text-align: left; */
     
 }
 
-#sim tr:nth-child(even){}
+#sim tr:nth-child(even){
+  border-bottom: 1px solid #ddd;
+}
 
 #sim tr:hover {}
 
 #sim th {
-    text-align: left;
+    /* text-align: left; */
     border: 0px solid;
 	table-layout:auto;
     color: black;
+    
+	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+}
+
+
+#sim2 {
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+	font-size:10px;
+	border-collapse: collapse;
+    width: 100%;
+}
+
+#sim2 td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+    border: 0px solid;
+    padding: 1px;
+    
+    /* text-align: left; */
+    
+}
+
+#sim2 tr:nth-child(even){
+  /* border-bottom: 1px solid #ddd; */
+}
+
+#sim2 tr:hover {}
+
+#sim2 th {
+    /* text-align: left; */
+    border: 0px solid;
+	table-layout:auto;
+    color: black;
+    
 	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 
@@ -37,7 +72,7 @@
 }
   
 .column {
-  float: left;
+  /* float: left; */
   width: 100%;
   padding: 5px;
 }
@@ -57,18 +92,24 @@ table {
 }
 
 td {
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
 }
 
 th{
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
-  background-color:gainsboro;
+  /* text-align: left; */
+	table-layout:auto
+    color: black;
+    border-bottom: 1px solid #ddd;
+  /* background-color:gainsboro; */
 }
 
+
 tr:nth-child(even) {
-  background-color: #f2f2f2;
+  /* background-color: #f2f2f2; */
+
 }
 
 </style>
@@ -76,18 +117,18 @@ tr:nth-child(even) {
 
 <body>
 
-  <table width="100%" border="0" id="sim">
+  <table width="100%" border="0" id ="sim2">
     <tr>
       <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
     </tr>
 
     <tr>
-      <td colspan="2"><u><b>BUTIRAN LAPORAN BARANG LELONG </b></u></td>
+      <td colspan="2"><u><b>BUTIRAN SENARAI BARANG LELONG </b></u></td>
 
     </tr>
 </table>
 
-<table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
+{{-- <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id ="sim2">
   <thead>
     <br>
     <tr>
@@ -106,21 +147,44 @@ tr:nth-child(even) {
     @endforeach
     </tr>
   </thead>
-</table>
+</table> --}}
+
+<table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim2">
+  <thead>
+    <br>
+    <tr>
+      @foreach ($arrayinfo as $laporan)
+      <td>Batch Lelong: {{$laporan['laporan']['lelong_id']}}</td>
+      @foreach ($laporan['details'] as $details)
+      <td>Cawangan : {{$details['caw_name']}}
+      @endforeach
+      <tr>
+      <td>Tarikh Lelong : @php
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
+        $t_lelong =  $myDateTime->format('d-m-Y');
+        echo($t_lelong);
+    @endphp</td>
+    <tr>
+      {{-- <td>Fasa: {{$info['fasa']}} --}}
+      {{-- <td>Nama Cawangan : {{$info['caw_name']}}                           --}}
+    @endforeach
+    </tr>
+  </thead>
+</table> 
 
   <br>
                 
-                      <table cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
+                      <table cellspacing="0" cellpadding="5" style="float:right;" width="100%" height="80" align="left" id="sim">
                         <thead>
                         <tr> 
                           <th width="2%" align="left">No</th> 
                               <th width="15%" align="left">No Rujukan </th> 
                               <th width="10%" align="left">Jenis Marhun</th>
-                              <th width="10%" align="left">Karat</th> 
-                              <th width="10%" align="left">Berat(gm)</th> 
-                              <th width="12%" align="left">Harga(RM)</th>
-                              <th width="12%" align="left">Nilai Marhun(RM)</th>
-                              <th width="14%" align="left">Harga Asas(RM)</th>
+                              <th width="10%" align="center">Karat</th> 
+                              <th width="10%" align="right">Berat(gm)</th> 
+                              <th width="12%" align="right">Harga(RM)</th>
+                              <th width="12%" align="right">Nilai Marhun(RM)</th>
+                              <th width="14%" align="right">Harga Asas(RM)</th>
                               <th width="13%" align="left">Nota</th>
                         </tr>
                         </thead>
@@ -134,20 +198,20 @@ tr:nth-child(even) {
                             <td>@foreach ($marhun['detailmarhun'] as $item)
                               {{ $item['marhun'] }}<br>
                             @endforeach</td>
-                            <td>@foreach ($marhun['detailmarhun'] as $item)
+                            <td align="center">@foreach ($marhun['detailmarhun'] as $item)
                               {{ $item['karat'] }}<br>
                             @endforeach</td>
-                            <td>@foreach ($marhun['detailmarhun'] as $item)
+                            <td align="right">@foreach ($marhun['detailmarhun'] as $item)
                               {{ $item['berat'] }}<br>
                             @endforeach</td>  
-                            <td>@foreach ($marhun['detailmarhun'] as $item)
+                            <td align="right">@foreach ($marhun['detailmarhun'] as $item)
                               {{ $item['harga'] }}<br>
                             @endforeach</td>   
-                            <td>@foreach ($marhun['detailmarhun'] as $item)
-                              {{ $item['n_marhun'] }}<br>
+                            <td align="right">@foreach ($marhun['detailmarhun'] as $item)
+                              {{ number_format($item['n_marhun'], 2, '.', ',') }}<br>
                             @endforeach</td>           
-                            <td>@foreach ($marhun['detailmarhun'] as $item)
-                              {{ $item['hargaasas'] }}<br>
+                            <td align="right">@foreach ($marhun['detailmarhun'] as $item)
+                              {{ number_format($item['hargaasas'], 2, '.', ',') }}<br>
                             @endforeach</td>        
                             <td>@foreach ($marhun['detailmarhun'] as $item)
                               {{ $item['nota'] }}<br>
@@ -157,22 +221,22 @@ tr:nth-child(even) {
                         </tr>
 
                         <tr>
-                          <td colspan="4" align="left"></td>
-                          <td>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
-                          <td></td>
-                          <td>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
-                          <td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
+                          {{-- <td colspan="4" align="left"></td>
+                          <td align="right">{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
                           <td></td>
+                          <td align="right">{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
+                          <td align="right">{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
+                          <td></td> --}}
                         </tr>  
                         @endforeach      
                         @foreach ($arraycaw as $index=>$caw)
 
                         <tr>
                           <td colspan="4" align="left"><strong>Jumlah Keseluruhan</strong></td>
-                          <td><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
-                          <td><strong>{{ number_format($total_harga, 2, '.', ',') }}</strong></td>
-                          <td><strong>{{ number_format($total_nmarhun, 2, '.', ',') }}</strong></td>
-                          <td><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
+                          <td align="right"><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
+                          <td align="right"><strong>{{ number_format($total_harga, 2, '.', ',') }}</strong></td>
+                          <td align="right"><strong>{{ number_format($total_nmarhun, 2, '.', ',') }}</strong></td>
+                          <td align="right"><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
                           <td></td>
                         </tr>                                         
       @endforeach
diff --git a/resources/views/pdf/laporanbrglelpembidacaw.blade.php b/resources/views/pdf/laporanbrglelpembidacaw.blade.php
index 95c14b8a..8747be39 100644
--- a/resources/views/pdf/laporanbrglelpembidacaw.blade.php
+++ b/resources/views/pdf/laporanbrglelpembidacaw.blade.php
@@ -11,19 +11,54 @@
 #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
     border: 0px solid;
     padding: 1px;
-    text-align: left;
+    
+    /* text-align: left; */
     
 }
 
-#sim tr:nth-child(even){}
+#sim tr:nth-child(even){
+  /* border-bottom: 1px solid #ddd; */
+}
 
 #sim tr:hover {}
 
 #sim th {
-    text-align: left;
+    /* text-align: left; */
     border: 0px solid;
 	table-layout:auto;
     color: black;
+    
+	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+}
+
+
+#sim2 {
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+	font-size:10px;
+	border-collapse: collapse;
+    width: 100%;
+}
+
+#sim2 td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+    border: 0px solid;
+    padding: 1px;
+    
+    /* text-align: left; */
+    
+}
+
+#sim2 tr:nth-child(even){
+  /* border-bottom: 1px solid #ddd; */
+}
+
+#sim2 tr:hover {}
+
+#sim2 th {
+    /* text-align: left; */
+    border: 0px solid;
+	table-layout:auto;
+    color: black;
+    
 	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 
@@ -37,7 +72,7 @@
 }
   
 .column {
-  float: left;
+  /* float: left; */
   width: 100%;
   padding: 5px;
 }
@@ -57,25 +92,31 @@ table {
 }
 
 td {
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
 }
 
 th{
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
-  background-color:gainsboro;
+  /* text-align: left; */
+	table-layout:auto
+    color: black;
+    border-bottom: 1px solid #ddd;
+  /* background-color:gainsboro; */
 }
 
+
 tr:nth-child(even) {
-  background-color: #f2f2f2;
+  /* background-color: #f2f2f2; */
+
 }
 
 </style>
 
 <body>
 
-          <table width="100%" border="0" id="sim">
+          <table width="100%" border="0" id="sim2">
                         <tr>
                           <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
                         </tr>
@@ -86,32 +127,34 @@ tr:nth-child(even) {
                         </tr>
                     </table>
 
-                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
+                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim2">
                       <thead>
                         <br>
                         <tr>
                           <td>Batch Lelong:  {{$lelong_id}}</td>
-                          @foreach ($info as $info)                     
-                                
-                          <td>Tarikh Lelong : @php
-                            $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
-                            $t_lelong =  $myDateTime->format('d-m-Y');
-                            echo($t_lelong);
-                        @endphp</td>
-                          <td>Fasa: {{$info['fasa']}}                  
-                          @endforeach
+                          @foreach ($info as $info)  
                           @foreach ($arrayinfocaw as $laporancaw)
                           @foreach ($laporancaw['cawangan'] as $details)
                           <td>Cawangan : {{$details['caw_name']}}
                           @endforeach
+                          @endforeach                   
+                          <tr>  
+                          <td>Tarikh Lelong : @php
+                            $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
+                            $t_lelong =  $myDateTime->format('d-m-Y');
+                            echo($t_lelong);
+                            @endphp</td>
+                          </tr>
+                          {{-- <td>Fasa: {{$info['fasa']}}                   --}}
                           @endforeach
+                          
                          
                       </thead>
                     </table>
 
                       <br>
           
-                      <table  cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
+                      <table  cellspacing="0" cellpadding="5" style="float:right;"  width="100%" height="80" align="left" id="sim">
                         
                         <thead>
                         <tr> 
@@ -128,11 +171,11 @@ tr:nth-child(even) {
               @foreach ($brglelpembida as $laporan)
                 <tr>
                     <td>{{ $loop->iteration }}</td>
-                    <td>{{ $laporan['norujukan'] }}</td>
+                    <td style="white-space: nowrap;">{{ $laporan['norujukan'] }}</td>
                     <td>{{ $laporan['marhun']}}</td>
-                    <td>{{ number_format($laporan['berat'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['hargaasas'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['hargabida'], 2, '.', ',')}}</td>
+                    <td align = 'right'>{{ number_format($laporan['berat'], 2, '.', ',')}}</td>
+                    <td align = 'right'>{{ number_format($laporan['hargaasas'], 2, '.', ',')}}</td>
+                    <td align = 'right'>{{ number_format($laporan['hargabida'], 2, '.', ',')}}</td>
                      <td>{{$laporan['nama_bidder']}}</td>
                     
                 </tr>                
@@ -142,9 +185,9 @@ tr:nth-child(even) {
 
               <tr>
                 <td colspan="3" align="left"><strong>Jumlah Keseluruhan</strong></td>
-                <td><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
-                <td><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
-                <td><strong>{{ number_format($total_hargalelong, 2, '.', ',') }}</strong></td>               
+                <td align = 'right'><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
+                <td align = 'right'><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
+                <td align = 'right'><strong>{{ number_format($total_hargalelong, 2, '.', ',') }}</strong></td>               
                 <td></td>
               </tr>                                        
                        
diff --git a/resources/views/pdf/laporanlelfullcaw.blade.php b/resources/views/pdf/laporanlelfullcaw.blade.php
index c87022a9..5747456d 100644
--- a/resources/views/pdf/laporanlelfullcaw.blade.php
+++ b/resources/views/pdf/laporanlelfullcaw.blade.php
@@ -11,19 +11,54 @@
 #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
     border: 0px solid;
     padding: 1px;
-    text-align: left;
+    
+    /* text-align: left; */
     
 }
 
-#sim tr:nth-child(even){}
+#sim tr:nth-child(even){
+  /* border-bottom: 1px solid #ddd; */
+}
 
 #sim tr:hover {}
 
 #sim th {
-    text-align: left;
+    /* text-align: left; */
     border: 0px solid;
 	table-layout:auto;
     color: black;
+    
+	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+}
+
+
+#sim2 {
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+	font-size:10px;
+	border-collapse: collapse;
+    width: 100%;
+}
+
+#sim2 td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+    border: 0px solid;
+    padding: 1px;
+    
+    /* text-align: left; */
+    
+}
+
+#sim2 tr:nth-child(even){
+  /* border-bottom: 1px solid #ddd; */
+}
+
+#sim2 tr:hover {}
+
+#sim2 th {
+    /* text-align: left; */
+    border: 0px solid;
+	table-layout:auto;
+    color: black;
+    
 	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 
@@ -37,7 +72,7 @@
 }
   
 .column {
-  float: left;
+  /* float: left; */
   width: 100%;
   padding: 5px;
 }
@@ -57,25 +92,31 @@ table {
 }
 
 td {
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
 }
 
 th{
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
-  background-color:gainsboro;
+  /* text-align: left; */
+	table-layout:auto
+    color: black;
+    border-bottom: 1px solid #ddd;
+  /* background-color:gainsboro; */
 }
 
+
 tr:nth-child(even) {
-  background-color: #f2f2f2;
+  /* background-color: #f2f2f2; */
+
 }
 
 </style>
 
 <body>
 
-          <table width="100%" border="0" id="sim">
+          <table width="100%" border="0" id="sim2">
                         <tr>
                           <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
                         </tr>
@@ -86,74 +127,80 @@ tr:nth-child(even) {
                         </tr>
                     </table>
 
-                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
+                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim2">
                       <thead>
                         <br>
                         <tr>
                         <td>Batch Lelong:  {{$lelong_id}}</td>
-                        @foreach ($info as $info)                     
-                              
-                        <td>Tarikh Lelong : @php
-                          $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
-                          $t_lelong =  $myDateTime->format('d-m-Y');
-                          echo($t_lelong);
-                      @endphp</td>
-                        <td>Fasa: {{$info['fasa']}}                
-                        @endforeach
                         @foreach ($arrayinfocaw as $laporancaw)
                         @foreach ($laporancaw['cawangan'] as $details)
                         <td>Cawangan : {{$details['caw_name']}}
                         @endforeach
                         @endforeach
+                        @foreach ($info as $info)                     
+                          <tr>    
+                        <td>Tarikh Lelong : @php
+                          $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
+                          $t_lelong =  $myDateTime->format('d-m-Y');
+                          echo($t_lelong);
+                      @endphp</td>
+                          </tr>
+                        {{-- <td>Fasa: {{$info['fasa']}}                 --}}
+                        @endforeach
+                      
                          
                       </thead>
                     </table>
 
                       <br>
           
-                      <table  cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
+                      <table  cellspacing="0" cellpadding="5" style="float:right;" width="100%" height="80" align="left" id="sim">
                         
                         <thead>
                         <tr> 
                             <th>No</th>
                             <th>No Rujukan</th>
-                            <th>Nilai Marhun</th>
-                            <th>Pembiayaan</th>
-                            <th>Upah Simpan</th>
-                            <th>Caj Lelong</th>
-                            <th>Harga Lelong</th>
-                            <th>Baki</th>
-                            <th>Rugi</th>
-                            <th>Harga Asas</th>
+                            <th>Nilai Marhun Asal(RM)</th>
+                            <th>Pembiayaan(RM)</th>
+                            <th>Keuntungan(RM)</th>
+                            <th>Caj Lelong(RM)</th>
+                            <th>Harga Lelong(RM)</th>
+                            <th>Baki Lelong(RM)</th>
+                            {{-- <th>Rugi</th> --}}
+                            <th>Harga Asas(RM)</th>
                             <th>Nama Pembeli</th>                        >
 
                         </tr>
                         </thead>
-
+              @php $total_baki = 0; @endphp
               @foreach ($laporanlelong as $laporan)
                 <tr>
                     <td>{{ $loop->iteration }}</td>
                     <td>{{ $laporan['norujukan'] }}</td>
-                    <td>{{ number_format($laporan['nilaimarhun'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['pinjaman'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['upahsimpan'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['cajlelong'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['hargabida'], 2, '.', ',')}}</td>
+                    <td align="right">{{ number_format($laporan['nilaimarhun'], 2, '.', ',')}}</td>
+                    <td align="right">{{ number_format($laporan['pinjaman'], 2, '.', ',')}}</td>
+                    <td align="right">{{ number_format($laporan['upahsimpan'], 2, '.', ',')}}</td>
+                    <td align="right">{{ number_format($laporan['cajlelong'], 2, '.', ',')}}</td>
+                    <td align="right">{{ number_format($laporan['hargabida'], 2, '.', ',')}}</td>
                     <?php
-                        $rugi = 0;
-                        $baki = 0;
-                         if(strpos($laporan['baki'], '-') !== false)
-                         {
-                            $rugi  = $laporan['baki'];
-                         }
-                         else {
-                            $baki = $laporan['baki'];
-                         }
-                    ?>
-                     <td>{{ number_format($baki, 2, '.', ',') }}</td>
-                     <td>{{ number_format($rugi, 2, '.', ',') }}</td>
-                     <td>{{ number_format($laporan['hargaasas'], 2, '.', ',')}}</td>
-                     <td>{{$laporan['nama_bidder']}}</td>
+                // $total_rugi = 0;
+                
+                 if(strpos($laporan['baki'], '-') !== false)
+                 {
+                     $total_baki  += $laporan['baki'];
+                     
+                    }
+                    else {
+                    $total_baki += $laporan['baki'];
+
+                 }
+            ?>
+                     <td align="right">@if($laporan['baki'] > 0)
+                      {{number_format($laporan['baki'], 2, '.', ',')}}
+                      @elseif($laporan['baki'] < 0 ) ({{number_format(-($laporan['baki']), 2, '.', ',')}}) @endif </td>
+                     {{-- <td align="right">{{ number_format($rugi, 2, '.', ',') }}</td> --}}
+                     <td align="right">{{ number_format($laporan['hargaasas'], 2, '.', ',')}}</td>
+                     <td align="right">{{$laporan['nama_bidder']}}</td>
                     
                 </tr>                
               @endforeach
@@ -162,27 +209,19 @@ tr:nth-child(even) {
 
               <tr>
                 <td colspan="2" align="left"><strong>Jumlah Keseluruhan</strong></td>
-                <td><strong>{{ number_format($total_nmarhun, 2, '.', ',') }}</strong></td>
-                <td><strong>{{ number_format($total_pembiayaan, 2, '.', ',') }}</strong></td>
-                <td><strong>{{ number_format($total_upahsimpan, 2, '.', ',') }}</strong></td>
-                <td><strong>{{ number_format($total_cajlelong, 2, '.', ',') }}</strong></td>
-                <td><strong>{{ number_format($total_hargalelong, 2,'.',',') }}</strong></td>
-                <?php
-                $total_rugi = 0;
-                $total_baki = 0;
-                 if(strpos($total_bakirugi, '-') !== false)
-                 {
-                     $total_rugi  = $total_bakirugi;
-                     
-                    }
-                    else {
-                    $total_baki = $total_bakirugi;
-
-                 }
-            ?>
-                <td><strong>{{number_format($total_baki, 2, '.', ',')}}</strong></td>
-                <td><strong>{{number_format($total_rugi, 2, '.', ',')}}</strong></td>
-                <td><strong>{{number_format($total_hargaasas, 2, '.', ',')}}</strong></td>
+                <td align="right"><strong>{{ number_format($total_nmarhun, 2, '.', ',') }}</strong></td>
+                <td align = 'right'><strong>{{ number_format($total_pembiayaan, 2, '.', ',') }}</strong></td>
+                <td align = 'right'><strong>{{ number_format($total_upahsimpan, 2, '.', ',') }}</strong></td>
+                <td align = 'right'><strong>{{ number_format($total_cajlelong, 2, '.', ',') }}</strong></td>
+                <td align = 'right'><strong>{{ number_format($total_hargalelong, 2,'.',',') }}</strong></td>
+              
+                <td align = 'right'><b>@if($total_baki > 0)
+                  {{ number_format($total_baki, 2, '.', ',') }}
+              @else
+                   ({{number_format(-($total_baki), 2, '.', ',')}})
+              @endif</b></td>
+                {{-- <td align = 'right'><strong>{{number_format($total_rugi, 2, '.', ',')}}</strong></td> --}}
+                <td align = 'right'><strong>{{number_format($total_hargaasas, 2, '.', ',')}}</strong></td>
                 <td></td>
               </tr>                                         
                        
diff --git a/resources/views/pdf/laporannamapembidacaw.blade.php b/resources/views/pdf/laporannamapembidacaw.blade.php
index 8ef1e93e..0499b07a 100644
--- a/resources/views/pdf/laporannamapembidacaw.blade.php
+++ b/resources/views/pdf/laporannamapembidacaw.blade.php
@@ -11,19 +11,54 @@
 #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
     border: 0px solid;
     padding: 1px;
-    text-align: left;
+    
+    /* text-align: left; */
     
 }
 
-#sim tr:nth-child(even){}
+#sim tr:nth-child(even){
+  /* border-bottom: 1px solid #ddd; */
+}
 
 #sim tr:hover {}
 
 #sim th {
-    text-align: left;
+    /* text-align: left; */
     border: 0px solid;
 	table-layout:auto;
     color: black;
+    
+	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+}
+
+
+#sim2 {
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+	font-size:10px;
+	border-collapse: collapse;
+    width: 100%;
+}
+
+#sim2 td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+    border: 0px solid;
+    padding: 1px;
+    
+    /* text-align: left; */
+    
+}
+
+#sim2 tr:nth-child(even){
+  /* border-bottom: 1px solid #ddd; */
+}
+
+#sim2 tr:hover {}
+
+#sim2 th {
+    /* text-align: left; */
+    border: 0px solid;
+	table-layout:auto;
+    color: black;
+    
 	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 
@@ -37,7 +72,7 @@
 }
   
 .column {
-  float: left;
+  /* float: left; */
   width: 100%;
   padding: 5px;
 }
@@ -57,53 +92,60 @@ table {
 }
 
 td {
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
 }
 
 th{
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
-  background-color:gainsboro;
+  /* text-align: left; */
+	table-layout:auto
+    color: black;
+    border-bottom: 1px solid #ddd;
+  /* background-color:gainsboro; */
 }
 
+
 tr:nth-child(even) {
-  background-color: #f2f2f2;
+  /* background-color: #f2f2f2; */
+
 }
 
 </style>
-
 <body>
 
-                    <table width="100%" border="0" id="sim">
+                    <table width="100%" border="0" id="sim2">
                         <tr>
                           <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
                         </tr>
 
                         <tr>
-                          <td colspan="2"><u><b>LAPORAN SENARAI BIDAAN PEMBIDA</b></u></td>
+                          <td colspan="2"><u><b>SENARAI BIDAAN PEMBIDA</b></u></td>
 
                         </tr>
                     </table>
 
-                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
+                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim2">
                       <thead>
                         <br>
                         <tr>
                           <td>Batch Lelong:  {{$lelong_id}}</td>
+                          @foreach ($arrayinfocaw as $laporancaw)
+                          @foreach ($laporancaw['cawangan'] as $details)
+                          <td>Cawangan : {{$details['caw_name']}}
+                          @endforeach
+                        @endforeach
+                        </tr>
                           @foreach ($lelongid as $info)                        
                           <td>Tarikh Lelong : @php
                             $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
                             $t_lelong =  $myDateTime->format('d-m-Y');
                             echo($t_lelong);
-                        @endphp</td>
-                          <td>Fasa: {{$info['fasa']}}                
-                          @endforeach
-                          @foreach ($arrayinfocaw as $laporancaw)
-                          @foreach ($laporancaw['cawangan'] as $details)
-                          <td>Cawangan : {{$details['caw_name']}}
-                          @endforeach
+                            @endphp</td>
                           @endforeach
+                          </tr>
+                         
                         </tr>
                          
                       </thead>
@@ -111,15 +153,15 @@ tr:nth-child(even) {
 
                       <br>
           
-                      <table  cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
+                      <table  cellspacing="0" cellpadding="5" style="float:right;" width="100%" height="80" align="left" id="sim">
                         
                         <thead>
                         <tr> 
                             <th width="5%" align="left">No</th> 
                             <th width="12%" align="left">No Rujukan</th> 
-                            <th width="12%" align="left">Harga Asas(RM)</th>
+                            <th width="12%" align="right">Harga Asas(RM)</th>
                             <th width="12%" align="left">Nama Pembida</th> 
-                            <th width="15%" align="left">Harga Bidaan(RM)</th> 
+                            <th width="15%" align="right">Harga Bidaan(RM)</th> 
                             <th width="12%" align="left">Masa Bidaan</th>
                         </tr>
                         </thead>
@@ -128,23 +170,23 @@ tr:nth-child(even) {
                         <tr>
                             <td>{{ $loop->iteration }}</td>
                             <td>{{ $laporan['laporan']['norujukan']}}</td>
-                            <td>{{ $laporan['laporan']['hargaasas']}}</td>
-                            <td>
+                            <td align="right">{{ number_format($laporan['laporan']['hargaasas'], 2, '.', ',')}}</td>
+                            <td style="white-space: nowrap;">
                                 @foreach($laporan['details'] as $details)
-                                    <span class="m-2">{{ $details['nama_bidder']}}</span><br>
+                                    <span class="m-2">{{ $loop->iteration }}.{{ $details['nama_bidder']}}</span><br>
                                 @endforeach
                             </td>
                             
-                            <td>
+                            <td align="right">
                                 @foreach($laporan['details'] as $details)
-                                    <span class="m-2">{{ $details['hargabida']}}</span><br>
+                                    <span class="m-2">{{ number_format($details['hargabida'], 2, '.', ',')}}</span><br>
                                 @endforeach
                             </td>
                             <td>
                                 @foreach($laporan['details'] as $details)
                                     <span class="m-2"> @php
                                       $myDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $details['masa_bidaan'] );
-                                      $t_lelong =  $myDateTime->format('d-m-Y h:i:s');
+                                      $t_lelong =  $myDateTime->format('h:i:s');
                                       echo($t_lelong);
                                   @endphp</span><br>
                                 @endforeach