+
+
- @include('shop::customers.account.partials.sidemenu')
-
-
@endsection
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
index 6ad256cd7..377708b66 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
@@ -1,19 +1,12 @@
-@extends('shop::layouts.master')
+@extends('shop::customers.account.index')
@section('page_title')
{{ __('shop::app.customer.account.profile.index.title') }}
@endsection
-@section('content-wrapper')
-
-
-
-
+ {!! view_render_event('bagisto.shop.customers.account.profile.edit.before', ['customer' => $customer]) !!}
+
+
+
+ {!! view_render_event('bagisto.shop.customers.account.profile.edit.after', ['customer' => $customer]) !!}
-
-
- {{ __('shop::app.customer.account.profile.edit-profile.title') }}
-
-
-
-
- {!! view_render_event('bagisto.shop.customers.account.profile.edit.before', ['customer' => $customer]) !!}
-
-
-
- {!! view_render_event('bagisto.shop.customers.account.profile.edit.after', ['customer' => $customer]) !!}
+ {{ __('shop::app.customer.account.profile.edit-profile.title') }}
+
-
- @include('shop::customers.account.partials.sidemenu')
-
+@section('account-content')
-
- {!! view_render_event(
- 'bagisto.shop.customers.account.profile.view.table.before', ['customer' => $customer])
- !!}
+ {!! view_render_event('bagisto.shop.customers.account.profile.view.table.before', ['customer' => $customer]) !!}
+
-
@@ -110,5 +91,4 @@
{!! view_render_event('bagisto.shop.customers.account.profile.view.after', ['customer' => $customer]) !!}
-
@endsection
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
index 4f04c8f2f..6312cc1ce 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
@@ -1,95 +1,92 @@
-@extends('shop::layouts.master')
+@extends('shop::customers.account.index')
@section('page_title')
{{ __('shop::app.customer.account.review.index.page-title') }}
@endsection
-@section('content-wrapper')
-
-
{{ __('shop::app.customer.account.profile.index.title') }}
@@ -25,14 +18,13 @@
- {!! view_render_event('bagisto.shop.customers.account.profile.view.before', ['customer' => $customer]) !!}
+ {!! view_render_event('bagisto.shop.customers.account.profile.view.before', ['customer' => $customer]) !!}
| {{ __('shop::app.customer.account.profile.fname') }} | {{ $customer->first_name }} | @@ -65,22 +57,11 @@{{ __('shop::app.customer.account.profile.email') }} | {{ $customer->email }} |
| {{ __('shop::app.footer.subscribe-newsletter') }} | -- {{ __('shop::app.subscription.unsubscribe') }} - | -
- @include('shop::customers.account.partials.sidemenu')
+@section('account-content')
+
+
+
-
+ {{ __('shop::app.customer.account.review.index.title') }}
-
+ {!! view_render_event('bagisto.shop.customers.account.reviews.list.before', ['reviews' => $reviews]) !!}
- {!! view_render_event('bagisto.shop.customers.account.reviews.list.before', ['reviews' => $reviews]) !!}
+
-
+ @if (count($reviews) > 1)
+
-
-
-
+
- @if (count($reviews) > 1)
-
+ @endif
-
- {{ __('shop::app.customer.account.review.delete-all.title') }}
-
-
- @endif
+
+
+
+
+ @if (! $reviews->isEmpty())
+ @foreach ($reviews as $review)
+
+
+ @php $image = productimage()->getProductBaseImage($review->product); @endphp
-
- @if (! $reviews->isEmpty())
- @foreach ($reviews as $review)
-
@endsection
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/reviews.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/reviews.blade.php
index b97c9e3bf..710b92a94 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/reviews.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/reviews.blade.php
@@ -1,22 +1,19 @@
-@extends('shop::layouts.master')
+@extends('shop::customers.account.index')
@section('page_title')
{{ __('shop::app.customer.account.review.view.page-title') }}
@endsection
-@section('content-wrapper')
-
-
+
+ {!! view_render_event('bagisto.shop.customers.account.reviews.list.after', ['reviews' => $reviews]) !!}
- getProductBaseImage($review->product); ?>
-
- 
-
+
+
+
-
+
+ @endforeach
- {!! view_render_event('bagisto.shop.customers.account.reviews.list.after', ['reviews' => $reviews]) !!}
+
+ @else
+
-
-
-
-
- @endforeach
+
- @for($i=0 ; $i < $review->rating ; $i++)
-
- @endfor
-
-
-
- {{ $review->comment }}
-
+
-
+
-
- @else
-
- {{ __('customer::app.reviews.empty') }}
-
- @endif
-
+ {{ __('customer::app.reviews.empty') }}
+
+ @endif
- @include('shop::customers.account.partials.sidemenu')
+@section('account-content')
+
+
@endsection
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
index ac855d0d0..542cbc3dd 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
@@ -1,111 +1,104 @@
-@extends('shop::layouts.master')
+@extends('shop::customers.account.index')
@section('page_title')
{{ __('shop::app.customer.account.wishlist.page-title') }}
@endsection
-@section('content-wrapper')
-
+ Reviews
+
+
-
-
- Reviews
-
-
-
-
- @if (count($reviews))
- @foreach ($reviews as $review)
+
+ @endforeach
+ @else
+
+ @if (count($reviews))
+ @foreach ($reviews as $review)
+
- @endforeach
- @else
-
getGalleryImages($review->product); ?>
@@ -37,14 +34,14 @@
- {{ __('customer::app.reviews.empty') }}
-
- @endif
-
+ {{ __('customer::app.reviews.empty') }}
+
+ @endif
- @include('shop::customers.account.partials.sidemenu')
+@section('account-content')
+ @inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
- @inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
+
+
+ {{ __('shop::app.customer.account.wishlist.title') }}
-
+ @if (count($items))
+
+
+
- @endif
+ {!! view_render_event('bagisto.shop.customers.account.wishlist.list.before', ['wishlist' => $items]) !!}
-
-
+ @if ($items->count())
+ @foreach ($items as $item)
+
+
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
new file mode 100644
index 000000000..0f681ede7
--- /dev/null
+++ b/routes/breadcrumbs.php
@@ -0,0 +1,90 @@
+push(trans('shop::app.customer.account.profile.index.title'), route('customer.profile.index'));
+});
+
+Breadcrumbs::for('customer.profile.edit', function (BreadcrumbTrail $trail) {
+ $trail->parent('customer.profile.index');
+
+ $trail->push(trans('velocity::app.shop.general.update'), route('customer.profile.edit'));
+});
+
+/**
+ * Order routes.
+ */
+Breadcrumbs::for('customer.orders.index', function (BreadcrumbTrail $trail) {
+ $trail->parent('customer.profile.index');
+
+ $trail->push(trans('shop::app.customer.account.order.index.page-title'), route('customer.orders.index'));
+});
+
+Breadcrumbs::for('customer.orders.view', function (BreadcrumbTrail $trail, $id) {
+ $trail->parent('customer.orders.index');
+
+ $trail->push(trans('velocity::app.shop.general.view'), route('customer.orders.view', $id));
+});
+
+/**
+ * Downloadable products.
+ */
+Breadcrumbs::for('customer.downloadable_products.index', function (BreadcrumbTrail $trail) {
+ $trail->parent('customer.profile.index');
+
+ $trail->push(trans('shop::app.customer.account.downloadable_products.title'), route('customer.downloadable_products.index'));
+});
+
+/**
+ * Wishlists.
+ */
+Breadcrumbs::for('customer.wishlist.index', function (BreadcrumbTrail $trail) {
+ $trail->parent('customer.profile.index');
+
+ $trail->push(trans('shop::app.customer.account.wishlist.page-title'), route('customer.wishlist.index'));
+});
+
+/**
+ * Compare.
+ */
+Breadcrumbs::for('velocity.customer.product.compare', function (BreadcrumbTrail $trail) {
+ $trail->parent('customer.profile.index');
+
+ $trail->push(trans('velocity::app.customer.compare.compare_similar_items'), route('velocity.customer.product.compare'));
+});
+
+/**
+ * Reviews.
+ */
+Breadcrumbs::for('customer.reviews.index', function (BreadcrumbTrail $trail) {
+ $trail->parent('customer.profile.index');
+
+ $trail->push(trans('shop::app.customer.account.review.index.page-title'), route('customer.reviews.index'));
+});
+
+/**
+ * Addresses.
+ */
+Breadcrumbs::for('customer.address.index', function (BreadcrumbTrail $trail) {
+ $trail->parent('customer.profile.index');
+
+ $trail->push(trans('shop::app.customer.account.address.index.page-title'), route('customer.address.index'));
+});
+
+Breadcrumbs::for('customer.address.create', function (BreadcrumbTrail $trail) {
+ $trail->parent('customer.address.index');
+
+ $trail->push(trans('shop::app.customer.account.address.create.page-title'), route('customer.address.create'));
+});
+
+Breadcrumbs::for('customer.address.edit', function (BreadcrumbTrail $trail, $id) {
+ $trail->parent('customer.address.index');
+
+ $trail->push(trans('shop::app.customer.account.address.edit.page-title'), route('customer.address.edit', $id));
+});
\ No newline at end of file
+ @php
+ $image = $item->product->getTypeInstance()->getBaseImage($item);
+ @endphp
- {!! view_render_event('bagisto.shop.customers.account.wishlist.list.before', ['wishlist' => $items]) !!}
+
-
+
@endsection
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/index.blade.php
index daf4729a4..cfce697bf 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/index.blade.php
@@ -7,6 +7,8 @@
+
+
+ {!! view_render_event('bagisto.shop.customers.account.wishlist.list.after', ['wishlist' => $items]) !!}
+ {{ $item->product->name }}
- @if ($items->count())
- @foreach ($items as $item)
-
- {!! view_render_event('bagisto.shop.customers.account.wishlist.list.after', ['wishlist' => $items]) !!}
+
+ @endforeach
+
+ @else
+
-
-
- @endforeach
+
- @php
- $image = $item->product->getTypeInstance()->getBaseImage($item);
- @endphp
+ @if (isset($item->additional['attributes']))
+
-
-
+ @foreach ($item->additional['attributes'] as $attribute)
+ {{ $attribute['attribute_name'] }} : {{ $attribute['option_label'] }}
+ @endforeach
-
-
-
+ @endif
- {{ $item->product->name }}
-
- @if (isset($item->additional['attributes']))
-
- @endif
-
-
-
- @for ($i = 1; $i <= $reviewHelper->getAverageRating($item->product); $i++)
-
- @endfor
-
+
-
-
-
-
-
-
-
- {{ __('shop::app.customer.account.wishlist.move-to-cart') }}
-
+
+ @for ($i = 1; $i <= $reviewHelper->getAverageRating($item->product); $i++)
+
+ @endfor
+
+
- @else
-
- {{ __('customer::app.wishlist.empty') }}
-
- @endif
-
+ {{ __('customer::app.wishlist.empty') }}
+
+ @endif
+ {{ Breadcrumbs::render() }}
+
@yield('page-detail-wrapper')