Merged in bugfix/fix-stokaudit-harian (pull request #68)

update coloumn lain2 caj laporan_stokaudit dan laporan_stokaudit_combine

resources/views/akaun/laporan_stokaudit.blade.php

@@ -197,7 +197,7 @@
 </table>
 
 <br>
-<table id="details">
+{{-- <table id="details">
   <thead>
     <th>Bil</th>
     <th>Norujukan</th>
@@ -228,9 +228,9 @@
       <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['tunggakan'],2) }}</td> --}}
       {{-- <td>{{ number_format($item['pinjaman'],2) }}</td>  --}}
-      <td>{{$item['lelong_tawarruq']}}</td>
+      {{-- <td>{{$item['lelong_tawarruq']}}</td>
     </tr>
     @php $counter++; @endphp
   @endforeach
@@ -246,8 +246,73 @@
     <th>{{ number_format($stokaudit['totaltunggakan'],2) }}</th>
     <th></th>
   </tfoot>
+</table> --}}
+
+<table id="details">
+    <thead>
+        <tr>
+            <th>Bil</th>
+            <th>Norujukan</th>
+            <th>JBG</th>
+            <th>No. KP</th>
+            <th>Berat</th>
+            <th>Nilai Marhun (RM)</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>Lain-Lain Caj (RM)</th>
+            <th>Keuntungan 1% (RM)</th>
+            <th>Lanjutan</th>
+        </tr>
+    </thead>
+    <tbody>
+        @php
+            $counter = 1;
+            $totalpinjaman = 0;
+        @endphp
+        @foreach($stokaudit['rekod'] as $index => $item)
+            @php
+                $totalpinjaman += $item['hargajualan'] == null ? $item['pinjaman'] : $item['bakipjm'];
+            @endphp
+            <tr>
+                <td>{{ $counter }}</td>
+                <td>{{ $item['norujukan'] }}</td>
+                <td>{{ $item['tempoh'] }}</td>
+                <td>{{ $item['nokp'] }}</td>
+                <td>{{ number_format($item['berat'], 2) }}</td>
+                <td>{{ number_format($item['nilaimarhun'], 2) }}</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['tunggakanujrah'], 2) }}</td>
+                <td>{{ number_format($item['tunggakanonepercent'], 2) }}</td>
+                <td>{{ $item['lelong_tawarruq'] }}</td>
+            </tr>
+            @php $counter++; @endphp
+        @endforeach
+    </tbody>
+    <tfoot>
+        <tr>
+            <th colspan="4">Jumlah</th>
+            <th>{{ number_format($stokaudit['totalberat'], 2) }}</th>
+            <th>{{ number_format($stokaudit['totalnilaimarhun'], 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>{{ number_format($stokaudit['totalujrah'], 2) }}</th>
+            <th>{{ number_format($stokaudit['totalonepercent'], 2) }}</th>
+            <th></th>
+        </tr>
+    </tfoot>
 </table>
 
+
 <br>
 <br>
 <table id="sign">

resources/views/akaun/laporan_stokaudit_combine.blade.php

@@ -237,6 +237,8 @@
             <th>Kadar Upah</th>
             <th>Tempoh Belum Bayar</th>
             <th>Keuntungan Belum Bayar (RM)</th>
+            <th>Lain-Lain Caj (RM)</th>
+            <th>Keuntungan 1% (RM)</th>
             <th>Lanjutan</th>
         </thead>
         @php
@@ -260,6 +262,8 @@
             <td>{{ number_format($item['tempoh'] - $item['tempohbayar'],2) }}</td>
             <td>{{ number_format($item['tunggakan'],2) }}</td>
             {{-- <td>{{ number_format($item['pinjaman'],2) }}</td> --}}
+            <td>{{ number_format($item['tunggakanujrah'], 2) }}</td>
+            <td>{{ number_format($item['tunggakanonepercent'], 2) }}</td>
             <td>{{$item['lelong_tawarruq']}}</td>
         </tr>
         @php $counter_aktif++; @endphp
@@ -274,6 +278,8 @@
             <th></th>
             <th></th>
             <th>{{ number_format($stokaudit_aktif['totaltunggakan'],2) }}</th>
+            <th>{{ number_format($stokaudit_aktif['totalujrah'], 2) }}</th>
+            <th>{{ number_format($stokaudit_aktif['totalonepercent'], 2) }}</th>
             <th></th>
         </tfoot>
     </table>
@@ -389,4 +395,4 @@
             <td> </td>
         </tr>
     </table>
-</div>
+</div>