From 277869bdaf519a4ff78726b934b16b5986cc806f Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Mon, 17 Apr 2023 11:11:38 +0800
Subject: [PATCH] fix laporan bilangan pelanggan

---
 app/Http/Controllers/AkaunController.php      | 12 +--
 resources/js/Akaun/BilanganPengadai.vue       |  2 +-
 resources/js/Akaun/Home.vue                   |  2 +-
 .../akaun/laporan_bilangan_pengadai.blade.php | 93 +++++++++++--------
 4 files changed, 60 insertions(+), 49 deletions(-)

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 @@
                     <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/>
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 @@
             </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>
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 @@
 
     </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>