merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3336 from shubhwebkul/patch-1 

Issue #3301 resolved
This commit is contained in:
Jitendra Singh 2020-06-23 16:30:13 +05:30 committed by GitHub
parent 85aed162b2 e5eb0bef93
commit 3c7ac5cba7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Velocity/publishable/assets/css/velocity.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=ac80a6434bb67471e57f",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
"/css/velocity.css": "/css/velocity.css?id=0b6e54246b36551194f9"
"/css/velocity.css": "/css/velocity.css?id=fbfb578be18c6c21ec59"
}

4
packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php
View File

@ -110,7 +110,7 @@
type="search"
class="form-control"
placeholder="{{ __('velocity::app.header.search-text') }}"
:value="unescape(searchedQuery.term) ? unescape(searchedQuery.term.split('+').join(' ')) : ''" />
:value="searchedQuery.term ? searchedQuery.term.split('+').join(' ') : ''" />
<image-search-component></image-search-component>
@ -404,7 +404,7 @@
localStorage.searchedImageUrl = self.uploadedImageUrl;
queryString = localStorage.searched_terms = analysedResult.join('_');
self.$root.hideLoader();
window.location.href = "{{ route('shop.search.index') }}" + '?term=' + queryString + '&image-search=1';

16
packages/Webkul/Velocity/src/Resources/views/shop/search/search.blade.php
View File

@ -17,7 +17,10 @@
@endpush
@section('content-wrapper')
<div class="container category-page-wrapper">
<div
style="padding-left: 50px !important;"
class="container category-page-wrapper"
>
<section class="search-container row category-container">
@if (request('image-search'))
<image-search-result-component></image-search-result-component>
@ -81,8 +84,8 @@
</h3>
<div class="term-list">
<a v-for="term in searched_terms" :href="'{{ route('shop.search.index') }}?term=' + term">
@{{ term }}
<a v-for="term in searched_terms" :href="'{{ route('shop.search.index') }}?term=' + term.slug">
@{{ term.name }}
</a>
</div>
</div>
@ -102,6 +105,13 @@
created: function() {
this.searched_terms = localStorage.searched_terms.split('_');
this.searched_terms = this.searched_terms.map(term => {
return {
name: term,
slug: term.split(' ').join('+'),
}
});
}
});
</script>