diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php index 2b9f2881be..73d4430e3f 100644 --- a/app/Http/Controllers/Account/AcceptanceController.php +++ b/app/Http/Controllers/Account/AcceptanceController.php @@ -107,7 +107,7 @@ class AcceptanceController extends Controller $data_uri = e($request->input('signature_output')); $encoded_image = explode(',', $data_uri); $decoded_image = base64_decode($encoded_image[1]); - $acceptance->stored_eula_file = 'private_uploads/eula-pdfs/accepted-eula-'.date('Y-m-d-h-i-s').'.pdf'; + $acceptance->stored_eula_file = 'accepted-eula-'.date('Y-m-d-h-i-s').'.pdf'; $path = Storage::put('private_uploads/signatures/'.$sig_filename, (string) $decoded_image); } @@ -136,10 +136,9 @@ class AcceptanceController extends Controller 'logo' => public_path().'/uploads/snipe-logo.png', ]; - \Log::error(storage_path().'/eula-pdfs/'.$sig_filename); - $pdf = Pdf::loadView('account.accept.accept-eula', $data); - Storage::put($acceptance->stored_eula_file, $pdf->output()); + Storage::put('private_uploads/eula-pdfs/'.$acceptance->stored_eula_file, $pdf->output()); + $a=new Actionlog(); $a->stored_eula = $item->getEula(); $a->stored_eula_file = $acceptance->stored_eula_file; diff --git a/app/Http/Controllers/ActionlogController.php b/app/Http/Controllers/ActionlogController.php index ba14a7914e..c7d204874f 100644 --- a/app/Http/Controllers/ActionlogController.php +++ b/app/Http/Controllers/ActionlogController.php @@ -8,7 +8,6 @@ use Response; class ActionlogController extends Controller { - public function displaySig($filename) { $this->authorize('view', \App\Models\Asset::class); @@ -18,4 +17,10 @@ class ActionlogController extends Controller return Response::make($contents)->header('Content-Type', $filetype); } + public function getStoredEula($filename){ + $this->authorize('view', \App\Models\Asset::class); + $file = config('app.private_uploads').'/eula-pdfs/'.$filename; + + return Response::download($file); + } } diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php index 78fff1b20e..648ab99585 100644 --- a/app/Http/Transformers/ActionlogsTransformer.php +++ b/app/Http/Transformers/ActionlogsTransformer.php @@ -112,7 +112,7 @@ class ActionlogsTransformer 'signature_file' => ($actionlog->accept_signature) ? route('log.signature.view', ['filename' => $actionlog->accept_signature ]) : null, 'log_meta' => ((isset($clean_meta)) && (is_array($clean_meta))) ? $clean_meta: null, 'action_date' => ($actionlog->action_date) ? Helper::getFormattedDateObject($actionlog->action_date, 'datetime'): Helper::getFormattedDateObject($actionlog->created_at, 'datetime'), - 'stored_eula_file' => $actionlog->stored_eula_file, + 'stored_eula_file' => ($actionlog->stored_eula_file) ? route('log.storedeula.download', ['filename' => $actionlog->stored_eula_file]) : null, ]; return $array; diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 4ad8bfb26d..ac718e612c 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -1093,51 +1093,12 @@ {{ trans('general.item') }} {{ trans('general.target') }} {{ trans('general.notes') }} - {{ trans('general.accept_eula') }} + {{ trans('general.accept_eula') }} {{ trans('general.download') }} {{ trans('admin/hardware/table.changed')}} - @foreach($asset->assetlog as $log) - - - - @if($log->created_at) - {{ Helper::getFormattedDateObject($file->created_at, 'datetime', false) }} - @endif - - - {{$log->user_id}} - - - {{$log->action_type}} - - - {{$log->item_type}} - - - {{$log->item_type}} - - - @if($log->note) - {{$log->note}} - @endif - - - @if($log->stored_eula_file) - {{$log->stored_eula_file}} - @endif - - - @if($log->file) - {{$log->file}} - @endif - - - {{$log->log_meta}} - - - @endforeach +{{-- --}} diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 082ea2a9d5..1812e2c3dd 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -613,6 +613,11 @@ return '' + altName + ''; } } + function downloadFormatter(value) { + if (value) { + return ''; + } + } function fileUploadFormatter(value) { if ((value) && (value.url) && (value.inlineable)) { diff --git a/routes/web.php b/routes/web.php index 7f1572b16c..c2c3e03285 100644 --- a/routes/web.php +++ b/routes/web.php @@ -125,8 +125,8 @@ Route::group(['middleware' => 'auth'], function () { [ActionlogController::class, 'displaySig'] )->name('log.signature.view'); Route::get( - 'stored-eula-file/{$filename}/', - [\App\Http\Controllers\Api\ReportsController::class, 'getStoredEula'] + 'stored-eula-file/{filename}/', + [ActionlogController::class, 'getStoredEula'] )->name('log.storedeula.download'); });