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

search and misc. issues

This commit is contained in:
shubhammehrotra.symfony@webkul.com 2019-12-31 11:25:28 +05:30
parent 33fdf0d24c
commit a43996f65a
11 changed files with 93 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Shop/src/Http/Controllers/SearchController.php
View File

@ -41,8 +41,8 @@ use Webkul\Product\Repositories\SearchRepository;
/**
* Index to handle the view loaded with the search results
*
* @return \Illuminate\View\View
*
* @return \Illuminate\View\View
*/
public function index()
{

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

@ -1496,13 +1496,18 @@
right: 15px !important;
top: 50px !important;
z-index: 100 !important;
font-size: 14px !important;
font-size: 16px !important;
position: fixed !important;
max-width: 400px !important;
min-height: 40px !important;
min-height: 45px !important;
max-height: 100px !important;
}
.alert.alert-dismissible .close {
font-size: 23px;
padding: .3rem 1.25rem;
}
#home-right-bar-container.col-12 .category-container {
padding: 30px 0;
}
@ -1721,7 +1726,6 @@
}
.product-price .sticker {
display: none;
top: 0;
left: 0;
border: none;
@ -1930,8 +1934,8 @@ header #search-form > *:focus {
font-size: 14px;
}
.container-fluid > .row:first-child {
margin-bottom: 20px;
.container > .container-fluid {
margin-bottom: 60px;
}
/* advertisement-one */
@ -2617,7 +2621,7 @@ body::after {
padding-left: 40px !important;
}
.pr0 {
.pr0, .container > .container-fluid > .row {
padding-right: 0px !important;
}
@ -2710,7 +2714,7 @@ body::after {
}
.ml15, .advertisement-two-container .ad-2-rt {
margin-left: 15px;
margin-left: 15px !important;
}
.body-blur {
@ -3360,6 +3364,10 @@ button[disabled] {
font-size: 16px;
}
.product-detail .right .product-price .sticker {
display: none;
}
.product-detail .thumb-list {
left: 15px;
z-index: 1000;

38
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

@ -36724,24 +36724,28 @@ var render = function() {
"div",
{ class: "row " + (_vm.isEnabled == "0" ? "disabled" : "") },
[
_c("div", { staticClass: "main-category fs20 pt10 col-2 pl30" }, [
_c("i", {
class:
"rango-view-list " +
(_vm.isEnabled == "0" ? "" : "cursor-pointer") +
" align-vertical-top",
on: {
click: function($event) {
_vm.isEnabled == "0" ? "" : _vm.toggleSidebar()
_c(
"div",
{ staticClass: "main-category fs20 pt10 col-2 pl30 unselectable" },
[
_c("i", {
class:
"rango-view-list " +
(_vm.isEnabled == "0" ? "" : "cursor-pointer") +
" align-vertical-top",
on: {
click: function($event) {
_vm.isEnabled == "0" ? "" : _vm.toggleSidebar()
}
}
}
}),
_vm._v(" "),
_c("span", {
staticClass: "text-up",
domProps: { textContent: _vm._s(_vm.heading) }
})
]),
}),
_vm._v(" "),
_c("span", {
staticClass: "text-up",
domProps: { textContent: _vm._s(_vm.heading) }
})
]
),
_vm._v(" "),
_c("div", { staticClass: "content-list row no-margin col-10" }, [
_c(

10
packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
View File

@ -48,14 +48,18 @@ class ConfigurationController extends Controller
public function storeMetaData($id)
{
if (! request()->get('slider')) {
if (request()->get('slides') == "on") {
$params = request()->all() + [
'slider' => 1
];
} else {
$params = request()->all() + [
'slider' => 0
];
} else {
$params = request()->all();
}
unset($params['slides']);
$product = $this->velocityMetaDataRepository->update($params, $id);
session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Velocity Theme']));

2
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue
View File

@ -1,7 +1,7 @@
<template>
<div :class="`row ${isEnabled == '0' ? 'disabled' : ''}`">
<div
class="main-category fs20 pt10 col-2 pl30">
class="main-category fs20 pt10 col-2 pl30 unselectable">
<i
:class="`rango-view-list ${isEnabled == '0' ? '' : 'cursor-pointer'} align-vertical-top`"
@click="(isEnabled == '0') ? '' : toggleSidebar()">

12
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -783,11 +783,18 @@
right: 15px !important;
top: 50px !important;
z-index: 100 !important;
font-size: 14px !important;
font-size: 16px !important;
position: fixed !important;
max-width: 400px !important;
min-height: 40px !important;
min-height: 45px !important;
max-height: 100px !important;
&.alert-dismissible {
.close {
font-size: 23px;
padding: .3rem 1.25rem;
}
}
}
#home-right-bar-container {
@ -1016,7 +1023,6 @@
.product-price {
.sticker {
display: none;
top: 0;
left: 0;
border: none;

10
packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss vendored
View File

@ -187,8 +187,14 @@ header #search-form > *:focus {
font-size: 14px;
}
.container-fluid > .row:first-child() {
margin-bottom: 20px;
.container {
> .container-fluid {
margin-bottom: 60px;
> .row {
@extend .pr0;
}
}
}
/* advertisement-one */

6
packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss vendored
View File

@ -294,6 +294,12 @@
}
}
}
.product-price {
.sticker {
display: none;
}
}
}
.thumb-list {

12
packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
View File

@ -13,9 +13,9 @@
</div>
<form
action="{{ route('velocity.admin.store.meta-data', ['id' => $metaData->id]) }}"
method="POST"
@submit.prevent="onSubmit">
@submit.prevent="onSubmit"
action="{{ route('velocity.admin.store.meta-data', ['id' => $metaData->id]) }}">
@csrf
@ -28,11 +28,11 @@
<input
type="checkbox"
class="control"
id="slider"
name="slider"
id="slides"
name="slides"
data-vv-as="&quot;slides&quot;"
{{ $metaData->slider ? 'checked' : ''}}
value="{{ $metaData->slider }}" />
{{ $metaData->slider ? 'checked' : ''}} />
<span class="slider round"></span>
</label>
</div>

2
packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-one.blade.php
View File

@ -1,6 +1,6 @@
<div class="container-fluid advertisement-one no-padding">
<div class="row">
<div class="row col-12">
<div class="col offers-lt-panel bg-image"></div>
<div class="col offers-ct-panel">

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

@ -5,38 +5,32 @@
@endsection
@section('content-wrapper')
@if (! $results)
{{ __('shop::app.search.no-results') }}
@endif
@if ($results)
<div class="main mb-30" style="min-height: 27vh;">
<section class="cart-details row offset-1">
@if (! $results)
<h1 class="fw6 row col-12">{{ __('shop::app.search.no-results') }}</h1>
@else
@if ($results->isEmpty())
<div class="search-result-status">
<h2>{{ __('shop::app.products.whoops') }}</h2>
<span>{{ __('shop::app.search.no-results') }}</span>
</div>
<h1 class="fw6 row col-12">{{ __('shop::app.products.whoops') }}</h1>
<span>{{ __('shop::app.search.no-results') }}</span>
@else
@if ($results->total() == 1)
<div class="search-result-status mb-20">
<span><b>{{ $results->total() }} </b>{{ __('shop::app.search.found-result') }}</span>
</div>
<h2 class="fw6 row col-12 mb20">
{{ $results->total() }} {{ __('shop::app.search.found-result') }}
</h2>
@else
<div class="search-result-status mb-20">
<span><b>{{ $results->total() }} </b>{{ __('shop::app.search.found-results') }}</span>
</div>
<h2 class="fw6 row col-12 mb20">
{{ $results->total() }} {{ __('shop::app.search.found-results') }}
</h2>
@endif
<div class="product-grid-4">
@foreach ($results as $productFlat)
@foreach ($results as $productFlat)
@include('shop::products.list.card', ['product' => $productFlat->product])
@include('shop::products.list.card', ['product' => $productFlat->product])
@endforeach
</div>
@endforeach
@include('ui::datagrid.pagination')
@endif
</div>
@endif
@endif
</section>
@endsection