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

Merge pull request #449 from jitendra-webkul/jitendra 

Attribute family creation issue fixed
This commit is contained in:
JItendra Singh 2019-01-14 19:42:14 +05:30 committed by GitHub
parent 2c257b1ba4 c0da6fbd73
commit 71c9b9b79b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
View File

@ -15,21 +15,39 @@
@yield('css')
{!! view_render_event('bagisto.admin.layout.head') !!}
</head>
<body style="scroll-behavior: smooth;">
{!! view_render_event('bagisto.admin.layout.body.before') !!}
<div id="app">
<flash-wrapper ref='flashes'></flash-wrapper>
{!! view_render_event('bagisto.admin.layout.nav-top.before') !!}
@include ('admin::layouts.nav-top')
{!! view_render_event('bagisto.admin.layout.nav-top.after') !!}
{!! view_render_event('bagisto.admin.layout.nav-left.before') !!}
@include ('admin::layouts.nav-left')
{!! view_render_event('bagisto.admin.layout.nav-left.after') !!}
<div class="content-container">
{!! view_render_event('bagisto.admin.layout.content.before') !!}
@yield('content-wrapper')
{!! view_render_event('bagisto.admin.layout.content.after') !!}
</div>
</div>
@ -59,6 +77,8 @@
@stack('scripts')
{!! view_render_event('bagisto.admin.layout.body.after') !!}
<div class="modal-overlay"></div>
</body>
</html>

2
packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php
View File

@ -84,7 +84,7 @@ class AttributeFamilyRepository extends Repository
}
}
Event::fire('catalog.attribute_family.create.after', $attributeFamily);
Event::fire('catalog.attribute_family.create.after', $family);
return $family;
}