From c45401058b87c663e8012e769ddf84d9efa95d4c Mon Sep 17 00:00:00 2001 From: Vivek Sharma Date: Mon, 14 Jan 2019 18:28:23 +0530 Subject: [PATCH 1/2] [Updated: README.md file updated.] --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 71c8a1f4e..19d581197 100755 --- a/README.md +++ b/README.md @@ -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). From c0da6fbd73ce3d0991906481168af8b89e8475d0 Mon Sep 17 00:00:00 2001 From: jitendra Date: Mon, 14 Jan 2019 19:41:34 +0530 Subject: [PATCH 2/2] Attribute family creation issue fixed --- .../Resources/views/layouts/master.blade.php | 20 +++++++++++++++++++ .../AttributeFamilyRepository.php | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php index 9f4ee570c..0e3e8f806 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php @@ -15,21 +15,39 @@ @yield('css') + {!! view_render_event('bagisto.admin.layout.head') !!} + + {!! view_render_event('bagisto.admin.layout.body.before') !!} +
+ {!! 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') !!} + +
+ {!! view_render_event('bagisto.admin.layout.content.before') !!} + @yield('content-wrapper') + {!! view_render_event('bagisto.admin.layout.content.after') !!} +
@@ -59,6 +77,8 @@ @stack('scripts') + {!! view_render_event('bagisto.admin.layout.body.after') !!} +
\ No newline at end of file diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php index 452e52d01..6b8fb4791 100755 --- a/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php +++ b/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php @@ -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; }