diff --git a/app/KPFiles.php b/app/ARFiles.php similarity index 84% rename from app/KPFiles.php rename to app/ARFiles.php index 6bb564e..8c2b252 100644 --- a/app/KPFiles.php +++ b/app/ARFiles.php @@ -4,9 +4,9 @@ namespace App; use Illuminate\Database\Eloquent\Model; -class KPFiles extends Model +class ARFiles extends Model { - protected $table = 'kelulusanpb_files'; + protected $table = 'arrahn_files'; public $timestamps = false; protected $connection = 'mysql7'; @@ -16,7 +16,7 @@ class KPFiles extends Model * @var array */ protected $fillable = [ - 'kp_id', + 'files_id', 'data', 'filename', 'type', diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 8c93613..60950b0 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -26,7 +26,7 @@ use App\Pengesahan; use App\Permohonan; use App\Status; use App\LookupStatus; -use App\KPFiles; +use App\ARFiles; use DB; use Carbon\Carbon; @@ -2094,7 +2094,7 @@ class AdminPageController extends Controller { $timeloni = Carbon::now(); $status = new Status; - $kp_files = new KPFiles; + $ar_files = new ARFiles; try{ @@ -2105,16 +2105,16 @@ class AdminPageController extends Controller $status->tarikhmasa = $timeloni->toDateTimeString(); $status->save(); - $kp_files->data = $request->dataimage; - $kp_files->type = $request->imagetype; - $kp_files->filename = $request->imagename; - $kp_files->tarikhmasa = $timeloni->toDateTimeString(); - $kp_files->save(); + $ar_files->data = $request->dataimage; + $ar_files->type = $request->imagetype; + $ar_files->filename = $request->imagename; + $ar_files->tarikhmasa = $timeloni->toDateTimeString(); + $ar_files->save(); $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]]) ->update(array( 'tagpb' => 1, - 'kp_id' => $kp_files->id + 'kp_id' => $ar_files->id )); $permohonan = Permohonan::where('mohonid',$request->mohonid) @@ -2239,18 +2239,10 @@ class AdminPageController extends Controller } } - public function viewFile(Request $request) { - // $data = \DB::connection($conn) - // ->table($tbl) - // ->where('filename', $filename) - // ->first(); - - $kp = KPFiles::where('kp_id',$request->kp_id) + public function downloadFile(Request $request) { + $kp = ARFiles::where('files_id',$request->files_id) ->first(); - - return response(base64_decode(stream_get_contents($kp->data)), 200, [ - 'Content-type' => 'application/' . $kp->type, - 'Content-Disposition' => 'inline; filename='.$kp->filename - ]); + + return response($kp,200); } } \ No newline at end of file diff --git a/app/Permohonan.php b/app/Permohonan.php index 9071841..d4dd6c5 100644 --- a/app/Permohonan.php +++ b/app/Permohonan.php @@ -29,7 +29,9 @@ class Permohonan extends Model 'nama_penerima', 'outstandingsemasa', 'nopermohonan', - 'tagterima' + 'tagterima', + 'resit_id', + 'invoice_id' ]; /** diff --git a/routes/web.php b/routes/web.php index 856ff17..b24f2b9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -696,9 +696,9 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->put('permohonan/updatebank',['uses'=>'AdminPageController@DepositBank']); $router->put('permohonan/tagterima',['uses'=>'AdminPageController@TagTerima']); $router->put('permohonan/tagcit',['uses'=>'AdminPageController@TagCit']); - $router->get('permohonan/viewfiles',['uses'=>'AdminPageController@viewFile']); - + $router->get('permohonan/viewfiles',['uses'=>'AdminPageController@downloadFile']); + }); $router->group(['prefix'=>'kelantanpay'], function () use ($router){