diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index d94a2d1..42464d8 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -345,7 +345,8 @@ class RealisasiBelanjaController extends Controller $src = strtolower($src); $filter.=" AND ( LOWER(NAMA_PROGRAM) LIKE '%".$src."%' OR LOWER(NAMA_SUB_KEGIATAN) LIKE '%".$src."%' OR - LOWER(NAMA_RSK) LIKE '%".$src."%' ) "; + LOWER(NAMA_RSK) LIKE '%".$src."%' OR + kode_rsk = '".$src."' ) "; } $dataFilter = DB::select(DB::raw("SELECT COUNT(ID) as JML FROM ($sqlStr $filter) x")); @@ -943,13 +944,14 @@ class RealisasiBelanjaController extends Controller public function downloadBast($kode) { $kode = explode("__",$kode); - $BelanjaRealisasiKontrak = BelanjaRealisasiKontrak::where(["belanja_realisasi_id"=>$kode[0], "id"=>$kode[1]])->firstorNew(); + $BelanjaRealisasiBast = BelanjaRealisasiBast::where(["id_kontrak"=>$kode[0], "id"=>$kode[1]])->firstorNew(); + $kontrak = BelanjaRealisasiKontrak::where("id", $kode[0])->firstOrNew(); $headers = [ 'Content-Type' => 'application/pdf', - 'Content-Disposition' => 'attachment;filename='.$BelanjaRealisasiKontrak->file_kontrak + 'Content-Disposition' => 'attachment;filename='.$BelanjaRealisasiBast->file_bast ]; - if ($BelanjaRealisasiKontrak){ - return response()->download(config('constants.upload_path_kontrak').$BelanjaRealisasiKontrak->file_kontrak, $BelanjaRealisasiKontrak->file_kontrak, $headers); + if ($BelanjaRealisasiBast){ + return response()->download(config('constants.upload_path_kontrak').$kontrak->belanja_realisasi_id."/bast/".$BelanjaRealisasiBast->file_bast, $BelanjaRealisasiBast->file_bast, $headers); }else{ echo "File tidak ditemukan!"; } diff --git a/routes/web.php b/routes/web.php index d58a230..b34dd5a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -104,6 +104,8 @@ Route::group(['middleware' => 'auth'], function () { Route::delete('/{idKontrak}/bast', [RealisasiBelanjaController::class,'destroyBast']); Route::get('/{idKontrak}/bast/add', [RealisasiBelanjaController::class,'bastCreate']); Route::post('/{idKontrak}/bast/add', [RealisasiBelanjaController::class,'bastCreate']); + Route::get('/{kode}/download-bast', [RealisasiBelanjaController::class,'downloadBast']); + Route::get('/{id}/ubah-spd', [RealisasiBelanjaController::class,'ubahSPD']); Route::post('/{id}/ubah-spd', [RealisasiBelanjaController::class,'ubahSPD']); });