From 7e1b5fa6934001c67227f6f737c8f510296d49a2 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Tue, 14 Jan 2020 12:37:03 +0530 Subject: [PATCH] Issue #1808 --- packages/Webkul/Admin/src/Config/system.php | 3 ++- .../Admin/src/Http/Controllers/ConfigurationController.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php index 9a1490c78..d9a39ee19 100644 --- a/packages/Webkul/Admin/src/Config/system.php +++ b/packages/Webkul/Admin/src/Config/system.php @@ -76,6 +76,7 @@ return [ 'title' => 'admin::app.admin.system.logo-image', 'type' => 'image', 'channel_based' => true, + 'validation' => 'mimes:jpeg,bmp,png,jpg' ] ] ], [ @@ -156,5 +157,5 @@ return [ 'type' => 'boolean' ] ], - ], + ], ]; \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php index bdac3ee91..882a71953 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php @@ -120,7 +120,7 @@ class ConfigurationController extends Controller { Event::fire('core.configuration.save.before'); - if (request()->hasFile('general.design.admin_logo.logo_image')) { + if (request()->has('general.design.admin_logo.logo_image') && ! request()->input('general.design.admin_logo.logo_image.delete')) { $this->validate(request(), [ 'general.design.admin_logo.logo_image' => 'required|mimes:jpeg,bmp,png,jpg' ]);