update komen pilot 29112022

app/Http/Controllers/MarhunController.php

@@ -1680,14 +1680,14 @@ class MarhunController extends Controller
         $senaraiScanKeluar = ScanSemak::where('kodcaw', '=', $caw->caw_code)
             ->where('lelong_id', $lelong_id)
             ->whereNull('terima_marhun')
-            ->orderBy('id', 'desc')
+            ->orderBy('norujukan', 'asc')
             ->get();
 
         $sedangDinilai = ScanSemak::where('kodcaw', '=', $caw->caw_code)
             ->whereNotNull('terima_marhun')
             ->whereNull('serah_marhun')
             ->where('lelong_id', $lelong_id)
-            ->orderBy('id', 'desc')
+            ->orderBy('norujukan', 'asc')
             ->get();
         foreach ($sedangDinilai as $key => $dinilai) {
             $sdhdisemak = LelongBid::where('lelongbid.lelong_id', $lelong_id)
@@ -1702,7 +1702,7 @@ class MarhunController extends Controller
         $sudahSerah = ScanSemak::where('kodcaw', '=', $caw->caw_code)
             ->whereNotNull('serah_marhun')
             ->where('lelong_id', $lelong_id)
-            ->orderBy('id', 'desc')
+            ->orderBy('norujukan', 'asc')
             ->get();
            
        

resources/views/pdf/lelreport.blade.php

@@ -105,12 +105,15 @@
                               <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> --}}
+                            <div>Batch Lelong : {{$lelong_id}}</div> 
                             <div>Tarikh Lelong :@php 
                               $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
                                 $datez = $myDateTime->format('d-m-Y');
                                 echo($datez);                            
-                            @endphp
-                          </div> 
+                            @endphp</div> 
+                            </tr>
+                            <tr>
+                            <div>Harga Emas Lelong 916: RM {{ $data['harga_emas_asas']}}</div> 
                             <div>Tempoh: {{ $data['jbg']}}</div> 
                             </tr>
                         </thead>

resources/views/pdf/pdflelongreport.blade.php

@@ -19,7 +19,7 @@
   
   #sim tr:hover {}
   
-  #sim th {
+  #sim2 th {
       text-align: center;
       border: 0px solid;
     table-layout:auto;
@@ -68,6 +68,13 @@
   
   tr:nth-child(even) {
   }
+
+  .font{
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:12px;
+  }
+
+
   
   </style>
   
@@ -92,6 +99,8 @@
         color: black;
         text-align: center;
         line-height: 1.5cm;
+        font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:15px;
     }
     
     /** Define the footer rules **/
@@ -117,30 +126,23 @@
 
   <header>
     @foreach($datacaw as $data)
-    <u><b><h5>LAPORAN SIMULASI CAWANGAN: {{$data['caw_name']}}</h5></b></u>
+    <div class="class="font><u><b><h5>LAPORAN SIMULASI CAWANGAN: {{$data['caw_name']}}</h5></b></u></div>
     @endforeach
     </header>
     
   <footer>
     <div class="pagenum-container"><span class="pagenum"></span></div>
   </footer>
-                    {{-- <table cellspacing="" cellpadding="4" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped  table-xl">
-                      <thead class="bg-light ">
                           @foreach ($arrayinfo as $laporan)
-                          <tr>
-                              <td><b>Batch Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
-                              <td><b>Fasa Lelong: {{ $laporan['laporan']['fasa']}} <b></td>
-                              <td><b>Tarikh Lelong : @php
+                             <div class="font">Batch Lelong: {{ $laporan['laporan']['lelong_id']}} </div>
+                              {{-- <td><b>Fasa Lelong: {{ $laporan['laporan']['fasa']}} <b></td> --}}
+                             <div class="font">Tarikh Lelong : @php
                                       $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
                                       $datez = $myDateTime->format('d-m-Y');
                                       echo($datez);
-                                      @endphp</b></td>
+                                      @endphp</div>
                            
-                          </tr>
                           @endforeach
-      
-                      </thead>
-                  </table> --}}
 
                       <br>