Merge pull request #2429 from shubhwebkul/velocity-updated

minor bug fixes
This commit is contained in:
Jitendra Singh 2020-02-11 18:33:57 +05:30 committed by GitHub
commit 13a5b3a116
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions

View File

@ -14,12 +14,12 @@
$subMenuCollection = [];
try {
$subMenuCollection['profile'] = $menuItem['children']['profile'];
$subMenuCollection['orders'] = $menuItem['children']['orders'];
$subMenuCollection['downloadables'] = $menuItem['children']['downloadables'];
$subMenuCollection['wishlist'] = $menuItem['children']['wishlist'];
$subMenuCollection['reviews'] = $menuItem['children']['reviews'];
$subMenuCollection['address'] = $menuItem['children']['address'];
$subMenuCollection['profile'] = $menuItem['children']['profile'];
} catch (\Exception $exception) {
$subMenuCollection = $menuItem['children'];
}

View File

@ -21,13 +21,16 @@
@if (! empty($sliderData))
@foreach ($sliderData as $index => $slider)
@php
$textContent = str_replace("\r\n", '', $slider['content']);
@endphp
<slide slot="slide-{{ $index }}">
<a @if($slider['slider_path']) href="{{ $slider['slider_path'] }}" @endif>
<img
class="col-12 no-padding banner-icon"
src="{{ url()->to('/') . '/storage/' . $slider['path'] }}" />
<div class="show-content" v-html="'{{ $slider['content'] }}'">
<div class="show-content" v-html="'{{ $textContent }}'">
</div>
</a>
</slide>

View File

@ -74,6 +74,10 @@
</div>
<ul type="none">
<li>
<a href="{{ route('customer.profile.index') }}" class="unset">{{ __('shop::app.header.profile') }}</a>
</li>
<li>
<a href="{{ route('customer.orders.index') }}" class="unset">{{ __('velocity::app.shop.general.orders') }}</a>
</li>
@ -82,10 +86,6 @@
<a href="{{ route('customer.wishlist.index') }}" class="unset">{{ __('shop::app.header.wishlist') }}</a>
</li>
<li>
<a href="{{ route('customer.profile.index') }}" class="unset">{{ __('shop::app.header.profile') }}</a>
</li>
<li>
<a href="{{ route('customer.session.destroy') }}" class="unset">{{ __('shop::app.header.logout') }}</a>
</li>