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

Merge pull request #579 from jitendra-webkul/jitendra 

Fixed view event issues
This commit is contained in:
JItendra Singh 2019-02-15 13:07:59 +05:30 committed by GitHub
parent 62d3f4c9df a03e5dc132
commit 78cb14d0dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,6 +87,8 @@
<accordian :title="'{{ __('admin::app.catalog.attributes.label') }}'" :active="true">
<div slot="body">
{!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.attributes.controls.before', ['attribute' => $attribute]) !!}
<div class="control-group" :class="[errors.has('admin_name') ? 'has-error' : '']">
<label for="admin_name" class="required">{{ __('admin::app.catalog.attributes.admin') }}</label>
<input type="text" v-validate="'required'" class="control" id="admin_name" name="admin_name" value="{{ old('admin_name') ?: $attribute->admin_name }}" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.admin_name') }}&quot;"/>
@ -102,6 +104,8 @@
@endforeach
{!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.attributes.controls.after', ['attribute' => $attribute]) !!}
</div>
</accordian>
@ -114,7 +118,7 @@
<accordian :title="'{{ __('admin::app.catalog.attributes.options') }}'" :active="true" :id="'options'">
<div slot="body">
{!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.options.controls.before', ['attribute' => $attribute]) !!}
<option-wrapper></option-wrapper>

2
packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
View File

@ -151,6 +151,8 @@
</div>
</accordian>
{!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.seo.after') !!}
</div>
</div>

8
packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php
View File

@ -53,7 +53,10 @@
</div>
</accordian>
{!! view_render_event('bagisto.admin.catalog.family.create_form_accordian.general.before') !!}
{!! view_render_event('bagisto.admin.catalog.family.create_form_accordian.general.after') !!}
{!! view_render_event('bagisto.admin.catalog.family.create_form_accordian.groups.before') !!}
<accordian :title="'{{ __('admin::app.catalog.families.groups') }}'" :active="true">
<div slot="body">
@ -69,6 +72,9 @@
{!! view_render_event('bagisto.admin.catalog.family.create_form_accordian.groups.controls.after') !!}
</div>
</accordian>
{!! view_render_event('bagisto.admin.catalog.family.create_form_accordian.groups.after') !!}
</div>
</div>

4
packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php
View File

@ -62,12 +62,12 @@
<accordian :title="'{{ __('admin::app.catalog.families.groups') }}'" :active="true">
<div slot="body">
{!! view_render_event('bagisto.admin.catalog.family.edit_form_accordian.groups.controls.before', ['attributeFamily' => $attributeFamily]) !!}
<button type="button" class="btn btn-md btn-primary" @click="showModal('addGroup')">
{{ __('admin::app.catalog.families.add-group-title') }}
</button>
{!! view_render_event('bagisto.admin.catalog.family.edit_form_accordian.groups.controls.before', ['attributeFamily' => $attributeFamily]) !!}
<group-list></group-list>
{!! view_render_event('bagisto.admin.catalog.family.edit_form_accordian.groups.controls.before', ['attributeFamily' => $attributeFamily]) !!}

2
packages/Webkul/Admin/src/Resources/views/catalog/families/index.blade.php
View File

@ -26,7 +26,7 @@
</div>
{!! view_render_event('bagisto.admin.catalog.families.list.before') !!}
{!! view_render_event('bagisto.admin.catalog.families.list.after') !!}
</div>
@stop

16
packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php
View File

@ -45,11 +45,13 @@
<?php $familyId = app('request')->input('family') ?>
<?php $sku = app('request')->input('sku') ?>
{!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.general.before') !!}
{!! view_render_event('bagisto.admin.catalog.product.create_form_accordian.general.before') !!}
<accordian :title="'{{ __('admin::app.catalog.products.general') }}'" :active="true">
<div slot="body">
{!! view_render_event('bagisto.admin.catalog.product.create_form_accordian.general.controls.before') !!}
<div class="control-group" :class="[errors.has('type') ? 'has-error' : '']">
<label for="type" class="required">{{ __('admin::app.catalog.products.product-type') }}</label>
<select class="control" v-validate="'required'" id="type" name="type" {{ $familyId ? 'disabled' : '' }} data-vv-as="&quot;{{ __('admin::app.catalog.products.product-type') }}&quot;">
@ -84,18 +86,22 @@
<span class="control-error" v-if="errors.has('sku')">@{{ errors.first('sku') }}</span>
</div>
{!! view_render_event('bagisto.admin.catalog.product.create_form_accordian.general.controls.after') !!}
</div>
</accordian>
{!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.general.after') !!}
{!! view_render_event('bagisto.admin.catalog.product.create_form_accordian.general.after') !!}
@if ($familyId)
{!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.configurable_attributes.before') !!}
{!! view_render_event('bagisto.admin.catalog.product.create_form_accordian.configurable_attributes.before') !!}
<accordian :title="'{{ __('admin::app.catalog.products.configurable-attributes') }}'" :active="true">
<div slot="body">
{!! view_render_event('bagisto.admin.catalog.product.create_form_accordian.configurable_attributes.controls.before') !!}
<div class="table">
<table>
<thead>
@ -132,10 +138,12 @@
</table>
</div>
{!! view_render_event('bagisto.admin.catalog.product.create_form_accordian.configurable_attributes.controls.after') !!}
</div>
</accordian>
{!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.configurable_attributes.after') !!}
{!! view_render_event('bagisto.admin.catalog.product.create_form_accordian.configurable_attributes.after') !!}
@endif
</div>

2
packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
View File

@ -133,7 +133,7 @@
@endforeach
{!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.' . $attributeGroup->name . '.controls.before', ['product' => $product]) !!}
{!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.' . $attributeGroup->name . '.controls.after', ['product' => $product]) !!}
</div>
</accordian>