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

Merge branch 'master' of https://github.com/bagisto/bagisto into development

This commit is contained in:
Prashant Singh 2019-01-15 10:01:11 +05:30
parent 571e266c15 71c9b9b79b
commit 6da6e55457
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -89,11 +89,12 @@ default.
**Run these Commands Below**
>> Run this command below, if installing from the zip else skip:
>> Run this command, in case installing from the zip else skip this command (no need to run this command if you are creating project through composer):
~~~
composer install
~~~
>> Continue run these command below:
~~~
php artisan migrate
~~~
@ -115,6 +116,14 @@ composer dump-autoload
> That's it, now just execute the project on your specified domain entry point pointing to public folder inside installation directory.
> **Note: you can fetch your admin panel by follow below url:**
~~~
http(s)://example.com/admin/login
~~~
~~~
email:admin@example.com
password:admin123
~~~
### 5. License
Bagisto is a truly opensource E-Commerce framework which will always be free under the [MIT License](https://github.com/bagisto/bagisto/blob/master/LICENSE).

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;
}