Merge branch 'new-super' of https://gitlab.com/online-sistem1/kaunter into fixkaunter

resources/views/print/laporan_stokaudit.blade.php

@@ -6,7 +6,7 @@
 }
 
 #header td, #customers th {
- 
+
   padding:4px;
   font-size:10px;
 }
@@ -35,7 +35,7 @@
 }
 
 #scan td, #scan th {
- 
+
   padding: 8px;
   font-size:11px;
 }
@@ -91,7 +91,7 @@
 }
 
 #details td, #details th {
- 
+
   padding: 8px;
   font-size:11px;
 }
@@ -170,7 +170,7 @@
     <th> </th>
     <th> </th>
     <th><b> Tarikh Cetak:</b>
-        @php 
+        @php
           $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
           $formattedweddingdate = $myDateTime->format('d-m-Y');
           echo($formattedweddingdate)
@@ -180,12 +180,12 @@
   </tr>
   <tr>
     <td style="width:10px"> <b>TARIKH</b></td>
-    <td>@php 
+    <td>@php
           $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date);
           $formattedweddingdate = $myDateTime->format('d-m-Y');
           echo($formattedweddingdate)
         @endphp</td>
-    <td style="width:50px">   
+    <td style="width:50px">
     </td>
     <td> </td>
     <td> </td>
@@ -205,7 +205,11 @@
     <th>No. KP</th>
     <th>Berat</th>
     <th>Nilai Marhun (RM)</th>
-    <th>Pembiayaan</th>
+    <th>Pembiayaan Asal (RM)</th>
+    <th>Baki Pembiayaan (RM)</th>
+    <th>Kadar Upah</th>
+    <th>Tempoh Belum Bayar</th>
+    <th>Keuntungan Belum Bayar (RM)</th>
     <th>Lanjutan</th>
   </thead>
   @php $counter = 1;$totalpinjaman = 0; @endphp
@@ -218,7 +222,11 @@
       <td>{{$item['nokp']}}</td>
       <td>{{ number_format($item['berat'],2) }}</td>
       <td>{{ number_format($item['nilaimarhun'],2) }}</td>
-      <td>@php if($item['hargajualan'] == null) echo number_format($item['pinjaman'],2); else echo number_format($item['bakipjm'],2); @endphp</td>
+      <td>{{ number_format($item['pinjaman'],2) }}</td>
+      <td>{{ number_format($item['bakipjm'],2) }}</td>
+      <td>{{ number_format($item['kadarupah'],2) }}</td>
+      <td>{{ number_format($item['tempoh'] - $item['tempohbayar'],2) }}</td>
+      <td>{{ number_format($item['tunggakan'],2) }}</td>
       {{-- <td>{{ number_format($item['pinjaman'],2) }}</td>  --}}
       <td>{{$item['lelong_tawarruq']}}</td>
     </tr>
@@ -228,8 +236,11 @@
     <th colspan='4'>Jumlah</th>
     <th>{{ number_format($stokaudit['totalberat'],2) }}</th>
     <th>{{ number_format($stokaudit['totalnilaimarhun'],2) }}</th>
-    {{-- <th>{{ number_format($stokaudit['total'],2) }}</th> --}}
-    <th>{{ number_format($totalpinjaman,2) }}</th>
+    <th>{{ number_format($stokaudit['totalpinjaman'],2) }}</th>
+    <th>{{ number_format($stokaudit['totalbakipjm'],2) }}</th>
+    <th></th>
+    <th></th>
+    <th>{{ number_format($stokaudit['totaltunggakan'],2) }}</th>
     <th></th>
   </tfoot>
 </table>
@@ -258,3 +269,4 @@
 
 
 
+138001.80