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

Merge pull request #6249 from jitendra-webkul/master 

Issue #5354 fixed
This commit is contained in:
Jitendra Singh 2022-04-06 15:29:28 +05:30 committed by GitHub
parent 0c5cb7ed82 93f582b78f
commit 0921789cb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
View File

@ -370,6 +370,12 @@
} else { } else {
$('#enable_wysiwyg').parents('.control-group').addClass('hide'); $('#enable_wysiwyg').parents('.control-group').addClass('hide');
} }
if (['text'].indexOf($(e.target).val()) > -1) {
$('#validation').parents('.control-group').removeClass('hide');
} else {
$('#validation').parents('.control-group').addClass('hide');
}
}) })
}); });

40
packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
View File

@ -184,25 +184,27 @@
<input type="hidden" name="is_unique" value="{{ $attribute->is_unique }}"/> <input type="hidden" name="is_unique" value="{{ $attribute->is_unique }}"/>
</div> </div>
<div class="control-group"> @if ($attribute->type == 'text')
<?php $selectedValidation = old('validation') ?: $attribute->validation ?> <div class="control-group">
<label for="validation">{{ __('admin::app.catalog.attributes.input_validation') }}</label> <?php $selectedValidation = old('validation') ?: $attribute->validation ?>
<select class="control" id="validation" name="validation" {{ ! $attribute->is_user_defined ? 'disabled' : '' }}> <label for="validation">{{ __('admin::app.catalog.attributes.input_validation') }}</label>
<option value=""></option> <select class="control" id="validation" name="validation" {{ ! $attribute->is_user_defined ? 'disabled' : '' }}>
<option value="numeric" {{ $selectedValidation == 'numeric' ? 'selected' : '' }}> <option value=""></option>
{{ __('admin::app.catalog.attributes.number') }} <option value="numeric" {{ $selectedValidation == 'numeric' ? 'selected' : '' }}>
</option> {{ __('admin::app.catalog.attributes.number') }}
<option value="decimal" {{ $selectedValidation == 'decimal' ? 'selected' : '' }}> </option>
{{ __('admin::app.catalog.attributes.decimal') }} <option value="decimal" {{ $selectedValidation == 'decimal' ? 'selected' : '' }}>
</option> {{ __('admin::app.catalog.attributes.decimal') }}
<option value="email" {{ $selectedValidation == 'email' ? 'selected' : '' }}> </option>
{{ __('admin::app.catalog.attributes.email') }} <option value="email" {{ $selectedValidation == 'email' ? 'selected' : '' }}>
</option> {{ __('admin::app.catalog.attributes.email') }}
<option value="url" {{ $selectedValidation == 'url' ? 'selected' : '' }}> </option>
{{ __('admin::app.catalog.attributes.url') }} <option value="url" {{ $selectedValidation == 'url' ? 'selected' : '' }}>
</option> {{ __('admin::app.catalog.attributes.url') }}
</select> </option>
</div> </select>
</div>
@endif
{!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.validations.controls.after', ['attribute' => $attribute]) !!} {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.validations.controls.after', ['attribute' => $attribute]) !!}
</div> </div>