From f20dea46e423097ca8a70b18627d3e3254995c30 Mon Sep 17 00:00:00 2001 From: Hossein <43233476+hChamran@users.noreply.github.com> Date: Thu, 5 Sep 2019 09:33:08 +0430 Subject: [PATCH 1/2] Fix #1392 --- .../src/Resources/views/layouts/anonymous-master.blade.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php index 5ac3d67ba..5597b4c40 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php @@ -117,8 +117,10 @@ @endif window.serverErrors = []; - @if (count($errors)) - window.serverErrors = @json($errors->getMessages()); + @if (isset($errors)) + @if (count($errors)) + window.serverErrors = @json($errors->getMessages()); + @endif @endif From b3eb0b3f8887bb263a6d00f89e9886ec56446806 Mon Sep 17 00:00:00 2001 From: Glenn Hermans Date: Thu, 5 Sep 2019 12:12:45 +0200 Subject: [PATCH 2/2] fixed #1367 --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 1c37b661c..4ac666631 100755 --- a/composer.json +++ b/composer.json @@ -100,7 +100,8 @@ "extra": { "laravel": { "dont-discover": [ - "barryvdh/laravel-debugbar" + "barryvdh/laravel-debugbar", + "laravel/dusk" ] } }, @@ -122,4 +123,4 @@ "optimize-autoloader": true }, "minimum-stability": "dev" - } \ No newline at end of file + }