diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php index bb5eaafe3..b3d4d26a2 100644 --- a/app/Http/Controllers/Account/AcceptanceController.php +++ b/app/Http/Controllers/Account/AcceptanceController.php @@ -7,9 +7,12 @@ use App\Events\CheckoutDeclined; use App\Events\ItemAccepted; use App\Events\ItemDeclined; use App\Http\Controllers\Controller; +use App\Models\Actionlog; +use App\Models\Asset; use App\Models\CheckoutAcceptance; use App\Models\Company; use App\Models\Contracts\Acceptable; +use App\Models\User; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Storage; @@ -136,10 +139,19 @@ class AcceptanceController extends Controller \Log::error(storage_path().'/eula-pdfs/'.$sig_filename); $pdf = Pdf::loadView('account.accept.accept-eula', $data); - $stored_eula = Storage::put('private_uploads/eula-pdfs/accepted-eula-'.date('Y-m-d-h-i-s').'.pdf', $pdf->output()); - + $stored_eula= Storage::put('private_uploads/eula-pdfs/accepted-eula-'.date('Y-m-d-h-i-s').'.pdf', $pdf->output()); + \Log::info($stored_eula); //not sure what im doing here,but I think its something of this. - route('log.storedeula.download', $stored_eula); + Actionlog::Create([ + 'item_id' => $acceptance->id, + 'stored_eula' => $stored_eula, + 'action_type' => 'accepted', + ]); + \log::info(Actionlog::Create([ + 'item_id' => $acceptance->id, + 'stored_eula' => $stored_eula, + 'action_type' => 'accepted', + ])); return redirect()->to('account/accept')->with('success', $return_msg); } diff --git a/app/Http/Controllers/ActionlogController.php b/app/Http/Controllers/ActionlogController.php index 2b3f6d6f5..f4e86e0d5 100644 --- a/app/Http/Controllers/ActionlogController.php +++ b/app/Http/Controllers/ActionlogController.php @@ -21,6 +21,7 @@ class ActionlogController extends Controller $this->authorize('view', \App\Models\Asset::class); $file = config('app.private_uploads').'/eula-pdfs/'.$filename; + return Response::download($file); } } diff --git a/database/migrations/2022_03_09_001334_add_eula_to_checkout_acceptance.php b/database/migrations/2022_03_09_001334_add_eula_to_checkout_acceptance.php new file mode 100644 index 000000000..39b21a4c9 --- /dev/null +++ b/database/migrations/2022_03_09_001334_add_eula_to_checkout_acceptance.php @@ -0,0 +1,7 @@ +text('stored_eula')->nullable()->default(null); + $table->string('stored_eula_file')->nullable()->default(null); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('action_logs', function (Blueprint $table) { + $table->dropColumn('stored_eula'); + $table->dropColumn('stored_eula_file'); + }); + } +} diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 0e38b2193..6ebc333c3 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -237,6 +237,7 @@ 'state' => 'State', 'status_labels' => 'Status Labels', 'status' => 'Status', + 'accept_eula' => 'Acceptance Agreement', 'supplier' => 'Supplier', 'suppliers' => 'Suppliers', 'sure_to_delete' => 'Are you sure you wish to delete', diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 3a2dab4c1..7c5e28b7a 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -1093,15 +1093,12 @@