diff --git a/app/Http/Controllers/ReportAllController.php b/app/Http/Controllers/ReportAllController.php
index f55cc92d..3640efc4 100644
--- a/app/Http/Controllers/ReportAllController.php
+++ b/app/Http/Controllers/ReportAllController.php
@@ -674,10 +674,9 @@ class ReportAllController extends Controller
 
     public function docaribydate(Request $request)
     {
-        // dd($request->all());
-        $tarikh_dari = date('d-m-Y', strtotime($request->tarikh_dari));
+        $tarikh_dari = date('Y-m-d', strtotime($request->tarikh_dari));
         $t_dari = $request->tarikh_dari;
-        $tarikh_hingga = date('d-m-Y', strtotime($request->tarikh_hingga));
+        $tarikh_hingga = date('Y-m-d', strtotime($request->tarikh_hingga));
         $t_hingga = $request->tarikh_hingga;
 
         if($t_dari != null || $t_hingga != null)
@@ -685,11 +684,17 @@ class ReportAllController extends Controller
                 $cawangan_all = Cawangan::orderBy('caw_name')->get();
                 $senarai = [];
                 $total_bil_lelong = 0;
+                $jum_billelong = 0;
+                    $jum_berat = 0;
+                    $jum_pembiayaan = 0;
+                    $jum_hargajual = 0;
+                    $jum_bakiupah = 0;
+                    $jum_cajlelong = 0;
+                    $jum_baki = 0;
                 foreach($cawangan_all as $cawangan){
                     $getsurat = LelongCawangan::on($cawangan->caw_code)
-                        ->where('t_lelong','>=',$t_dari)
-                        ->where('t_lelong','<=',$t_hingga);
-                    // dd($getsurat->count('norujukan'));
+                        ->where('t_lelong','>=',$tarikh_dari)
+                        ->where('t_lelong','<=',$tarikh_hingga);
                         $bil_lelong = $getsurat->count('norujukan');
                        
                         $total_bil_lelong += $bil_lelong;
@@ -697,6 +702,7 @@ class ReportAllController extends Controller
                         $total_nilaimarhun = $getsurat->sum('nilaimarhun');
                         $total_hargajual = $getsurat->sum('hargajual');
                         $total_bakiupah = $getsurat->sum('bakiupah');
+                        $total_cajlelong = $getsurat->sum('cajlelong');
                         $total_baki = $getsurat->sum('baki');
                         $total_pembiayaan = $getsurat->sum('pinjaman');
                         $data = [
@@ -707,29 +713,48 @@ class ReportAllController extends Controller
                             'total_nilaimarhun'=>$total_nilaimarhun,
                             'total_hargajual'=>$total_hargajual,
                             'total_bakiupah'=>$total_bakiupah,
+                            'total_cajlelong'=>$total_cajlelong,
                             'total_baki'=>$total_baki,
                             'total_pembiayaan'=>$total_pembiayaan,
                             'kodcaw'=>$cawangan->caw_code,
                             'caw_name'=>$cawangan->caw_name];
                         array_push($senarai,$data);
-                        // dump($data);
-                }
-                // dd($data);
+
+                        $jum_billelong += $bil_lelong;
+            $jum_berat += $total_berat;
+            $jum_pembiayaan += $total_pembiayaan; 
+            $jum_hargajual += $total_hargajual;
+            $jum_bakiupah += $total_bakiupah;
+            $jum_cajlelong += $total_cajlelong;
+            $jum_baki += $total_baki; 
+            }
             if($total_bil_lelong == 0)
             {
             return redirect()->route('reportbydate.laporanlelongbydate')
                     ->with('failed','Tiada surat lelong');
             }
 
-
-           
+            
+            if($request->type == 'pdf')
+            {
+                $pdf = PDF::loadView('laporan.senaraitemplaporanbydate_pdf', compact( 't_dari',
+                                                                                    't_hingga',
+                                                                                    'getsurat',
+                                                                                    'senarai',
+                                                                                    'tarikh_dari',
+                                                                                    'tarikh_hingga','jum_billelong','jum_berat','jum_pembiayaan','jum_hargajual','jum_bakiupah','jum_baki','jum_cajlelong'))
+                        ->setPaper('a4', 'potrait');            
+                return $pdf->download('laporan lelong dari'.$t_dari.'hingga'.$t_hingga.'.pdf');
+            }else{
+               
             return view('laporan.senaraitemplaporanbydate', compact( 't_dari',
                                                         't_hingga',
                                                         'getsurat',
                                                         'senarai',
                                                         'tarikh_dari',
-                                                        'tarikh_hingga'
+                                                        'tarikh_hingga','jum_billelong','jum_berat','jum_pembiayaan','jum_hargajual','jum_bakiupah','jum_baki','jum_cajlelong'
                                                     ));
+            }
         }
         else
         {
@@ -738,74 +763,6 @@ class ReportAllController extends Controller
         }
     }
 
-    Public function docaribydate2(Request $request){
-        // dd($request->all());
-        $tarikh_dari = $request->tarikh_dari;
-        $t_dari = date('Y-m-d', strtotime($request->tarikh_dari));
-        // dd($t_dari);
-        $tarikh_hingga = $request->tarikh_hingga;
-        $t_hingga = date('d-m-Y', strtotime($request->tarikh_hingga));
-        if($t_dari != null || $t_hingga != null)
-        {
-                $cawangan_all = Cawangan::orderBy('caw_name')->get();
-                $senarai = [];
-                $total_bil_lelong = 0;
-                foreach($cawangan_all as $cawangan){
-                    $getsurat = LelongCawangan::on($cawangan->caw_code)
-                        ->where('t_lelong','>=',$t_dari)
-                        ->where('t_lelong','<=',$t_hingga);
-                    // dd($getsurat->count('norujukan'));
-                        $bil_lelong = $getsurat->count('norujukan');
-                       
-                        $total_bil_lelong += $bil_lelong;
-                        $total_berat = $getsurat->sum('berat');
-                        $total_nilaimarhun = $getsurat->sum('nilaimarhun');
-                        $total_hargajual = $getsurat->sum('hargajual');
-                        $total_bakiupah = $getsurat->sum('bakiupah');
-                        $total_baki = $getsurat->sum('baki');
-                        $total_pembiayaan = $getsurat->sum('pinjaman');
-                        $data = [
-                            't_dari'=>$tarikh_dari,
-                            't_hingga'=>$tarikh_hingga,
-                            'bil_lelong'=>$bil_lelong,
-                            'total_berat'=>$total_berat,
-                            'total_nilaimarhun'=>$total_nilaimarhun,
-                            'total_hargajual'=>$total_hargajual,
-                            'total_bakiupah'=>$total_bakiupah,
-                            'total_baki'=>$total_baki,
-                            'total_pembiayaan'=>$total_pembiayaan,
-                            'kodcaw'=>$cawangan->caw_code,
-                            'caw_name'=>$cawangan->caw_name];
-                        array_push($senarai,$data);
-                        // dump($data);
-                }
-                // dd($data);
-        }
-
-        if($request->type == 'pdf')
-        {
-            $pdf = PDF::loadView('laporan.senaraitemplaporanbydate_pdf', compact( 't_dari',
-                                                                                't_hingga',
-                                                                                'getsurat',
-                                                                                'senarai',
-                                                                                'tarikh_dari',
-                                                                                'tarikh_hingga'))
-                    ->setPaper('a4', 'potrait');            
-            return $pdf->download('laporan lelong dari'.$t_dari.'hingga'.$t_hingga.'.pdf');
-        }else{
-
-            return view('laporan.senaraitemplaporanbydate', compact( 't_dari',
-                                                        't_hingga',
-                                                        'getsurat',
-                                                        'senarai',
-                                                        'tarikh_dari',
-                                                        'tarikh_hingga'
-                                                    ));
-        }
-       
-
-    }
-
 
     
   
diff --git a/resources/views/laporan/senaraitemplaporanbydate.blade.php b/resources/views/laporan/senaraitemplaporanbydate.blade.php
index edb5e983..e0cc404d 100644
--- a/resources/views/laporan/senaraitemplaporanbydate.blade.php
+++ b/resources/views/laporan/senaraitemplaporanbydate.blade.php
@@ -23,7 +23,7 @@
 
             {{-- <h3 class="pt-3" style="margin-left:1%;">Butiran Gadaian Mengikut Cawangan Lelongan Fasa {{$fasa}}</h3> --}}
             <!-- <form action="{{route('analisa.janadata')}}" method="POST" enctype="multipart/form-data"> -->
-            <form id="exportpdf" action="{{route('reportbydate.docaribydate2')}}" method="POST" enctype="multipart/form-data">
+            <form id="exportpdf" action="{{route('reportbydate.docaribydate')}}" method="POST" enctype="multipart/form-data">
             <!-- <form action="{{route('analisa.importgadaifrommaster')}}" method="POST" enctype="multipart/form-data"> -->
 
             @csrf
@@ -35,8 +35,8 @@
                 <div>
                     <div style="margin-top:2%; margin-bottom:2%;">
                             
-                        <p> <b>Dari : </b> {{ $tarikh_dari }}
-                         <b>Hingga : </b>{{ $tarikh_hingga }}</p>
+                        <p> Dari:   @php $trkh_dari = date('d-m-Y', strtotime($tarikh_dari)); @endphp {{$trkh_dari}}
+                            Hingga:  @php $trkh_hingga = date('d-m-Y', strtotime($tarikh_hingga)); @endphp {{$trkh_hingga}}<br><br> </p>
                     </div>
                 </div>
              </div>
@@ -50,8 +50,9 @@
                             <th>Bil Lelong</th>
                             <th>Berat (gm)</th>
                             <th>Pembiayaan (RM)</th>
-                            <th>Harga Jual (RM)</th>
                             <th>Keuntungan (RM)</th>
+                            <th>Harga Jual (RM)</th>
+                            <th>Caj Lelong (RM)</th>
                             <th>Baki Lelong (RM)</th>
                             {{-- <th class="text-center">Tindakan</th> --}}
                         </tr>
@@ -69,8 +70,9 @@
                             <td>{{ $send['bil_lelong'] }} </td>
                             <td>{{ number_format($send['total_berat'], 2) }} </td>
                             <td>{{ number_format($send['total_pembiayaan'], 2) }} </td>
+                            <td>{{ number_format($send['total_bakiupah'] , 2) }} </td> 
                             <td>{{ number_format($send['total_hargajual'] , 2) }} </td>
-                            <td>{{ number_format($send['total_bakiupah'] , 2) }} </td>
+                            <td>{{ number_format($send['total_cajlelong'] , 2) }} </td>
                             <td>{{ number_format($send['total_baki'] , 2) }} </td>
 
                             {{-- <td>
@@ -82,8 +84,14 @@
                 </tbody>
                 <tfoot>
                     <tr>
-                        <td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
-                        <td><b>{{ $total_marhun }}</b></td>
+                        <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
+                        <td><b>{{ $jum_billelong }}</b></td>
+                        <td><b>{{ number_format($jum_berat, 2) }}</b></td>
+                        <td><b>{{ number_format($jum_pembiayaan, 2) }}</b></td>
+                        <td><b>{{ number_format($jum_bakiupah, 2) }}</b></td>
+                        <td><b>{{ number_format($jum_hargajual, 2) }}</b></td>
+                        <td><b>{{ number_format($jum_cajlelong, 2) }}</b></td>
+                        <td><b>{{ number_format($jum_baki, 2) }}</b></td>
                     </tr>
                 </tfoot>
             </table>
diff --git a/resources/views/laporan/senaraitemplaporanbydate_pdf.blade.php b/resources/views/laporan/senaraitemplaporanbydate_pdf.blade.php
index ab11e2bc..0be9ddba 100644
--- a/resources/views/laporan/senaraitemplaporanbydate_pdf.blade.php
+++ b/resources/views/laporan/senaraitemplaporanbydate_pdf.blade.php
@@ -139,8 +139,8 @@
                                 <div class="pagenum-container"><span class="pagenum"></span></div>
                               </footer>
                               <div class="font">
-                                Dari:   {{$tarikh_dari}}
-                                Hingga:   {{$tarikh_hingga}}<br><br> 
+                                Dari:   @php $trkh_dari = date('d-m-Y', strtotime($tarikh_dari)); @endphp {{$trkh_dari}}
+                                Hingga:  @php $trkh_hingga = date('d-m-Y', strtotime($tarikh_hingga)); @endphp {{$trkh_hingga}}<br><br> 
                             </div>
                            
                 
@@ -154,8 +154,9 @@
                                         <th>Bil Lelong</th>
                                         <th>Berat (gm)</th>
                                         <th>Pembiayaan (RM)</th>
-                                        <th>Harga Jual (RM)</th>
                                         <th>Keuntungan (RM)</th>
+                                        <th>Harga Jual (RM)</th>
+                                        <th>Caj Lelong (RM)</th>
                                         <th>Baki Lelong (RM)</th>
                                         {{-- <th class="text-center">Tindakan</th> --}}
                                     </tr>
@@ -173,8 +174,9 @@
                                         <td>{{ $send['bil_lelong'] }} </td>
                                         <td>{{ number_format($send['total_berat'], 2) }} </td>
                                         <td>{{ number_format($send['total_pembiayaan'], 2) }} </td>
-                                        <td>{{ number_format($send['total_hargajual'] , 2) }} </td>
                                         <td>{{ number_format($send['total_bakiupah'] , 2) }} </td>
+                                        <td>{{ number_format($send['total_hargajual'] , 2) }} </td>
+                                        <td>{{ number_format($send['total_cajlelong'] , 2) }} </td>
                                         <td>{{ number_format($send['total_baki'] , 2) }} </td>
             
                                         {{-- <td>
@@ -184,6 +186,18 @@
                                      @endif       
                                 @endforeach
                             </tbody>
+                            <tfoot>
+                              <tr>
+                                  <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
+                                  <td><b>{{ $jum_billelong }}</b></td>
+                                  <td><b>{{ number_format($jum_berat, 2) }}</b></td>
+                                  <td><b>{{ number_format($jum_pembiayaan, 2) }}</b></td>
+                                  <td><b>{{ number_format($jum_bakiupah, 2) }}</b></td>
+                                  <td><b>{{ number_format($jum_hargajual, 2) }}</b></td>
+                                  <td><b>{{ number_format($jum_cajlelong, 2) }}</b></td>
+                                  <td><b>{{ number_format($jum_baki, 2) }}</b></td>
+                              </tr>
+                          </tfoot>
                         </table>
   
                              </body>