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

Merge branch 'amirah' into 'main'

Browse Source 
fix laporan bilangan pelanggan

See merge request online-sistem1/admin-portal!56
This commit is contained in:
arrahn pkb
2023-04-17 03:16:08 +00:00
parent bc6da9a2fc 277869bdaf
commit 5c8bee52c2
4 changed files with 60 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AkaunController.php
+6 -6
View File
@@ -1478,8 +1478,6 @@ class AkaunController extends Controller
$bilpengadai = Http::get($request->hostname. '/admin/bilangan/pengadai/' . $request->kodcaw,['mula' => $mula_date,'hingga' => $hingga_date,'jenis' => $request->radpendser])->json();
// dd($bilpengadai);
$cawangan = Http::get($request->hostname.'/api/cawangan/detail/'.$request->kodcaw)->json();
$cawangan_detail=$cawangan[0];
@@ -1490,11 +1488,13 @@ class AkaunController extends Controller
// {
// if($request->jenis == 'pdf')
// {
// $pdf = PDF::loadView('akaun.laporan_pendahuluanserahan', compact('pendser','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'))->setPaper('a4', 'potrait');
// return $pdf->download('laporan_HQ_' . $request->kodcaw .'_'. $mula_date . '_' . $request->radpendser . '.pdf');
// }else{
// $pdf = PDF::loadView('akaun.laporan_bilangan_pengadai',compact('bilpengadai','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'))->setPaper('a4', 'potrait');
// return $pdf->download('laporan tuntut rugi lelong' . $request->kodcaw .'_'. $mula_date . ' hingga '. $hingga_date. '.pdf');
// }
// else{
// return view('akaun.laporan_pendahuluanserahan', compact('pendser','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
// return view('akaun.laporan_bilangan_pengadai', compact('bilpengadai','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
// }
// }
resources/js/Akaun/BilanganPengadai.vue
+1 -1
View File
@@ -7,7 +7,7 @@
<router-link to="/akaunhome">
<i class="fas fa-backspace text-white"></i>
</router-link>
<span class="text-center mx-auto text-white font-bold">Laporan Bilangan Pengadai (Pekerjaan)</span>
<span class="text-center mx-auto text-white font-bold">Laporan Bilangan Pelanggan</span>
</div>
<form method="get" id="formpendser" :action="Urlredirect()" target="_blank">
<input :value="$kodcaw" name="kodcaw" hidden/>
resources/js/Akaun/Home.vue
+1 -1
View File
@@ -146,7 +146,7 @@
</div>
<div class="bg-white ml-2 shadow border border-solid px-6 py-4 rounded-lg hover:bg-yellow-300 hover:transition-all mb-2 cursor-pointer">
<router-link to="/akaunhome/BilanganPengadai">
<h2 class="mx-auto text-center font-bold text-2xl uppercase">Bilangan Pengadai</h2>
<h2 class="mx-auto text-center font-bold text-2xl uppercase">Bilangan Pelanggan</h2>
</router-link>
</div>
</div>
resources/views/akaun/laporan_bilangan_pengadai.blade.php
+52 -41
View File
@@ -43,6 +43,7 @@
padding: 8px;
font-size: 11px;
}
#scan tr:nth-child(even) {
@@ -108,7 +109,7 @@
#details th {
padding: 8px;
font-size: 8px;
font-size: 13px;
}
#details tr:nth-child(even) {
@@ -179,7 +180,7 @@
</tr>
<tr>
<td style="font-size:20px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td>
<td style="font-size:16px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td>
<td></td>
</tr>
@@ -188,54 +189,47 @@
<table id="scan">
<tr>
<th colspan="5"><b>LAPORAN Bilangan Pengadai</b></th>
<th colspan="5"><b>LAPORAN BILANGAN PELANGGAN</b></th>
<th> </th>
<th> </th>
<th></th>
</tr>
<tr>
<th colspan="5"><b> TARIKH CETAK:</b>
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo $formattedweddingdate;
@endphp
</th>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
</tr>
<tr>
<td style="width:20px"> <b>MULA:</b></td>
<td>@php
<td style="width:100px"><b> Tarikh Dari: </b></td>
<td style="text-align:left;"> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo $formattedweddingdate;
echo($formattedweddingdate)
@endphp</td>
<td style="width:100px"><b> Tarikh Hingga: </b></td>
<td style="text-align:left;"> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp</td>
<td style="width:100px"> <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:20px"> <b>HINGGA:</b></td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo $formattedweddingdate;
@endphp</td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
</tr>
</tr>
</table>
<br>
<table id="details">
<tr>
<th>Jenis Pekerjaan</th>
<th>Bilangan Pengadai</th>
<th><u>Jenis Pekerjaan</u></th>
<th><u>Bilangan Pengadai</u></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
</tr>
@php
$totalpengadai = 0;
@@ -243,18 +237,35 @@
@endphp
@foreach ($bilpengadai as $index => $item)
<td>{{ $item['keterangan'] }}</td>
<td>{{ $item['bilangangadai'] }}</td>
<td>{{ number_format($item['bilangangadai']) }}</td>
@php
$totalpengadai += $item['bilangangadai'];
@endphp
</tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
@endforeach
<tr>
<td>Jumlah: </td>
<td>{{$totalpengadai}} </td>
<td><b>Jumlah <b></td>
<td><b>{{number_format($totalpengadai,2)}} <b></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>