resolve conflict

This commit is contained in:
afiq
2021-08-06 09:34:49 +08:00
66 changed files with 2234 additions and 4384 deletions
+121 -14
View File
@@ -438,17 +438,124 @@
<td> </td>
</tr>
<tr>
<td></td>
<td>........................................................</td><td></td>
<td>......................................................... </td>
<td> </td>
</tr>
</table>
</table>
<br>
<br>
<table id="title">
<td> <b><u>LEJER AM</u></b></td>
</table>
<br>
<table id="tarikh_cetak">
<tr>
<td style="width:5px" ><b>TARIKH DARI</b></td ><td style="width:1px"> {{$tarikh_mula}} </td>
<td style="width:5px" ><b>HINGGA</b></td><td style="width:1px"> {{$tarikh_akhir}} </td>
</tr>
</table>
<br>
<table id="glejer">
<tr>
<th style="width:10px">KOD GL</th>
<th colspan="2" style="width:50px">KETERANGAN</th>
<th style="width:5px">DEBIT</th>
<th style="width:5px" >KREDIT</th>
<th style="width:10px">JUMLAH</th>
</tr>
@foreach($Kredit as $index=>$kred)
@foreach($Debit as $index=>$deb)
@if($kred['glcode'] === $deb['glcode'])
<tr>
<td style="width:10px">{{ $kred['glcode'] }}</td>
<td colspan="2" style="width:50px">{{ $kred['descpt'] }}</td>
<td style="width:5px">{{ number_format($deb['amaun'],2) }}</td>
<td style="width:5px" >{{ number_format($kred['amaun'],2) }}</td>
<td style="width:10px">@php $Totalsama = $deb['amaun'] - $kred['amaun']; echo number_format($Totalsama,2); @endphp</td>
</tr>
@endif
@endforeach
@endforeach
@foreach($Debit as $index=>$deb)
@if($deb['glcode'] == '1000/241' || $deb['glcode'] == '1000/211' || $deb['glcode'] == '1000/020' || $deb['glcode'] == '3000/017' || $deb['glcode'] == '3000/018' || $deb['glcode'] == '3000/019')
<tr>
<td style="width:10px">{{ $deb['glcode'] }}</td>
<td colspan="2" style="width:50px">{{ $deb['descpt'] }}</td>
<td style="width:5px">{{ number_format($deb['amaun'],2) }}</td>
<td style="width:5px" >{{ number_format(0,2) }}</td>
<td style="width:10px">{{ number_format($deb['amaun'],2) }}</td>
</tr>
@endif
@endforeach
@foreach($Kredit as $index=>$kred)
@if($kred['glcode'] == '5000/241' || $kred['glcode'] == '5000/211' || $kred['glcode'] == '5000/013' || $kred['glcode'] == '5000/007' || $kred['glcode'] == '7000/102')
<tr>
<td style="width:10px">{{ $kred['glcode'] }}</td>
<td colspan="2" style="width:50px">{{ $kred['descpt'] }}</td>
<td style="width:5px">{{ number_format(0,2) }}</td>
<td style="width:5px" >{{ number_format($kred['amaun'],2) }}</td>
<td style="width:10px">{{ number_format(($kred['amaun']*-1),2) }}</td>
</tr>
@endif
@endforeach
<tr>
<th style="width:10px" colspan="3">JUMLAH: </th>
<th style="width:5px">{{ number_format($TotalDebit,2) }}</th>
<th style="width:5px" >{{ number_format($TotalKredit,2) }}</th>
<th style="width:10px">@php $Total = $TotalDebit - $TotalKredit; echo number_format($Total,2); @endphp</th>
</tr>
</table>
<br>
<br>
<table id="details">
<tr>
<th> </th><th> DISEMAK </th><th></th> <th> DISAHKAN </th><th></th>
</tr>
<tr>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
</tr>
<tr>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
</tr>
<tr>
<td></td>
<td>........................................................</td><td></td>
<td>......................................................... </td>
<td> </td>
</tr>
</table>