diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php index 51bc1380b..86d147167 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php @@ -46,7 +46,7 @@
- + diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php index da58498dc..100ee90d0 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php @@ -46,7 +46,7 @@
- + diff --git a/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php b/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php index 071f1a415..1ccbf6336 100644 --- a/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php +++ b/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php @@ -87,6 +87,13 @@ use Webkul\Core\Repositories\LocaleRepository as Locale; { $data = request()->all(); + // part one of the validation in case partials pages were generated or generating partial pages + $this->validate(request(), [ + 'channels' => 'required', + 'locales' => 'required', + 'url_key' => 'required' + ]); + $channels = request()->input('channels'); $locales = request()->input('locales'); @@ -109,20 +116,21 @@ use Webkul\Core\Repositories\LocaleRepository as Locale; } } - if (count($ignorePageIDs)) { + if (! count($ignorePageIDs)) { $this->validate(request(), [ - 'channels' => 'required', - 'locales' => 'required', - 'url_key' => 'required|unique:cms_pages,url_key,'.$ignorePageIDs, - 'html_content' => 'required|string', - 'page_title' => 'required|string', - 'meta_title' => 'required|string', - 'meta_description' => 'string', - 'meta_keywords' => 'required|string' + 'url_key' => 'unique:cms_pages,url_key,' ]); } - $data = request()->all(); + $this->validate(request(), [ + 'channels' => 'required', + 'locales' => 'required', + 'html_content' => 'required|string', + 'page_title' => 'required|string', + 'meta_title' => 'required|string', + 'meta_description' => 'string', + 'meta_keywords' => 'required|string' + ]); foreach ($data['channels'] as $channel) { foreach ($data['locales'] as $locale) {