KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

fix tunaiditangan

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-04-22 16:00:49 +08:00
parent 56f3354177
commit a229ef4572
3 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+10 -2
View File
@@ -2694,14 +2694,22 @@ class KhazanahController extends Controller
$keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpul/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
//TunaiDitangan Sementara Upah
if($tarikh_imbangan2 >= '2021-04-22')
{
$advansurharini = Http::get(config('api.url').'/api/advansurharini/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$totaltunaiditangan = floatval($tunaiditangan) - floatval($advansur);
}else{
$totaltunaiditangan = $tunaiditangan;
}
//Terkumpul
$untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpul/'. $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$hartasemasa = [];
// $hartasemasa = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']];
array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan]);
array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $totaltunaiditangan]);
array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]);
array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]);
array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]);
resources/views/print/laporan_gadaian.blade.php
+3 -6
View File
@@ -150,7 +150,7 @@
{{-- <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th> --}}
</tr>
<tr>
<td style="font-size:20px;">{{ $cawangan_detail['namacaw'] }}</td>
<td style="font-size:20px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td>
<td></td>
</tr>
{{-- <tr>
@@ -268,13 +268,10 @@
</tr>
@endif
@endforeach
<tfoot>
<th colspan="8" style="text-align:right;font-size:13px;">JUMLAH KESELURUHAN :</th>
<th style="font-size:13px;">{{ number_format($totalpinjaman,2) }}</th>
<th></th>
</tfoot>
</table>
<h5 style="float:right;">JUMLAH KESELURUHAN GADAIAN : RM {{ number_format($totalpinjaman,2) }}</h5>
<br>
<br>
<table id="sign">
resources/views/print/laporan_penebusan.blade.php
+36 -23
View File
@@ -135,6 +135,13 @@
padding:4px;
color:black;
}
@media print {
.new-page {
page-break-before: always;
}
}
</style>
@@ -146,21 +153,21 @@
<table id="header">
<tr>
<th rowspan="4" style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
<th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
{{-- <th rowspan="4" style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th> --}}
{{-- <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th> --}}
</tr>
<tr>
<td>{{ $cawangan_detail['namacaw'] }}</td>
<td style="font-size:20px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td>
<td></td>
</tr>
<tr>
{{-- <tr>
<td>{{ $cawangan_detail['alamat1'] }}</td>
<td></td>
</tr>
<tr>
<td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
<td></td>
</tr>
</tr> --}}
</table>
<br>
@@ -206,25 +213,25 @@
<th>T Gadai</th>
<th>T Tebus</th>
<th>JBG</th>
<th>Pembiayaan</th>
<th>Upah Asal</th>
<th>Upah Percuma</th>
<th>Upah Dibayar</th>
<th>N Marhun</th>
<th>Jenis Tebus</th>
<th width="6%;">Pembiayaan(RM)</th>
<th width="6%;">Upah/Keuntungan(RM)</th>
<th width="6%;">Bayaran(RM)</th>
</tr>
@php $counter = 1; $totalpembiayaan = 0;@endphp
@php $counter = 1; $totalbayaran = 0;@endphp
@foreach($tebus as $index=>$item)
@php $totalbayaran += $item['bakipjm'] @endphp
@if($index > 0)
@if($item['teller'] != $tebus[$index - 1]['teller'])
<tr>
<td colspan=12>Teller : <b>{{ $item['teller'] }}</b></td>
<td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
</tr>
@php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
@endif
@else
<tr>
<td colspan=12>Teller : <b>{{ $item['teller'] }}</b></td>
<td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
</tr>
@php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
@endif
<tr>
<td>{{ $counter }}</td>
@@ -248,28 +255,34 @@
<td>{{$item['t_tebus']}}</td>
<td>{{$item['jbg']}}</td>
<td>{{$item['pinjaman']}}</td>
<td>{{$item['upahasal']}}</td>
<td>{{$item['upahpercuma']}}</td>
<td>{{$item['upahdibayar']}}</td>
<td>{{$item['nilaimarhun']}}</td>
<td>{{$item['jenistebus']}}</td>
<td>{{$item['bakiupah']}}</td>
<td>{{$item['bakipjm']}}</td>
</tr>
@php $counter++; @endphp
@php $totalpinjamanteller += $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp
@if($index+1 < sizeof($tebus))
@if($item['teller'] != $tebus[$index + 1]['teller'])
<tr>
<td colspan=12><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
<tr class="new-page">
<td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
<td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
<td><b>{{ number_format($totalupahteller,2) }} </b></td>
<td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
</tr>
@php $counter = 0; @endphp
@endif
@else
<tr>
<td colspan=12><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
<tr class="new-page">
<td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
<td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
<td><b>{{ number_format($totalupahteller,2) }} </b></td>
<td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
</tr>
@endif
@endforeach
</table>
<h5 style="float:right;">JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}</h5>
<br>
<br>
<table id="sign">