Skip to content

S
store-locator
Commit 6c499864 by Ajay Barthwal
Options

Merge branch 'develop' into 'master' 

Develop

See merge request !5
parents a93b6e0a 2a26d8db
Showing with 44 additions and 53 deletions
application/app/Http/Controllers/SearchController.php
......@@ -3,7 +3,6 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Homepage;
use App\Helpers\Apihelpers;
use App\Traits\Apitraits;
use App\Locater;
......@@ -100,8 +99,9 @@ class SearchController extends Controller
}
$locality = $request->locality;
$ratingOrder = $request->ratingOrder;
$html = view('frontend.searchs.location_element', compact('finalData', 'links', 'meta', 'locality'))->render();
$html = view('frontend.searchs.location_element', compact('finalData', 'links', 'meta', 'locality', 'ratingOrder'))->render();
return ['status' => 'success', 'data' => $html];
}
......@@ -121,8 +121,7 @@ class SearchController extends Controller
$api_url = config('app.api_location');
$locationDetailAPIdata = $this->call_api($api_url,$locatorID);
$homepage = Homepage::where('homepages.status', '=', '1')->first();
return view('frontend.searchs.detail', compact('homepage','locatorID','locationDetailAPIdata','pageData'));
return view('frontend.searchs.detail', compact('locatorID','locationDetailAPIdata','pageData'));
}
......@@ -132,59 +131,40 @@ class SearchController extends Controller
$api_url = config('app.api_search');
$locationDetailAPIdata = $this->call_api_page($api_url,$request['query']);
if(empty($locationDetailAPIdata['data'])){
$html = view('frontend.searchs.autocomplete', compact('locationDetailAPIdata'))->render();
return response()->json([
'status' => 'error',
'data' => $html
]);
}else{
$html = view('frontend.searchs.autocomplete', compact('locationDetailAPIdata'))->render();
return response()->json([
$html = view('frontend.searchs.autocomplete', compact('locationDetailAPIdata'))->render();
return [
'status' => 'success',
'data' => $html
]);
}
];
}
/**
* For render Review ajax
* */
public function reviewpaginate(Request $request)
public function reviewPaginate(Request $request)
{
$api_url = config('app.api');
$reviewData = $this->review_api_detail($api_url,$request->locatorID,$request->page);
$reviewData = $this->review_api_detail($api_url, $request->locatorID, $request->page);
if ( count($reviewData['data']) < 1 ) return '';
return view('frontend.searchs.review_element', compact('reviewData'));
}
public function getCityValue(Request $request)
{
$getCityData = City::where('cities.name', '!=', '')->where('cities.parent_id', '=', $request->state)->pluck('name','id')->toarray();
$getCityData = City::where('cities.name', '!=', '')
->where('cities.parent_id', '=', $request->state)
->where('cities.is_deleted', '=', '0')
->where('cities.status', '=', '1')
->pluck('name','id')->toarray();
if(!empty($getCityData)){
$html = view('frontend.searchs.city_dropdown', compact('getCityData'))->render();
return response()->json([
'status' => 'success',
'data' => $html
]);
}else{
$html = view('frontend.searchs.city_dropdown', compact('getCityData'))->render();
return response()->json(['status' => 'error', 'data' => $html]);
}
$html = view('frontend.searchs.city_dropdown', compact('getCityData'))->render();
return [
'status' => 'success',
'data' => $html
];
}
}
application/resources/views/frontend/searchs/index.blade.php
......@@ -99,21 +99,17 @@
var location = $('.location').val();
var state = $('.getStateValue option:selected').attr('state');
var city = $('.getCityValue').val();
var ratingOrder = $(this).data('rating');
var ratingOrder = $('.ratingDropDown').val();
e.preventDefault();
$.ajax({
type: 'post',
url: "{{route('searchlocater')}}",
data: {"_token": "{{ csrf_token() }}", locality:locality, location:location, state:state,city:city,ratingOrder:ratingOrder},
success: function (datanew) {
if(datanew.status == 'success') {
//PRELOADER
loader();
$('#searchlocaterid').html(datanew.data);
} else {
loader();
$('#searchlocaterid').html(datanew.data);
}
$(".locality").val(locality);
$(".ratingDropDown").val(ratingOrder).attr("selected", "selected");
}
});
});
......@@ -126,18 +122,18 @@
var state = $('.getStateValue option:selected').attr('state');
var city = $('.getCityValue').val();
var location = $('.location').val();
var ratingOrder = $(this).data('rating');
paginate(page, locality, state, city, location);
var ratingOrder = $('.ratingDropDown').val();
paginate(page, locality, state, city, location, ratingOrder);
});
$("#searchlocaterid").on('click','.ratingDropDown a',function () {
$("#searchlocaterid").on('change','.ratingDropDown',function () {
var page = $(this).data('page');
var locality = $('.locality').val();
var state = $('.getStateValue option:selected').attr('state');
var city = $('.getCityValue').val();
var location = $('.location').val();
var ratingOrder = $(this).data('rating');
var ratingOrder = $('.ratingDropDown').val();
paginate(page, locality, state, city, location, ratingOrder);
});
......@@ -150,6 +146,8 @@
loader();
$('#searchlocaterid').html(datanew.data);
$(".locality").val(locality);
$(".ratingDropDown").val(ratingOrder).attr("selected", "selected");
}
});
}
......
application/resources/views/frontend/searchs/location_element.blade.php
......@@ -17,15 +17,24 @@
{{ $meta['total'] }} locations found</span>
</div>
<div class="col-6 text-right">
<div class="dropdown">
<div class="select">
<select name="state" class="form-control ratingDropDown">
<option value="">Sort By</option>
<?php $rating = array('desc'=>'Highest rating', 'asc'=>'Lowest rating') ?>
@foreach($rating as $key => $option)
<option data-rating="<?php echo $key; ?>" value="<?php echo $key; ?>"><?php echo $option; ?></option>
@endforeach
</select>
</div>
<!--<div class="dropdown">
<div class="btn btn-secondary dropdown-toggle custom-dropdown" id="reviewbyfilter" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Sort By
</div>
<div class="dropdown-menu ratingDropDown" aria-labelledby="reviewbyfilter">
<a class="dropdown-item" href="javascript:void(0);" data-rating="desc">Highest rating</a>
<a class="dropdown-item" href="javascript:void(0);" data-rating="asc">Lowest rating</a>
<a class="dropdown-item ratingHigest" href="javascript:void(0);" data-rating="desc">Highest rating</a>
<a class="dropdown-item ratingLowest" href="javascript:void(0);" data-rating="asc">Lowest rating</a>
</div>
</div>
</div>-->
</div>
</div>
<!--location listing start-->
......@@ -35,7 +44,11 @@
<div class="card">
<div class="card-body">
<div class="location_data-img">
@if(!empty($data['media'][0]['thumbnailUrl']))
<img src="{{$data['media'][0]['thumbnailUrl']}}" />
@else
<img src="vendor/frontend/img/location-img.png" />
@endif
</div>
<div class="location_data-content">
<h5 class="title">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment