KoPKB/admin-erahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in maintenance250624 (pull request #56)

Browse Source 
update laporan viewing
This commit is contained in:
nurulnisha muhammad
2024-07-31 04:15:13 +00:00
parent 0791139e26 e20a1f03c7
commit 9457363080
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AkaunController.php
+8 -4
View File
@@ -406,7 +406,8 @@ class AkaunController extends Controller
{
if($request->jenis == 'pdf')
{
$pdf = PDF::loadView('akaun.laporan_ansuran', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','api_url'))->setPaper('a4', 'potrait');
// $pdf = PDF::loadView('akaun.laporan_ansuran', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','api_url'))->setPaper('a4', 'potrait');
$pdf = PDF::loadView('akaun.laporan_ansuran', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','api_url'))->setPaper('a4', 'landscape');
return $pdf->download('laporan_ansuran_' . $request->kodcaw .'_'. $tebus_date . '.pdf');
}else{
return view('akaun.laporan_ansuran', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
@@ -1232,7 +1233,8 @@ class AkaunController extends Controller
{
if($request->jenis == 'pdf')
{
$pdf = PDF::loadView('akaun.laporan_akrubulan',compact('akrubulan','year'))->setPaper('a4', 'potrait');
//$pdf = PDF::loadView('akaun.laporan_akrubulan',compact('akrubulan','year'))->setPaper('a4', 'potrait');
$pdf = PDF::loadView('akaun.laporan_akrubulan',compact('akrubulan','year'))->setPaper('a4', 'landscape');
return $pdf->download('laporan_akrubulan' . $year . '.pdf');
}else{
return view('akaun.laporan_akrubulan',compact('akrubulan','year'));
@@ -1569,7 +1571,8 @@ class AkaunController extends Controller
if($request->jenis == 'pdf')
{
$pdf = PDF::loadView('akaun.laporan_auditTrail', compact('audittrail','cawangan_detail','tarikh_cetak','date','api_url'))->setPaper('a4', 'potrait');
// $pdf = PDF::loadView('akaun.laporan_auditTrail', compact('audittrail','cawangan_detail','tarikh_cetak','date','api_url'))->setPaper('a4', 'potrait');
$pdf = PDF::loadView('akaun.laporan_auditTrail', compact('audittrail','cawangan_detail','tarikh_cetak','date','api_url'))->setPaper('a4', 'landscape');
return $pdf->download('laporan_auditTrail_' . $cawangan_detail['kodcaw'] .'_'. $date . '.pdf');
}
else{
@@ -1593,7 +1596,8 @@ class AkaunController extends Controller
{
if($request->jenis == 'pdf')
{
$pdf = PDF::loadView('akaun.laporan_akrubulan_pecahan',compact('akrubulan','year'))->setPaper('a4', 'potrait');
//$pdf = PDF::loadView('akaun.laporan_akrubulan_pecahan',compact('akrubulan','year'))->setPaper('a4', 'potrait');
$pdf = PDF::loadView('akaun.laporan_akrubulan_pecahan',compact('akrubulan','year'))->setPaper('a4', 'landscape');
return $pdf->download('laporan_akrubulanpecahan' . $year . '.pdf');
}else{
return view('akaun.laporan_akrubulan_pecahan',compact('akrubulan','year'));
resources/views/akaun/laporan_imbanduga.blade.php
+1 -1
View File
@@ -418,7 +418,7 @@
<table id="tarikh_ib">
<tr><td style="width:10px" ><b>Tarikh Laporan</b></td ><td style="width:20px"> {{ ($tarikh_imbangan2) ? $tarikh_imbangan2 : ''}} </td><td style="width:18px" ><b>Tarikh Cetak</b></td><td style="width:25px" > {{$tarikh_cetak}} </td> </tr>
<tr><td style="width:10px" ><b>Tarikh Laporan</b></td ><td style="width:40px"> {{ ($tarikh_imbangan2) ? $tarikh_imbangan2 : ''}} </td><td style="width:18px" ><b>Tarikh Cetak</b></td><td style="width:40px" > {{$tarikh_cetak}} </td> </tr>
resources/views/akaun/laporan_imbangduga-akru.blade.php
+1 -1
View File
@@ -263,7 +263,7 @@
#tarikh_ib {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:45%;
width:60%;
}
#tarikh_ib td, #tarikh_ib th {
resources/views/akaun/laporan_online.blade.php
+1
View File
@@ -225,6 +225,7 @@
</tr>
@php $counter = 1; $totalamaun = 0; $jenis = ''; @endphp
@foreach($Online as $index=>$item)
<tr>
<td>{{ $counter }}</td>
<td>{{ $item['tarikh'] }}</td>
<td><b>{{ $item['descpt'] }}</b></td>
resources/views/akaun/laporan_tuntutbaki.blade.php
+14 -19
View File
@@ -34,11 +34,11 @@
width: 100%;
}
#scan td, #scan th {
/* #scan td, #scan th {
padding: 8px;
padding: 15px;
font-size:11px;
}
} */
#scan tr:nth-child(even){background-color: #ffffff;}
@@ -58,13 +58,14 @@
#scan {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
width: 600%;
}
#scan td, #scan th {
border-collapse: collapse;
/* border-collapse: collapse; */
padding: 8px;
font-size:11px;
width: 100%; /*new added */
}
#scan tr:nth-child(even){background-color: #ffffff;}
@@ -76,7 +77,7 @@
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
padding:2px;
color:black;
}
</style>
@@ -166,13 +167,14 @@
<table id="scan">
<tr>
<th colspan ="5"><b>LAPORAN TUNTUT BAKI</b></th>
<th><b>LAPORAN TUNTUT BAKI</b></th>
<th> </th>
<th> </th>
<th>
</th>
<th></th>
<th></th>
</tr>
</table>
<table id="scan">
<tr>
<td><b> Tarikh:</b></td>
<td style="text-align:left;"> @php
@@ -182,20 +184,13 @@
@endphp</td>
</tr>
<tr>
<td style="width:10px"> <b>Tarikh Cetak</b></td>
<!-- <td style="width:10px"> <b>Tarikh Cetak</b></td> -->
<td> <b>Tarikh Cetak:</b></td>
<td style="text-align:left;">@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp</td>
<td style="width:50px">
</td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
</tr>
</table>
@@ -228,7 +223,7 @@
@endif
<tr>
<td>{{ $counter }}</td>
<td>
<td style="width:100px">
@php
$gadaidetail = Http::get($api_url . '/api/gadai/norujukan/' . $item['norujukan'])->json();