diff --git a/packages/Webkul/Admin/src/Config/product_form_accordians.php b/packages/Webkul/Admin/src/Config/product_form_accordians.php deleted file mode 100755 index 332edcc03..000000000 --- a/packages/Webkul/Admin/src/Config/product_form_accordians.php +++ /dev/null @@ -1,25 +0,0 @@ - 'inventories', - 'name' => 'Inventories', - 'view' => 'admin::catalog.products.accordians.inventories', - 'sort' => 1 - ], [ - 'key' => 'images', - 'name' => 'Images', - 'view' => 'admin::catalog.products.accordians.images', - 'sort' => 2 - ], [ - 'key' => 'categories', - 'name' => 'Categories', - 'view' => 'admin::catalog.products.accordians.categories', - 'sort' => 3 - ], [ - 'key' => 'variations', - 'name' => 'Variations', - 'view' => 'admin::catalog.products.accordians.variations', - 'sort' => 4 - ] -]; \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index c8d58685d..eb4853f6d 100755 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -62,18 +62,6 @@ class AdminServiceProvider extends ServiceProvider */ protected function composeView() { - view()->composer(['admin::catalog.products.create', 'admin::catalog.products.edit'], function ($view) { - $accordian = Tree::create(); - - foreach (config('product_form_accordians') as $item) { - $accordian->add($item); - } - - $accordian->items = core()->sortItems($accordian->items); - - $view->with('form_accordians', $accordian); - }); - view()->composer(['admin::layouts.nav-left', 'admin::layouts.nav-aside', 'admin::layouts.tabs'], function ($view) { $tree = Tree::create(); @@ -142,9 +130,5 @@ class AdminServiceProvider extends ServiceProvider $this->mergeConfigFrom( dirname(__DIR__) . '/Config/acl.php', 'acl' ); - - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/product_form_accordians.php', 'product_form_accordians' - ); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index bef8fcb67..f73d76faf 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -370,7 +370,11 @@ return [ 'add-image-btn-title' => 'Add Image', 'mass-delete-success' => 'All the selected index of products have been deleted successfully', 'mass-update-success' => 'All the selected index of products have been updated successfully', - 'configurable-error' => 'Please select atleast one configurable attribute.' + 'configurable-error' => 'Please select atleast one configurable attribute.', + 'categories' => 'Categories', + 'images' => 'Images', + 'inventories' => 'Inventories', + 'variations' => 'Variations' ], 'attributes' => [ diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php index a521f156a..660656629 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php @@ -28,8 +28,13 @@
@csrf() + {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.general.before') !!} +
+ + {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.general.controls.before') !!} +
@@ -49,12 +54,22 @@
+ + {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.general.controls.after') !!} +
+ {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.general.after') !!} + + + {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.label.before') !!} +
+ {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.label.controls.before') !!} +
@@ -70,22 +85,41 @@ @endforeach + {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.label.controls.after') !!} +
+ {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.label.after') !!} + + +
+ {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.options.before') !!} +
+ + {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.options.controls.before') !!} + {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.options.controls.after') !!} +
+ + {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.options.after') !!}
+ + {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.validations.before') !!} +
+ {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.options.controls.before') !!} +
+ {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.options.controls.after') !!} +
+ {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.validations.after') !!} + + + {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.configuration.before') !!} +
+ {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.configuration.controls.before') !!} +
+ {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.configuration.controls.after') !!} +
+ + {!! view_render_event('bagisto.admin.catalog.attribute.create_form_accordian.configuration.after') !!} +
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php index 87eedbce8..a3adacbfc 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php @@ -29,8 +29,13 @@ @csrf() + {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.general.before', ['attribute' => $attribute]) !!} +
+ + {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.general.controls.before', ['attribute' => $attribute]) !!} +
@@ -69,12 +74,21 @@
+ + {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.general.controls.after', ['attribute' => $attribute]) !!}
+ {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.general.after', ['attribute' => $attribute]) !!} + + + {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.attributes.before', ['attribute' => $attribute]) !!} +
+ {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.attributes.controls.before', ['attribute' => $attribute]) !!} +
@@ -90,22 +104,41 @@ @endforeach + {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.attributes.controls.after', ['attribute' => $attribute]) !!} +
+ {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.attributes.after', ['attribute' => $attribute]) !!} + +
+ + {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.options.before', ['attribute' => $attribute]) !!} +
+ {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.options.controls.before', ['attribute' => $attribute]) !!} + + + {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.options.controls.after', ['attribute' => $attribute]) !!}
+ + {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.options.after', ['attribute' => $attribute]) !!} +
+ {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.validations.before', ['attribute' => $attribute]) !!} +
+ {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.validations.controls.before', ['attribute' => $attribute]) !!} +
+ {!! 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.after', ['attribute' => $attribute]) !!} + + + {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.configuration.before', ['attribute' => $attribute]) !!} +
- + + {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.configuration.controls.before', ['attribute' => $attribute]) !!} +
+ {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.configuration.controls.after', ['attribute' => $attribute]) !!} +
+ + {!! view_render_event('bagisto.admin.catalog.attribute.edit_form_accordian.configuration.after', ['attribute' => $attribute]) !!}
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/index.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/index.blade.php index 48461ef0a..46cd37681 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/index.blade.php @@ -18,9 +18,14 @@ + {!! view_render_event('bagisto.admin.catalog.attributes.list.before') !!} +
- @inject('attributes','Webkul\Admin\DataGrids\AttributeDataGrid') - {!! $attributes->render() !!} + + {!! app('Webkul\Admin\DataGrids\AttributeDataGrid')->render() !!} +
+ + {!! view_render_event('bagisto.admin.catalog.attributes.list.after') !!} @stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php index e1c11907a..723790992 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php @@ -30,9 +30,13 @@ @csrf() + {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.general.before') !!} +
+ {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.general.controls.before') !!} +
@@ -58,12 +62,21 @@ @{{ errors.first('position') }}
+ {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.general.controls.after') !!} +
+ {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.general.after') !!} + + + {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.description_images.before') !!} +
+ {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.description_images.controls.before') !!} +
@@ -76,22 +89,42 @@
+ {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.description_images.controls.after') !!} +
+ {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.description_images.after') !!} + + @if ($categories->count()) - -
- + {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.parent_category.before') !!} + + +
+ + {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.parent_category.controls.before') !!} + + + + {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.parent_category.controls.after') !!} + +
+
+ + {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.parent_category.after') !!} -
-
@endif + + {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.seo.before') !!} +
+ {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.seo.controls.before') !!} +
@@ -113,9 +146,13 @@
+ {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.seo.controls.after') !!} +
+ {!! view_render_event('bagisto.admin.catalog.category.create_form_accordian.seo.after') !!} + diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php index 2a26cf17c..7793f3240 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php @@ -43,9 +43,13 @@ @csrf() + {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.general.before', ['category' => $category]) !!} +
+ {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.general.controls.before', ['category' => $category]) !!} +
@@ -71,11 +75,20 @@ @{{ errors.first('position') }}
+ {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.general.controls.after', ['category' => $category]) !!} +
+ + {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.general.after', ['category' => $category]) !!} + + + {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.description_images.before', ['category' => $category]) !!}
+ + {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.description_images.controls.before', ['category' => $category]) !!}
@@ -90,22 +103,41 @@
+ {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.description_images.controls.after', ['category' => $category]) !!} +
+ {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.description_images.after', ['category' => $category]) !!} + @if ($categories->count()) - -
+ + {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.parent_category.before', ['category' => $category]) !!} - + +
+ + {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.parent_category.controls.before', ['category' => $category]) !!} + + + + {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.parent_category.controls.before', ['category' => $category]) !!} + +
+
+ + {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.parent_category.after', ['category' => $category]) !!} -
-
@endif + + {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.seo.before', ['category' => $category]) !!} +
+ {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.seo.controls.before', ['category' => $category]) !!} +
@@ -127,9 +159,13 @@
+ {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.seo.controls.after', ['category' => $category]) !!} +
+ {!! view_render_event('bagisto.admin.catalog.category.edit_form_accordian.seo.after', ['category' => $category]) !!} + diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/index.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/index.blade.php index 10c2ee615..fdd5002b9 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/index.blade.php @@ -18,9 +18,15 @@ + {!! view_render_event('bagisto.admin.catalog.categories.list.before') !!} +
- @inject('categories','Webkul\Admin\DataGrids\CategoryDataGrid') - {!! $categories->render() !!} + + {!! app('Webkul\Admin\DataGrids\CategoryDataGrid')->render() !!} +
+ + {!! view_render_event('bagisto.admin.catalog.categories.list.after') !!} + @stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php index dfce85cce..fa4baed62 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php @@ -29,9 +29,13 @@
@csrf() + {!! view_render_event('bagisto.admin.catalog.family.create_form_accordian.general.before') !!} +
+ {!! view_render_event('bagisto.admin.catalog.family.create_form_accordian.general.controls.before') !!} +
@@ -44,9 +48,16 @@ @{{ errors.first('name') }}
+ {!! view_render_event('bagisto.admin.catalog.family.create_form_accordian.general.controls.after') !!} +
+ {!! view_render_event('bagisto.admin.catalog.family.create_form_accordian.general.after') !!} + + + {!! view_render_event('bagisto.admin.catalog.family.create_form_accordian.groups.before') !!} +
@@ -54,9 +65,16 @@ {{ __('admin::app.catalog.families.add-group-title') }} + {!! view_render_event('bagisto.admin.catalog.family.create_form_accordian.groups.controls.before') !!} + + + {!! view_render_event('bagisto.admin.catalog.family.create_form_accordian.groups.controls.after') !!}
+ + {!! view_render_event('bagisto.admin.catalog.family.create_form_accordian.groups.after') !!} +
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php index b1c821cc4..7e94f2047 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php @@ -30,9 +30,13 @@ @csrf() + {!! view_render_event('bagisto.admin.catalog.family.edit_form_accordian.general.before', ['attributeFamily' => $attributeFamily]) !!} +
+ {!! view_render_event('bagisto.admin.catalog.family.edit_form_accordian.general.controls.before', ['attributeFamily' => $attributeFamily]) !!} +
@@ -45,19 +49,33 @@ @{{ errors.first('name') }}
+ {!! view_render_event('bagisto.admin.catalog.family.edit_form_accordian.general.controls.after', ['attributeFamily' => $attributeFamily]) !!} +
+ {!! view_render_event('bagisto.admin.catalog.family.edit_form_accordian.general.after', ['attributeFamily' => $attributeFamily]) !!} + + + {!! view_render_event('bagisto.admin.catalog.family.edit_form_accordian.groups.before', ['attributeFamily' => $attributeFamily]) !!} +
+ {!! view_render_event('bagisto.admin.catalog.family.edit_form_accordian.groups.controls.before', ['attributeFamily' => $attributeFamily]) !!} + + + {!! view_render_event('bagisto.admin.catalog.family.edit_form_accordian.groups.controls.before', ['attributeFamily' => $attributeFamily]) !!} +
+ + {!! view_render_event('bagisto.admin.catalog.family.edit_form_accordian.groups.after', ['attributeFamily' => $attributeFamily]) !!} diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/families/index.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/families/index.blade.php index 0e8772400..a377e19db 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/families/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/families/index.blade.php @@ -18,9 +18,15 @@ + {!! view_render_event('bagisto.admin.catalog.families.list.before') !!} +
- @inject('attributefamily','Webkul\Admin\DataGrids\AttributeFamilyDataGrid') - {!! $attributefamily->render() !!} + + {!! app('Webkul\Admin\DataGrids\AttributeFamilyDataGrid')->render() !!} +
+ + {!! view_render_event('bagisto.admin.catalog.families.list.after') !!} + @stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/categories.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/categories.blade.php index 6fd7125a0..3b2099179 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/categories.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/categories.blade.php @@ -1,9 +1,13 @@ @if ($categories->count()) - +
+ {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.categories.controls.before', ['product' => $product]) !!} + + {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.categories.controls.after', ['product' => $product]) !!} +
@endif \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/images.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/images.blade.php index 3618561d6..3ab8d317b 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/images.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/images.blade.php @@ -1,8 +1,11 @@ - +
- + {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.images.controls.before', ['product' => $product]) !!} + + {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.images.controls.after', ['product' => $product]) !!} +
\ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/inventories.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/inventories.blade.php index 7df94fd68..6155c18bb 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/inventories.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/inventories.blade.php @@ -1,7 +1,9 @@ @if ($product->type != 'configurable') - +
+ {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.inventories.controls.before', ['product' => $product]) !!} + @foreach ($inventorySources as $inventorySource) $product]) !!} +
@endif \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/product-links.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/product-links.blade.php index 0500d7161..eb4c0b5d8 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/product-links.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/product-links.blade.php @@ -1,4 +1,4 @@ - +
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php index ec3ed0ff5..c42518e12 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php @@ -18,15 +18,19 @@ @stop - +
+ {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.variations.controls.before', ['product' => $product]) !!} + + {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.variations.controls.after', ['product' => $product]) !!} +
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php index ca795f00c..3eb371183 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php @@ -45,9 +45,13 @@ input('family') ?> input('sku') ?> + {!! view_render_event('bagisto.admin.catalog.product.create_form_accordian.general.before') !!} +
+ {!! view_render_event('bagisto.admin.catalog.product.create_form_accordian.general.controls.before') !!} +
@foreach ($product->attribute_family->attribute_groups as $attributeGroup) + @if (count($attributeGroup->custom_attributes)) + + {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.' . $attributeGroup->name . '.before', ['product' => $product]) !!} +
+ {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.' . $attributeGroup->name . '.controls.before', ['product' => $product]) !!} @foreach ($attributeGroup->custom_attributes as $attribute) @@ -126,24 +133,50 @@ @endforeach + {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.' . $attributeGroup->name . '.controls.after', ['product' => $product]) !!}
+ + {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.' . $attributeGroup->name . '.after', ['product' => $product]) !!} + @endif + @endforeach - @if ($form_accordians) - @foreach ($form_accordians->items as $accordian) + {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.inventories.before', ['product' => $product]) !!} - @include ($accordian['view']) + @include ('admin::catalog.products.accordians.inventories') - @endforeach + {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.inventories.after', ['product' => $product]) !!} - @endif + + {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.images.before', ['product' => $product]) !!} + + @include ('admin::catalog.products.accordians.images') + + {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.images.after', ['product' => $product]) !!} + + + + {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.categories.before', ['product' => $product]) !!} + + @include ('admin::catalog.products.accordians.categories') + + {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.categories.after', ['product' => $product]) !!} + + + {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.variations.before', ['product' => $product]) !!} + + @include ('admin::catalog.products.accordians.variations') + + {!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.variations.after', ['product' => $product]) !!}
+ + {!! view_render_event('bagisto.admin.catalog.product.edit.after', ['product' => $product]) !!}
@stop diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php index 639eb9ccd..68b38f13c 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php @@ -18,6 +18,8 @@
+ {!! view_render_event('bagisto.admin.catalog.products.list.before') !!} +
{{-- @inject('product','Webkul\Admin\DataGrids\ProductDataGrid') {!! $product->render() !!} --}} @@ -25,5 +27,8 @@ @inject('products', 'Webkul\Admin\DataGrids\ProductDataGrid') {!! $products->render() !!}
+ + {!! view_render_event('bagisto.admin.catalog.products.list.after') !!} + @stop \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php index 550e4739e..b9fc8113f 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php @@ -13,7 +13,7 @@ @if ($enableMultiAddress)
-
+

{{ __('shop::app.checkout.onepage.billing-address') }}