Update laporan ansuran range date

2024-07-31 15:27:55 +08:00
parent 9457363080
commit 08dcdab085
3 changed files with 131 additions and 42 deletions
@@ -1613,33 +1613,31 @@ class AkaunController extends Controller
        $current = new Carbon();
        $tarikh_cetak = $current->toDateString();

-        if($request->datetarikh == null){
-            $tarikh_mula = $current->toDateString();
+        if($request->datemula == null){
+            $mula_date = $current->toDateString();
        }else{
-            $split_date = explode('-',$request->datetarikh);
-            $tarikh_mula = $request->datetarikh;     
+            $split_date = explode('-',$request->datemula);
+            $mula_date = $request->datemula;     
        }

        if($request->datehingga == null){
-            $tarikh_akhir = $current->toDateString();
+            $hingga_date = $current->toDateString();
        }else{
            $split_date2 = explode('-',$request->datehingga);
-            $tarikh_akhir = $request->datehingga;     
+            $hingga_date = $request->datehingga;     
        }
-
-        $tebus = Http::get($request->hostname. '/api/ansuranujrahByCaw/laporan/'. $request->kodcaw,['mula' => $tarikh_mula,'akhir' => $tarikh_akhir])->json();
+        $tebus = Http::get($request->hostname. '/api/ansuranujrah/laporan/'. $request->kodcaw,['mula' => $mula_date,'akhir' => $hingga_date])->json();
        $cawangan=Http::get($request->hostname.'/api/cawangan/detail/'.$request->kodcaw)->json();
        $cawangan_detail=$cawangan[0];
-        
        if(isset($request->jenis))
        {
            if($request->jenis == 'pdf')
            {
-                $pdf = PDF::loadView('akaun.laporan_ansuran', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','api_url'))->setPaper('a4', 'potrait');
-                return $pdf->download('laporan_ansuran_' . $request->kodcaw .'_'. $tarikh_mula .'-'. $tarikh_akhir .'.pdf');
+                $pdf = PDF::loadView('akaun.laporan_ansuran', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'))->setPaper('a4', 'potrait');
+                return $pdf->download('laporan_ansuran_' . $request->kodcaw .'_'. $mula_date .'-'. $hingga_date .'.pdf');

            }else{
-                return view('akaun.laporan_ansuran', compact('tebus','cawangan_detail','tarikh_cetak','api_url','tarikh_mula','tarikh_akhir'));
+                return view('akaun.laporan_ansuran', compact('tebus','cawangan_detail','tarikh_cetak','api_url','mula_date','hingga_date'));
            }
        }

@@ -1666,6 +1664,8 @@ class AkaunController extends Controller
            $hingga_date = $request->datehingga;     
        }

+        $tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/tebusujrah/laporan/'. $auth_user['cawangan']  ,['mula' => $mula_date,'akhir' => $hingga_date])->json();
+
        $tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/tebusujrah/laporan/'. $request->kodcaw,['mula' => $mula_date,'akhir' => $hingga_date])->json();
        $tebuspengasingan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/tebus/laporanjenistawarruqujrah/'.$request->kodcaw,['mula' => $mula_date,'akhir' => $hingga_date])->json();
        $upahlama = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/advansurdetailsrange/'. $request->kodcaw,['mula' => $mula_date,'akhir' => $hingga_date])->json();
@@ -18,7 +18,11 @@
                                <input :value="$kodcaw" name="kodcaw" hidden/>
                                <input :value="$hostname" name="hostname" hidden/>
                                <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" />
+                                <input id="tarikhmula" name="datemula" class="border border-2 border-l-0 rounded-r px-4 py-2 w-80r mr-2" type="date" />
+                                <span style="background-color: #F9FAFB" class="text-gray-600 border border-2 rounded-l px-4 py-2 whitespace-no-wrap">Hingga</span>
+                                <input id="tarikhhingga" name="datehingga" @change="dateChecking()" class="border border-2 border-l-0 rounded-r px-4 py-2 w-80r mr-2" type="date"/>
+                            </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>
@@ -39,41 +43,116 @@ export default {
        }
    },
    methods: {
-        async generatepdf(){
+       async generatepdf(){
            await this.setJenis('pdf');

+            var tarikhMula = document.getElementById("tarikhmula");
+            var tarikhHingga = document.getElementById("tarikhhingga");
            
-            Vue.swal({
-                title: 'Memuatkan...',
-                allowEscapeKey : false,
-                allowOutsideClick: false,
-                showCancelButton: false,
-                showConfirmButton: false,
-                timer: 8000,
-            });
+            var tarikh1 = new Date(tarikhMula.value);
+            var tarikh2 = new Date(tarikhHingga.value);
+            var Difference_In_Time = tarikh2.getTime() - tarikh1.getTime();
+            var Difference_In_Days = Difference_In_Time / (1000 * 3600 * 24) + 1;

-            document.getElementById("formansuran").submit();
+                if(Difference_In_Days > 62){
+    
+                    Vue.swal({
+                    text: 'Sila Pilih Tarikh Kurang Dari 2 Bulan',
+                    icon: 'error',
+                    allowEscapeKey : false,
+                    showCancelButton: false,
+                    showConfirmButton: true,
+                    
+                    
+                });
+              
+                } else{
+
+
+                    Vue.swal({
+                        title: 'Memuatkan...',
+                        allowEscapeKey : false,
+                        allowOutsideClick: false,
+                        showCancelButton: false,
+                        showConfirmButton: false,
+                        timer: 8000,
+                    });
+        
+                    document.getElementById("formansuran").submit();
+                }
+
+            
        },
        async generateview(){
            await this.setJenis('view');

+
+            var tarikhMula = document.getElementById("tarikhmula");
+            var tarikhHingga = document.getElementById("tarikhhingga");
            
-            Vue.swal({
-                title: 'Memuatkan...',
-                allowEscapeKey : false,
-                allowOutsideClick: false,
-                showCancelButton: false,
-                showConfirmButton: false,
-                timer: 8000,
-            });
-            
-            document.getElementById("formansuran").submit();
+            var tarikh1 = new Date(tarikhMula.value);
+            var tarikh2 = new Date(tarikhHingga.value);
+            var Difference_In_Time = tarikh2.getTime() - tarikh1.getTime();
+            var Difference_In_Days = Difference_In_Time / (1000 * 3600 * 24) + 1;
+
+                if(Difference_In_Days > 62){
+    
+                    Vue.swal({
+                    text: 'Sila Pilih Tarikh Kurang Dari 2 Bulan',
+                    icon: 'error',
+                    allowEscapeKey : false,
+                    showCancelButton: false,
+                    showConfirmButton: true,
+                    
+                    
+                    });
+              
+                } else{
+
+                    Vue.swal({
+                        title: 'Memuatkan...',
+                        allowEscapeKey : false,
+                        allowOutsideClick: false,
+                        showCancelButton: false,
+                        showConfirmButton: false,
+                        timer: 8000,
+                    });
+
+                    document.getElementById("formansuran").submit();
+                }
+
        },
        Urlredirect: function() {
-         return window.route('cetak.ansuran')
+         return window.route('cetak.ansuranRangeDate')
        },
        setJenis: function(value){
            return this.jenisgenerate = value;
+        },
+
+        dateChecking(){
+            var tarikhMula = document.getElementById("tarikhmula");
+            var tarikhHingga = document.getElementById("tarikhhingga");
+            
+            var tarikh1 = new Date(tarikhMula.value);
+            var tarikh2 = new Date(tarikhHingga.value);
+            var Difference_In_Time = tarikh2.getTime() - tarikh1.getTime();
+            var Difference_In_Days = Difference_In_Time / (1000 * 3600 * 24) + 1;
+
+                if(Difference_In_Days > 62){
+    
+                    Vue.swal({
+                    text: 'Sila Pilih Tarikh Kurang Dari 2 Bulan',
+                    icon: 'error',
+                    allowEscapeKey : false,
+                    showCancelButton: false,
+                    showConfirmButton: true,
+                    
+                    
+                });
+              
+                } 
+
+
        }
    }
    
@@ -169,16 +169,23 @@
      <th colspan ="5"><b>LAPORAN ANSURAN</b></th>        
    </tr>
    <tr>
-      <td style="white-space: nowrap" colspan="2"><b>Tarikh Bayaran: </b>
+      <td style="white-space: nowrap" colspan="2"><b>Tarikh Mula: </b>
      
        @php 
-        $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date);
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date);
        $formattedweddingdate = $myDateTime->format('d-m-Y');
        echo($formattedweddingdate)
      @endphp
      
      </td>
     
+      <td style="white-space: nowrap" colspan="2"><b> Tarikh Hingga: </b>
+      
+        @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
+        $formattedweddingdate = $myDateTime->format('d-m-Y');
+        echo($formattedweddingdate)
+      @endphp</td>
      
      <td style="white-space: nowrap" colspan="2"><b>Tarikh Cetak: </b>
      
@@ -220,8 +227,8 @@
          $totalduitmasuk += $item['duit_masuk'];
          $totalkeuntungan += $item['bayaran_keuntungan'];
          $totalpendahuluan += $item['bayaran_pembiayaan']; 
-          $totalujrah += bcdiv(round($item['ansuranujrah'],2),1,1);
-          $totalonepercent += bcdiv(round($item['ansuranonepercent'],2),1,1); 
+         $totalujrah += array_key_exists('ansuranujrah', $item) ? bcdiv(round($item['ansuranujrah'],2),1,1) : 0;
+          $totalonepercent += bcdiv(round(array_key_exists('ansuranonepercent', $item) ? $item['ansuranonepercent'] : 0,2),1,1); 
    @endphp

    @if($index > 0)
@@ -262,8 +269,11 @@
        <td>{{ $item['tempoh'] }}</td>
        <td>{{ number_format($item['bakipjm'],2) }}</td>
        <td>{{ number_format($item['bayaran_pembiayaan'],2) }}</td>    
-        <td>{{ number_format(bcdiv(round($item['ansuranujrah'],2),1,1),2) }}</td> 
-        <td>{{  number_format(bcdiv(round($item['ansuranonepercent'],2),1,1),2) }}</td>           
+        @php
+               $totalujrah = array_key_exists('ansuranujrah', $item) ? bcdiv(round($item['ansuranujrah'],2),1,1) : 0;
+        @endphp
+        <td>{{ number_format($totalujrah, 2) }}</td> 
+        <td>{{  number_format(bcdiv(round(array_key_exists('ansuranonepercent', $item) ? $item['ansuranonepercent'] : 0,2),1,1),2) }}</td>  
        <td>{{ number_format($item['bayaran_keuntungan'],2) }}</td>
        <td>{{ number_format($item['duit_masuk'],2) }}</td>
      </tr>
@@ -272,8 +282,8 @@
          $totaldmteller += $item['duit_masuk'];
          $totalupahteller += $item['bayaran_keuntungan'];
          $totalpendhteller += $item['bayaran_pembiayaan']; 
-          $totalujrahteller += bcdiv(round($item['ansuranujrah'],2),1,1);
-          $totalonepercentteller += bcdiv(round($item['ansuranonepercent'],2),1,1); 
+          $totalujrahteller += array_key_exists('ansuranujrah', $item) ? bcdiv(round($item['ansuranujrah'],2),1,1) : 0;
+          $totalonepercentteller += bcdiv(round(array_key_exists('ansuranonepercent', $item) ? $item['ansuranonepercent'] : 0,2),1,1); 
      @endphp

      @if($index+1 < sizeof($tebus))