From 8fcb57d7958c723d131f9092f908b7af77cbed71 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Fri, 25 Nov 2022 20:20:25 +0800
Subject: [PATCH] fix tangguh lelong

---
 .../Controllers/TangguhLelongController.php   | 13 +++++++-
 resources/views/pdf/lelreport.blade.php       | 30 +++++++++++--------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php
index 1201e60c..31f0e50d 100644
--- a/app/Http/Controllers/TangguhLelongController.php
+++ b/app/Http/Controllers/TangguhLelongController.php
@@ -921,9 +921,19 @@ class TangguhLelongController extends Controller
         ->where('lelong.sts_lelong',0)
         ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id','lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg')
         ->distinct()
+        ->orderBy('cawangan_lelong.lelong_id')
         ->get()
         ->toArray();
 
+        $lelong= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->where('lelong.sts_lelong',0)
+        ->select('lelong_id','tarikh_lelong','lelong.fasa','jbg','sts_lelong')
+        ->distinct()
+        ->orderBy('lelong_id')
+        ->get()
+        ->toArray();
+        // dd($lelong);
+
         foreach($lelong as $info)
         {
 
@@ -933,7 +943,7 @@ class TangguhLelongController extends Controller
             ->toArray();
 
             $sag = TangguhLelong::where('lelong_id', $info['lelong_id'])
-            ->where('kodcaw', $info['caw_code'])
+            // ->where('kodcaw', $info['caw_code'])
             ->where('status',4)
             ->select('norujukan')
             ->get()
@@ -954,6 +964,7 @@ class TangguhLelongController extends Controller
         $currentdate = $currentdate->toDateTimeString();
 
         $tangguh = TangguhLelong::where('status',4)
+        ->where('kodcaw','=',$caw_code)
         ->get();
 
         // dd($pengesahan);
diff --git a/resources/views/pdf/lelreport.blade.php b/resources/views/pdf/lelreport.blade.php
index cb51fa63..598ecdfd 100644
--- a/resources/views/pdf/lelreport.blade.php
+++ b/resources/views/pdf/lelreport.blade.php
@@ -7,6 +7,15 @@
     border-collapse: collapse;
       width: 100%;
   }
+
+  #sim2 {
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+    width: 40%;
+    border: 0px solid #ddd;
+
+  }
   
   #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
       border: 0px solid;
@@ -77,8 +86,9 @@
   <header>
     <u><b><h5>LAPORAN SIMULASI CAWANGAN</h5></b></u>
     </header>
+    
                                           
-                      <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="sim">
                         <thead>
                           <tr>
                             <td>Bilangan Lelong:  {{$total_marhun}}</td>
@@ -86,22 +96,22 @@
                             <td>Pembiayaan Keseluruhan: RM{{ number_format($total_pinjaman, 2, '.', ',')  }} </td>
                             <td>Keuntungan Keseluruhan:RM{{ number_format($total_bakiupah, 2, '.', ',') }}</td>                                                  
                         </thead>
-                      </table>
+                      </table> --}}
 
-                      <table cellspacing="" cellpadding="5" text-align="left" border="0"  height="25" align="left" id="sim">
+                      <table id="sim2">
                             <thead>
                             <tr>
-                              <td>Harga Asas Keseluruhan: RM{{ number_format($total_hargaasas, 2, '.', ',')  }}</td>
+                              {{-- <td>Harga Asas Keseluruhan: RM{{ number_format($total_hargaasas, 2, '.', ',')  }}</td>
                               <td>Caj Lelong Keseluruhan: RM{{ number_format($total_cazlelong, 2, '.', ',')  }}</td>
                             <td>Baki Lelong Keseluruhan: RM{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
-                            <td>Rugi Lelong Keseluruhan: RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td>
-                            <td>Tempoh: {{ $data['jbg']}}</td> 
-                            <td>Tarikh Lelong :@php 
+                            <td>Rugi Lelong Keseluruhan: RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td> --}}
+                            <div>Tarikh Lelong :@php 
                               $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
                                 $datez = $myDateTime->format('d-m-Y');
                                 echo($datez);                            
                             @endphp
-                          </td> 
+                          </div> 
+                            <div>Tempoh: {{ $data['jbg']}}</div> 
                             </tr>
                         </thead>
                       </table>             
@@ -110,10 +120,6 @@
                       <br>
                       <table width="100%" border="0" id="sim">      
                         <thead>
-                                    
-                        {{-- <tr>                       
-                          <th style="text-align:center;" colspan="12"><h3><b>SIMULASI KESELURUHAN</b></h3></th>   
-                        </tr> --}}
                             <tr >
                                 <th>No</th>
                                 <th>Cawangan</th>