From 4323637bf91558c02d375cab57e3bfbabe1180d8 Mon Sep 17 00:00:00 2001
From: "shubhammehrotra.symfony@webkul.com"
 <shubhammehrotra.symfony@webkul.com>
Date: Tue, 11 Feb 2020 18:15:06 +0530
Subject: [PATCH] minor bugs

---
 .../shop/customers/account/partials/sidemenu.blade.php    | 2 +-
 .../src/Resources/views/shop/home/slider.blade.php        | 5 ++++-
 .../views/shop/layouts/top-nav/login-section.blade.php    | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/partials/sidemenu.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/partials/sidemenu.blade.php
index 33e6487ea..26a0e612a 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/partials/sidemenu.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/partials/sidemenu.blade.php
@@ -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'];
                 }
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/home/slider.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/home/slider.blade.php
index 8e4de3055..cee9a1cb6 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/home/slider.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/home/slider.blade.php
@@ -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>
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/login-section.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/login-section.blade.php
index 6b2968ded..b9a7209c6 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/login-section.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/login-section.blade.php
@@ -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>