From ca39b84d0b61da80e73b7f9ef5cde6a0c04d61cd Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Mon, 4 Mar 2019 10:11:24 +0530 Subject: [PATCH] upsell product --- .../accordians/product-links.blade.php | 74 ++++++++++++++++++- .../views/catalog/products/edit.blade.php | 12 +-- .../Resources/views/layouts/master.blade.php | 2 +- .../Http/Controllers/ProductController.php | 4 +- 4 files changed, 83 insertions(+), 9 deletions(-) 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 eb4c0b5d8..cd49d7862 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,6 +1,76 @@
- + +
-
\ No newline at end of file + + + +@push('scripts') + + + + +@endpush \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php index f98739d04..19a405048 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php @@ -62,7 +62,7 @@ @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]) !!} @@ -154,24 +154,26 @@ {!! 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]) !!} + @include ('admin::catalog.products.accordians.product-links') + 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 4ec5052f2..78cf1d7ff 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php @@ -19,7 +19,7 @@ - getLocale() == 'ar') class="rtl" @endif style="scroll-behavior: smooth;"> + getLocale() == 'ar') @endif style="scroll-behavior: smooth;"> {!! view_render_event('bagisto.admin.layout.body.before') !!}
diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php index 70d6c205e..7319f3503 100755 --- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php +++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php @@ -173,7 +173,9 @@ class ProductController extends Controller $inventorySources = $this->inventorySource->all(); - return view($this->_config['view'], compact('product', 'categories', 'inventorySources')); + $allProducts = $this->productGrid->all(); + + return view($this->_config['view'], compact('product', 'categories', 'inventorySources', 'allProducts')); } /**