Merge branch 'amirah' into 'main'

WTD dan Imbang duga Extend

See merge request online-sistem1/admin-portal!42

app/Http/Controllers/AkaunController.php

@@ -1370,7 +1370,21 @@ class AkaunController extends Controller
 
         $tuntutbaki = Http::get($request->hostname. '/admin/laporan/tuntutbaki',['kodcaw' => $request->kodcaw,'mula' => $mula_date,'hingga' => $hingga_date,'sort' => $request->radjenis,'jenistuntut' => $request->jenistuntutan])->json();
         
+        if(isset($request->jenis))
+        {
+            if($request->jenis == 'pdf'){
+
+                $pdf = PDF::loadView('akaun.laporan_lelongan',compact('tuntutbaki','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_lelongan',compact('tuntutbaki','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
+
+            }
+
+        }
         
-        return view('akaun.laporan_lelongan',compact('tuntutbaki','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
     }
 }

resources/js/Akaun/Home.vue

@@ -112,7 +112,7 @@
             <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/imbangduga/extended"> -->
                 <router-link to="/akaunhome/imbangduga/akru">
-                    <h2 class="mx-auto text-center font-bold text-2xl uppercase">Imbang Duga Extend.</h2>
+                    <h2 class="mx-auto text-center font-bold text-2xl uppercase">Imbang Duga Akru</h2>
                 </router-link>
             </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">

resources/js/WTD/SelectWTD.vue

@@ -53,7 +53,7 @@
                         {{ bl.norujukan }}
                     </th>
                     <td class="px-6 py-4">
-                        {{ bl.t_lelong }}
+                        {{ bl.t_jual }}
                     </td>
                     <td class="px-6 py-4">
                         {{ formattext(bl.pinjaman) }}
@@ -98,6 +98,7 @@ export default {
                 kodcaw: this.$kodcaw,
             }
         }).then(response => {
+            console.log(response);
             this.arraybakilelong = response.data;
         })
     },

resources/js/WTD/SenaraiBakiLelong.vue

@@ -62,7 +62,7 @@
                     {{ bl.norujukan }}
                 </th>
                 <td class="px-6 py-4">
-                    {{ bl.t_lelong }}
+                    {{ bl.t_jual }}
                 </td>
                 <td class="px-6 py-4">
                     {{ formattext(bl.pinjaman) }}