From c9bf977e8c445d289dd277fd77430fb71afdfac3 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Wed, 1 Mar 2023 12:50:52 +0800
Subject: [PATCH] update report i.duga,lejar am,i.duga akru,aging

---
 app/Http/Controllers/AkaunController.php | 45 +++++++++++++++++-------
 resources/js/Akaun/Aging.vue             | 30 ++++++++--------
 resources/js/Akaun/ImbangdugaAkru.vue    |  5 +--
 resources/js/Akaun/Lejeram.vue           |  3 +-
 4 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php
index 6433b6c..5cbb13c 100644
--- a/app/Http/Controllers/AkaunController.php
+++ b/app/Http/Controllers/AkaunController.php
@@ -627,7 +627,7 @@ class AkaunController extends Controller
         {
             if($request->jenis == 'pdf')
             {
-                $pdf = PDF::loadView('akaun.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','ringkasan_date','api_url','laporan','totalbilkawalanstok','totalpinjkawalanstok'))->setPaper('a4', 'potrait');
+                $pdf = PDF::loadView('akaun.laporan_ringkasanharian_pdf', compact('cawangan_detail','tarikh_cetak','ringkasan_date','api_url','laporan','totalbilkawalanstok','totalpinjkawalanstok'))->setPaper('a4', 'landscape');
                 return $pdf->download('laporan_ringkasanharian_' . $request->kodcaw .'_'. $ringkasan_date . '.pdf');
             }else{
                 return view('akaun.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','ringkasan_date','api_url','laporan','totalbilkawalanstok','totalpinjkawalanstok'));
@@ -688,14 +688,14 @@ class AkaunController extends Controller
         $cawangan=Http::get($api_url.'/api/cawangan/detail/'.$request->kodcaw)->json();
         $cawangan_detail=$cawangan[0];
 
-        if($request->radaktif === 'aktif')
-        {
-            $stokaudit = Http::get($api_url. '/api/stokaudit/aktif/'. $request->kodcaw,['tarikh' => $tebus_date])->json();
-            return view('akaun.laporan_stokaudit', compact('stokaudit','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
-        }else{
-            $stokaudit = Http::get($api_url. '/api/stokaudit/takaktif/'. $request->kodcaw,['tarikh' => $tebus_date])->json();
-            return view('akaun.laporan_stokauditbelumaktif', compact('stokaudit','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
-        }
+                if($request->radaktif === 'aktif')
+                {
+                    $stokaudit = Http::get($api_url. '/api/stokaudit/aktif/'. $request->kodcaw,['tarikh' => $tebus_date])->json();
+                    return view('akaun.laporan_stokaudit', compact('stokaudit','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
+                }else{
+                    $stokaudit = Http::get($api_url. '/api/stokaudit/takaktif/'. $request->kodcaw,['tarikh' => $tebus_date])->json();
+                    return view('akaun.laporan_stokauditbelumaktif', compact('stokaudit','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
+                }
     }
 
     public function cetaklaporan_kawalanstok(Request $request){
@@ -930,9 +930,18 @@ class AkaunController extends Controller
 
         $aging = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/admin/laporan/aging',['kodcaw' => $kodcaw,'tahun'=>$tahun,'bulan'=>$bulan])->json();
 
-        $pdf = PDF::loadView('akaun.laporan_aging', compact('aging','cawangan_detail','tarikh_cetak','tebus_date','api_url'))->setPaper('a4', 'potrait');
+        if(isset($request->jenis))
+        {
+            if($request->jenis == 'pdf')
+            {
+                $pdf = PDF::loadView('akaun.laporan_aging', compact('aging','cawangan_detail','tarikh_cetak','tebus_date','api_url'))->setPaper('a4', 'potrait');
                 return $pdf->download('laporan_aging_' . $request->kodcaw .'_'. $tebus_date . '.pdf');
-        // return view('akaun.laporan_aging', compact('aging','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
+                
+            }else{
+
+                return view('akaun.laporan_aging', compact('aging','cawangan_detail','tarikh_cetak','tebus_date','api_url'));           }
+        }
+              
     }
 
     public function cetakLaporanPrestasi(Request $request)
@@ -1339,7 +1348,19 @@ class AkaunController extends Controller
         $totalhartasemasa = $array_ig->sum_harta;
         $totaltanggungansemasa = $array_ig->sum_tanggungan;
 
-        return view('akaun.laporan_imbangduga-akru',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','tanggungansemasa','totalhartasemasa','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail'));
+        if(isset($request->jenis))
+        {
+            if($request->jenis == 'pdf')
+            {
+                $pdf = PDF::loadView('akaun.laporan_imbangduga-akru',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','tanggungansemasa','totalhartasemasa','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail'));
+                return $pdf->download('laporan_imbangduga_akru'. $request->kodcaw.'_'. $tarikh_cetak. '.pdf');
+            }
+            else
+            {
+                return view('akaun.laporan_imbangduga-akru',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','tanggungansemasa','totalhartasemasa','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail'));
+            }
+        }
+
     }
 
     public function cetak_tuntutrugilelong(Request $request){
diff --git a/resources/js/Akaun/Aging.vue b/resources/js/Akaun/Aging.vue
index 5a64bec..540933d 100644
--- a/resources/js/Akaun/Aging.vue
+++ b/resources/js/Akaun/Aging.vue
@@ -9,7 +9,7 @@
                     </router-link>
                     <span class="text-center mx-auto text-white font-bold">Laporan Aging</span>
                 </div>
-                    <form method="get" id="formaging" :action="Urlredirect()" target="_blank">
+                <form method="get" id="formaging" :action="Urlredirect()" target="_blank">
                     <div class="rounded bg-white shadow p-6">
                         <div class="pb-6">
                         <label for="username" class="font-semibold text-gray-700 block pb-1">Tarikh</label>
@@ -21,7 +21,7 @@
                                 <span style="background-color: #F9FAFB" class="text-gray-600 border border-2 rounded-l px-4 py-2 whitespace-no-wrap">Mula</span>
                                 <!-- <input id="tarikhmula" name="datestokauditbackdate" class="border border-2 border-l-0 rounded-r px-4 py-2 w-80r mr-2" type="date" /> -->
                                 <flat-pickr v-model="mula" :config="config" class="border border-2 rounded-r px-4 py-2 w-80r mr-2"></flat-pickr>
-                                <!-- <button @click.prevent="generatepdf" class=" mr-2 border border-yellow-600 text-yellow-600 font-montserrat py-2 px-8 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300"><i class="fas fa-file-pdf mr-2"></i>PDF</button> -->
+                                <button @click.prevent="generatepdf" class=" mr-2 border border-yellow-600 text-yellow-600 font-montserrat py-2 px-8 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300"><i class="fas fa-file-pdf mr-2"></i>PDF</button>
                                 <button @click.prevent="generateview" class="border border-yellow-600 text-yellow-600 font-montserrat py-2 px-8 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300"><i class="fas fa-eye mr-2"></i>View</button>
                             </div>
                         </div> 
@@ -29,7 +29,7 @@
                     </form>
                 </div>
             </div>
-    </div>
+         </div>
 </template>
 
 <script>
@@ -57,21 +57,21 @@ export default {
         }
     },
     methods: {
-        // async generatepdf(){
-        //     await this.setJenis('pdf');
+        async generatepdf(){
+            await this.setJenis('pdf');
 
             
-        //     Vue.swal({
-        //         title: 'Memuatkan...',
-        //         allowEscapeKey : false,
-        //         allowOutsideClick: false,
-        //         showCancelButton: false,
-        //         showConfirmButton: false,
-        //         timer: 8000,
-        //     });
+            Vue.swal({
+                title: 'Memuatkan...',
+                allowEscapeKey : false,
+                allowOutsideClick: false,
+                showCancelButton: false,
+                showConfirmButton: false,
+                timer: 8000,
+            });
 
-        //     document.getElementById("formringkasanharian").submit();
-        // },
+            document.getElementById("formaging").submit();
+        },
         async generateview(){
             await this.setJenis('view');
 
diff --git a/resources/js/Akaun/ImbangdugaAkru.vue b/resources/js/Akaun/ImbangdugaAkru.vue
index 53765d1..7cfa52c 100644
--- a/resources/js/Akaun/ImbangdugaAkru.vue
+++ b/resources/js/Akaun/ImbangdugaAkru.vue
@@ -23,6 +23,7 @@
                                 <span style="background-color: #F9FAFB" class="text-gray-600 border border-2 rounded-l px-4 py-2 whitespace-no-wrap">Mula</span>
                                 <!-- <input id="tarikhmula" name="datetimepicker1" class="border border-2 border-l-0 rounded-r px-4 py-2 w-80r mr-2" type="date" /> -->
                                 <flat-pickr v-model="tarikhmula" :config="config" class="border border-2 rounded-r px-4 py-2 w-80r mr-2"></flat-pickr>
+                                <button @click.prevent="generatepdf" class="mr-2 border border-yellow-600 text-yellow-600 font-montserrat py-2 px-8 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300"><i class="fas fa-file-pdf mr-2"></i>PDF</button>
                                 <button @click.prevent="generateview" class="border border-yellow-600 text-yellow-600 font-montserrat py-2 px-8 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300"><i class="fas fa-eye mr-2"></i>View</button>
                             </div>
                         </div> 
@@ -67,7 +68,7 @@
                     </div>
                     <!--footer-->
                     <div class="flex items-center justify-end p-6 border-t border-solid border-blueGray-200 rounded-b">
-                        <button @click.prevent="generatepdf" class="bg-gray-500 hover:bg-gray-700 text-white font-bold py-1 px-3 border border-gray-700 rounded mr-1" :disabled="pendingStatus == 'none'">{{ (pendingStatus == 'loading') ? '' : '' }}<i class="fas fa-file-pdf mr-2"></i>Cetak</button>
+                        <!-- <button @click.prevent="generatepdf" class="bg-gray-500 hover:bg-gray-700 text-white font-bold py-1 px-3 border border-gray-700 rounded mr-1" :disabled="pendingStatus == 'none'">{{ (pendingStatus == 'loading') ? '' : '' }}<i class="fas fa-file-pdf mr-2"></i>Cetak</button> -->
                         <button class="bg-gray-500 hover:bg-gray-700 text-white font-bold py-1 px-3 border border-gray-700 rounded mr-1" type="button" v-on:click="toggleModal()" :disabled="pendingStatus == 'none'">
                         <i class="fas fa-window-close mr-2"></i>Tutup
                         </button>
@@ -147,7 +148,7 @@ export default {
             // });
             this.showModal = true;
 
-
+                
         },
         toggleModal: function(){
             this.showLoader = true
diff --git a/resources/js/Akaun/Lejeram.vue b/resources/js/Akaun/Lejeram.vue
index f989313..f860be6 100644
--- a/resources/js/Akaun/Lejeram.vue
+++ b/resources/js/Akaun/Lejeram.vue
@@ -23,6 +23,7 @@
                             </div>
 
                             <div class="flex justify-end mt-10">
+                                <button @click.prevent="generatepdf" class="mr-2 border border-yellow-600 text-yellow-600 font-montserrat py-2 px-8 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300"><i class="fas fa-file-pdf mr-2"></i>PDF</button>
                                 <button @click.prevent="generateview" class="border border-yellow-600 text-yellow-600 font-montserrat py-2 px-8 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300"><i class="fas fa-eye mr-2"></i>View</button>
                             </div>
                         </div>
@@ -56,7 +57,7 @@
                 </div>
                 <!--footer-->
                 <div class="flex items-center justify-end p-6 border-t border-solid border-blueGray-200 rounded-b">
-                        <button @click.prevent="generatepdf" class="bg-gray-500 hover:bg-gray-700 text-white font-bold py-1 px-3 border border-gray-700 rounded mr-1" :disabled="pendingStatus == 'none'">{{ (pendingStatus == 'loading') ? '' : '' }}<i class="fas fa-file-pdf mr-2"></i>Cetak</button>
+                        <!-- <button @click.prevent="generatepdf" class="bg-gray-500 hover:bg-gray-700 text-white font-bold py-1 px-3 border border-gray-700 rounded mr-1" :disabled="pendingStatus == 'none'">{{ (pendingStatus == 'loading') ? '' : '' }}<i class="fas fa-file-pdf mr-2"></i>Cetak</button> -->
                         <button class="bg-gray-500 hover:bg-gray-700 text-white font-bold py-1 px-3 border border-gray-700 rounded mr-1" type="button" v-on:click="toggleModal()" :disabled="pendingStatus == 'none'">
                         <i class="fas fa-window-close mr-2"></i>Tutup
                         </button>