From 212853d6c855ab931eaaa6de146915bb8e1c4181 Mon Sep 17 00:00:00 2001
From: Shubham Mehrotra <shubh0896m@gmail.com>
Date: Fri, 26 Jun 2020 15:10:02 +0530
Subject: [PATCH] #3356

---
 .../views/layouts/header/index.blade.php      | 25 ++++++++++++-------
 .../Resources/views/search/search.blade.php   |  6 ++---
 .../views/shop/search/search.blade.php        | 16 ++++++------
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
index 9b4bfe04d..889fec10e 100755
--- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
@@ -1,3 +1,11 @@
+<?php
+    $term = request()->input('term');
+
+    if (! is_null($term)) {
+        $serachQuery = 'term='.request()->input('term');
+    }
+?>
+
 <div class="header" id="header">
     <div class="header-top">
         <div class="left-content">
@@ -16,7 +24,14 @@
             <ul class="search-container">
                 <li class="search-group">
                     <form role="search" action="{{ route('shop.search.index') }}" method="GET" style="display: inherit;">
-                        <input type="search" name="term" class="search-field" placeholder="{{ __('shop::app.header.search-text') }}" required>
+                        <input
+                            required
+                            name="term"
+                            type="search"
+                            value="{{ $term }}"
+                            class="search-field"
+                            placeholder="{{ __('shop::app.header.search-text') }}"
+                        >
 
                         <image-search-component></image-search-component>
 
@@ -31,14 +46,6 @@
             </ul>
         </div>
 
-        <?php
-            $term = request()->input('term');
-
-            if (! is_null($term)) {
-                $serachQuery = 'term='.request()->input('term');
-            }
-        ?>
-
         <div class="right-content">
 
             <span class="search-box"><span class="icon icon-search" id="search"></span></span>
diff --git a/packages/Webkul/Shop/src/Resources/views/search/search.blade.php b/packages/Webkul/Shop/src/Resources/views/search/search.blade.php
index 71c2e61aa..45c9f3758 100755
--- a/packages/Webkul/Shop/src/Resources/views/search/search.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/search/search.blade.php
@@ -79,9 +79,9 @@
             },
 
             created: function() {
-                this.searched_terms = localStorage.searched_terms.split('_');
-
-                console.log(this.searched_terms)
+                if (localStorage.searched_terms && localStorage.searched_terms != '') {
+                    this.searched_terms = localStorage.searched_terms.split('_');
+                }
             }
         });
     </script>
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
index e0d2866b9..b8d29b643 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
@@ -118,14 +118,16 @@
             },
 
             created: function() {
-                this.searched_terms = localStorage.searched_terms.split('_');
+                if (localStorage.searched_terms && localStorage.searched_terms != '') {
+                    this.searched_terms = localStorage.searched_terms.split('_');
 
-                this.searched_terms = this.searched_terms.map(term => {
-                    return {
-                        name: term,
-                        slug: term.split(' ').join('+'),
-                    }
-                });
+                    this.searched_terms = this.searched_terms.map(term => {
+                        return {
+                            name: term,
+                            slug: term.split(' ').join('+'),
+                        }
+                    });
+                }
             }
         });
     </script>