KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'fixkaunter' into 'new-super'

Browse Source 
Fixkaunter

See merge request online-sistem1/kaunter!198
This commit is contained in:
Afiq Zakwan Hamdan
2022-02-09 06:12:54 +00:00
parent 942aeda057 dd4b28c322
commit a53d04f701
12 changed files with 3494 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+51 -11
View File
@@ -1579,7 +1579,9 @@ class KhazanahController extends Controller
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('khazanah.laporan.lelongan',compact('cawangan_info','api_url'));
$senaraibatch = Http::get(config('api.url'). '/api/senaraibatch/aktif/'. $auth_user['cawangan'])->json();
return view('lelongan.lelongan',compact('cawangan_info','api_url','senaraibatch'));
}
public function cetaklaporanLelongan(Request $request){
@@ -1589,17 +1591,41 @@ class KhazanahController extends Controller
$current = Carbon::now();
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
if($request->datetimepicker1 == null){
$tebus_date = $current->toDateString();
}else{
$split_date = explode('-',$request->datetimepicker1);
$tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
$tebus = Http::get(config('api.url'). '/api/lelongan/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json();
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
return view('print.laporan_lelongan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
if($request->jeniscetakan === 'cetak')
{
$lelong = Http::get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'],['batchno' => $request->batchno])->json();
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
return view('print.laporan_lelongan', compact('lelong','cawangan_detail','api_url','tarikh_cetak'));
}else if($request->jeniscetakan === 'excel')
{
$lelong = Http::get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'],['batchno' => $request->batchno])->json();
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
return view('print.laporan_lelongan_excel', compact('lelong','cawangan_detail','api_url','tarikh_cetak'));
}else if($request->jeniscetakan === 'pdf'){
$lelong = Http::get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'],['batchno' => $request->batchno])->json();
$notislelong = Http::get(config('api.url'). '/api/details/notislelong/'. $auth_user['cawangan'])->json();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
// return view('print.notislelong', compact('cawangan_info','notislelong','api_url','cawangan_detail','lelong','tarikh_cetak'));
$pdf=PDF::loadView('print.notislelong', compact('cawangan_info','notislelong','api_url','cawangan_detail','lelong','tarikh_cetak'))->setPaper('A4','potrait');
return $pdf->download('notislelong_'.$tarikh_cetak.'.pdf');
// return $pdf->stream('notislelong_'.$tarikh_cetak.'.pdf');
// return view('print.notislelong', compact('cawangan_info','api_url','cawangan_detail','lelong','tarikh_cetak'));
}
}
public function laporanAnsuran(){
@@ -3439,6 +3465,20 @@ class KhazanahController extends Controller
return view('print.laporan_saghilang', compact('polis','cawangan_detail','date','tarikh_cetak','api_url'));
}
public function NotisLelong()
{
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
// $loopalasan = Http::get(config('api.url') . '/api/lookupalasan/')->json();
return view('print.notislelong', compact('cawangan_info','api_url','cawangan_detail'));
}
}
app/Http/Controllers/LelongController.php
+4 -2
View File
@@ -38,10 +38,12 @@ class LelongController extends Controller
}
public function lelong(){
$api_url = config('api.url');
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('khazanah.lelong',compact('cawangan_info','api_url'));
$senaraibatch = Http::get(config('api.url'). '/api/senaraibatch/aktif/'. $auth_user['cawangan'])->json();
return view('khazanah.lelong',compact('cawangan_info','api_url','senaraibatch'));
}
public function resittuntutbaki($norujukan){