Merge branch 'master' of https://github.com/bagisto/bagisto into development

This commit is contained in:
Prashant Singh 2019-09-05 16:29:43 +05:30
commit 32b05c924d
2 changed files with 7 additions and 4 deletions

View File

@ -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"
}
}

View File

@ -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
</script>