Update laporan ansuran range date

This commit is contained in:
Amirah
2024-07-31 15:27:55 +08:00
parent 9457363080
commit 08dcdab085
3 changed files with 131 additions and 42 deletions
+12 -12
View File
@@ -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();