Merged in feature/updateLaporanPenebusanRangeDate (pull request #54)

Update range date for laporan penebusan

app/Http/Controllers/AkaunController.php

@@ -353,7 +353,6 @@ class AkaunController extends Controller
     }
 
     public function cetakLaporanPenebusan(Request $request){
-        // dd($request);
         $api_url = $request->hostname;
         $auth_user = Auth::user();
         $current = Carbon::now();
@@ -387,7 +386,6 @@ class AkaunController extends Controller
     }
 
     public function cetakLaporanAnsuran(Request $request){
-        // dd($request);
         $api_url = $request->hostname;
         $auth_user = Auth::user();
         $current = Carbon::now();
@@ -461,7 +459,6 @@ class AkaunController extends Controller
     }
 
     public function cetakLaporanPetiBesi(Request $request){
-        // dd($request);
         $api_url = $request->hostname;
         $auth_user = Auth::user();
         $current = Carbon::now();
@@ -1605,5 +1602,85 @@ class AkaunController extends Controller
 
     }
 
+    public function cetakLaporanAnsuranRangeDate(Request $request){
+        $api_url = $request->hostname;
+        $auth_user = Auth::user();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh_cetak = $current->toDateString();
+
+        if($request->datetarikh == null){
+            $tarikh_mula = $current->toDateString();
+        }else{
+            $split_date = explode('-',$request->datetarikh);
+            $tarikh_mula = $request->datetarikh;     
+        }
+
+        if($request->datehingga == null){
+            $tarikh_akhir = $current->toDateString();
+        }else{
+            $split_date2 = explode('-',$request->datehingga);
+            $tarikh_akhir = $request->datehingga;     
+        }
+
+        $tebus = Http::get($request->hostname. '/api/ansuranujrahByCaw/laporan/'. $request->kodcaw,['mula' => $tarikh_mula,'akhir' => $tarikh_akhir])->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');
+
+            }else{
+                return view('akaun.laporan_ansuran', compact('tebus','cawangan_detail','tarikh_cetak','api_url','tarikh_mula','tarikh_akhir'));
+            }
+        }
+
+    }
+
+    public function cetakLaporanPenebusanRangeDate(Request $request){
+        $api_url = $request->hostname;
+        $auth_user = Auth::user();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh_cetak = $current->toDateString();
+
+        if($request->datemula == null){
+            $mula_date = $current->toDateString();
+        }else{
+            $split_date = explode('-',$request->datemula);
+            $mula_date = $request->datemula;     
+        }
+
+        if($request->datehingga == null){
+            $hingga_date = $current->toDateString();
+        }else{
+            $split_date2 = explode('-',$request->datehingga);
+            $hingga_date = $request->datehingga;     
+        }
+
+        $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();
+        $ansuran = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/ansuransummaryrange/'. $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_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','tebuspengasingan','api_url','upahlama','ansuran'));
+                return $pdf->download('laporan_penebusan_' . $request->kodcaw .'_'. $mula_date .'-'. $hingga_date .'.pdf');
+            }else{
+                return view('akaun.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','tebuspengasingan','api_url','upahlama','ansuran'));
+            }
+        }
+    }
+
     
 }

resources/js/Akaun/Penebusan.vue

@@ -21,7 +21,11 @@
                                 <input :value="$hostname" name="hostname" hidden/>
                                 <input :value="$kodcaw" name="kodcaw" 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="datetarikh" 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>
@@ -35,48 +39,123 @@
 
 <script>
 export default {
+
     data(){
         return{
             jenisgenerate:'none',
-            kodcaw:''
+            kodcaw: ''
         }
     },
     methods: {
         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;
+
+                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("formpenebusan").submit();
+                }
 
-            document.getElementById("formpenebusan").submit();
         },
         async generateview(){
             await this.setJenis('view');
 
+
+            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,
+                    
+                    
+                    });
+              
+                } else{
+
+                    Vue.swal({
+                        title: 'Memuatkan...',
+                        allowEscapeKey : false,
+                        allowOutsideClick: false,
+                        showCancelButton: false,
+                        showConfirmButton: false,
+                        timer: 8000,
+                    });
+
+                    document.getElementById("formpenebusan").submit();
+                }
+
             
-            Vue.swal({
-                title: 'Memuatkan...',
-                allowEscapeKey : false,
-                allowOutsideClick: false,
-                showCancelButton: false,
-                showConfirmButton: false,
-                timer: 8000,
-            });
             
-            document.getElementById("formpenebusan").submit();
         },
         Urlredirect: function() {
-         return window.route('cetak.penebusan')
+         return window.route('cetak.penebusanRangeDate')
         },
         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,
+                    
+                    
+                });
+              
+                } 
+
         }
     }
     

resources/views/akaun/laporan_penebusan.blade.php

@@ -174,12 +174,21 @@
       <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>
       

routes/web.php

@@ -119,6 +119,8 @@ Route::get('/akaunhome/cetaktuntutrugi',['as'=>'cetak.tuntutrugilelong','uses'=>
 Route::get('/akaunhome/cetakbilanganpengadai',['as'=>'cetak.bilpengadai','uses'=>'App\Http\Controllers\AkaunController@cetaklaporan_bilangan_pengadai'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']);
 Route::get('/akaunhome/cetakstokauditCombine',['as'=>'cetak.stokauditCombine','uses'=>'App\Http\Controllers\AkaunController@cetaklaporan_stokaudit_combine'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']);
 Route::get('/akaunhome/cetakAuditTrail',['as'=>'cetak.cetakAuditTrail','uses'=>'App\Http\Controllers\AkaunController@cetaklaporan_auditTrail'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']);
+Route::get('/akaunhome/cetakAnsuranRangeDate',['as'=>'cetak.ansuranRangeDate','uses'=>'App\Http\Controllers\AkaunController@cetakLaporanAnsuranRangeDate'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']);
+Route::get('/akaunhome/cetakpenebusanRangeDate',['as'=>'cetak.penebusanRangeDate','uses'=>'App\Http\Controllers\AkaunController@cetakLaporanPenebusanRangeDate'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']);