merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added asterisk in description fields of catalog rule update and create

This commit is contained in:
Prashant Singh 2019-08-20 17:27:49 +05:30
parent afafdfbfcd
commit 3a9143462e
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php
View File

@ -46,7 +46,7 @@
</div>
<div class="control-group" :class="[errors.has('description') ? 'has-error' : '']">
<label for="description">{{ __('admin::app.promotion.general-info.description') }}</label>
<label for="description" class="required">{{ __('admin::app.promotion.general-info.description') }}</label>
<textarea class="control" name="description" v-model="description" v-validate="'required'" value="{{ old('description') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.description') }}&quot;"></textarea>

2
packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php
View File

@ -46,7 +46,7 @@
</div>
<div class="control-group" :class="[errors.has('description') ? 'has-error' : '']">
<label for="description">{{ __('admin::app.promotion.general-info.description') }}</label>
<label for="description" class="required">{{ __('admin::app.promotion.general-info.description') }}</label>
<textarea class="control" name="description" v-model="description" v-validate="'required'" value="{{ old('description') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.description') }}&quot;"></textarea>

28
packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php
View File

@ -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) {