diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php index 180c0f3..f7002b9 100644 --- a/app/Http/Controllers/AkaunController.php +++ b/app/Http/Controllers/AkaunController.php @@ -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')); // } // } diff --git a/resources/js/Akaun/BilanganPengadai.vue b/resources/js/Akaun/BilanganPengadai.vue index 911aee1..20deaeb 100644 --- a/resources/js/Akaun/BilanganPengadai.vue +++ b/resources/js/Akaun/BilanganPengadai.vue @@ -7,7 +7,7 @@ - Laporan Bilangan Pengadai (Pekerjaan) + Laporan Bilangan Pelanggan
diff --git a/resources/js/Akaun/Home.vue b/resources/js/Akaun/Home.vue index bd48493..3733039 100644 --- a/resources/js/Akaun/Home.vue +++ b/resources/js/Akaun/Home.vue @@ -146,7 +146,7 @@
-

Bilangan Pengadai

+

Bilangan Pelanggan

diff --git a/resources/views/akaun/laporan_bilangan_pengadai.blade.php b/resources/views/akaun/laporan_bilangan_pengadai.blade.php index 1014ba2..a9c68a1 100644 --- a/resources/views/akaun/laporan_bilangan_pengadai.blade.php +++ b/resources/views/akaun/laporan_bilangan_pengadai.blade.php @@ -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 @@ - {{ $cawangan_detail['namacaw'] }} + {{ $cawangan_detail['namacaw'] }} @@ -188,54 +189,47 @@ - + - - - - - - - - - - - + + + + + - - - - - - - - - + +
LAPORAN Bilangan PengadaiLAPORAN BILANGAN PELANGGAN
TARIKH CETAK: - @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); - $formattedweddingdate = $myDateTime->format('d-m-Y'); - echo $formattedweddingdate; - @endphp -
MULA:@php + Tarikh Dari: @php $myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date); $formattedweddingdate = $myDateTime->format('d-m-Y'); - echo $formattedweddingdate; + echo($formattedweddingdate) + @endphp Tarikh Hingga: @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate) + @endphp Tarikh Cetak: @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate) @endphp HINGGA:@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date); - $formattedweddingdate = $myDateTime->format('d-m-Y'); - echo $formattedweddingdate; - @endphp

- - - + + + + + + + + + + @php $totalpengadai = 0; @@ -243,18 +237,35 @@ @endphp @foreach ($bilpengadai as $index => $item) - + @php $totalpengadai += $item['bilangangadai']; @endphp - + + + + + + + + + + @endforeach - - + + + + + + + + + +
Jenis PekerjaanBilangan PengadaiJenis PekerjaanBilangan Pengadai
{{ $item['keterangan'] }}{{ $item['bilangangadai'] }}{{ number_format($item['bilangangadai']) }}
Jumlah: {{$totalpengadai}} Jumlah {{number_format($totalpengadai,2)}}