Merge branch 'develop' into 'master'

Develop

See merge request !6

application/app/Http/Controllers/SearchController.php

@@ -86,7 +86,7 @@ class SearchController extends Controller
     }
 
     
-    public function searchlocater(Request $request)
+    public function searchLocater(Request $request)
     {
         $final = $this->getApiData($request['locality'], $request['state'], $request['city'], $request['location'], $request['ratingOrder'], $request['page']);
 
@@ -97,7 +97,7 @@ class SearchController extends Controller
             $meta = $final['data']['meta'];
 
         }
-
+        /** Set locality input box valuem, Set ratring dropdown value filter, Set page value */
         $locality = $request->locality;
         $ratingOrder = $request->ratingOrder;
         

application/resources/views/frontend/searchs/detail.blade.php

@@ -94,15 +94,16 @@
             </div>
         </div>
     </section>
-    <section class="container offer">
-    </section>
+    
+    @if($locationDetailAPIdata['data']['coordinates']['latitude'] != 0)
     <section class="container-fluid location_onmap ">
         <div class="row no-gutters">
             <div class="col-12">
-                <iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d56122.436645511465!2d77.04168293906328!3d28.459896286104527!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x390d19222ad79e2f%3A0xa2f7eb98f5f013a!2sGlobal+Desi+-+Ladies+Fashion+Wear+Store%2C+Metropolitan+Mall%2C+Gurgaon!5e0!3m2!1sen!2sin!4v1560839450107!5m2!1sen!2sin" width="100%" height="450" frameborder="0" style="border:0" allowfullscreen></iframe>
+            <iframe src="http://maps.google.com/maps?q={{ $locationDetailAPIdata['data']['name'] }}&coord={{ $locationDetailAPIdata['data']['coordinates']['latitude'] }},{{ $locationDetailAPIdata['data']['coordinates']['longitude'] }}&z=15&output=embed" width="100%" height="450" frameborder="0" style="border:0" allowfullscreen></iframe>        
             </div>
         </div>
     </section>
+    @endif
     <section class="container location_reviews_outer">
         <div class="row ">
             <div class="col-md-8 col-12">

application/resources/views/frontend/searchs/index.blade.php

@@ -103,7 +103,7 @@
             e.preventDefault();
             $.ajax({
                 type: 'post',
-                url: "{{route('searchlocater')}}",
+                url: "{{route('searchLocater')}}",
                 data: {"_token": "{{ csrf_token() }}", locality:locality, location:location, state:state,city:city,ratingOrder:ratingOrder},
                     success: function (datanew) {   
                         loader();
@@ -140,7 +140,7 @@
         function paginate(page, locality, state, city, location, ratingOrder){
             $.ajax({
                 type: 'post',
-                url: "{{route('searchlocater')}}",
+                url: "{{route('searchLocater')}}",
                 data: {"_token": "{{ csrf_token() }}",page:page,locality:locality,state:state,city:city,location:location,ratingOrder:ratingOrder},
                     success: function (datanew) {
                     loader();

application/resources/views/frontend/searchs/location_element.blade.php

@@ -106,7 +106,10 @@
                     $links['next'] = '';
                 }
             ?>
-
+            @if($links['prev'] == '')
+            <li class="page-item"><i class="mdi mdi-chevron-double-left"></i></li>
+            <li class="page-item"> <i class="mdi mdi-chevron-left"></i></li>
+            @else
             <li class="page-item">
                 <a class="page-link" id="first" title="First" data-page="{{ $links['first'][1] }}" href="javascript:void(0);">
                     <i class="mdi mdi-chevron-double-left"></i>
@@ -117,6 +120,11 @@
                     <i class="mdi mdi-chevron-left"></i>
                 </a>
             </li>
+            @endif
+            @if($links['next'] == '')
+            <li class="page-item"><i class="mdi mdi-chevron-right"></i></li>
+            <li class="page-item"><i class="mdi mdi-chevron-double-right"></i></li>
+            @else
             <li class="page-item">
                 <a class="page-link" title="Next" href="javascript:void(0);" id="next" data-page="@if(@$links['next']) {{ $links['next'][1] }} @else @endif" name="next" aria-label="Next">
                     <i class="mdi mdi-chevron-right"></i>
@@ -125,6 +133,7 @@
             <li class="page-item">
                 <a class="page-link" title="Last" id="last" data-page="{{ $links['last'][1] }}" href="javascript:void(0);"><i class="mdi mdi-chevron-double-right"></i></a>
             </li>
+            @endif
         </ul>
     </nav>
 </div>

application/resources/views/frontend/searchs/review_element.blade.php

@@ -47,6 +47,10 @@
                         }
                         
                     ?>
+                    @if($reviewData['links']['prev'] == '')
+                    <li class="page-item"><i class="mdi mdi-chevron-double-left"></i></li>
+                    <li class="page-item"> <i class="mdi mdi-chevron-left"></i></li>
+                    @else
                     <li class="page-item">
                         <a class="page-link" id="first" title="First" data-page="{{ $reviewData['links']['first'][1] }}" href="javascript:void(0);">
                             <i class="mdi mdi-chevron-double-left"></i>
@@ -57,6 +61,11 @@
                             <i class="mdi mdi-chevron-left"></i>
                         </a>
                     </li>
+                    @endif
+                    @if($reviewData['links']['next'] == '')
+                    <li class="page-item"><i class="mdi mdi-chevron-right"></i></li>
+                    <li class="page-item"><i class="mdi mdi-chevron-double-right"></i></li>
+                    @else
                     <li class="page-item">
                         <a class="page-link" title="Next" href="javascript:void(0);" id="next" data-page="@if(@$reviewData['links']['next']) {{ $reviewData['links']['next'][1] }} @else @endif" name="next" aria-label="Next">
                             <i class="mdi mdi-chevron-right"></i>
@@ -65,6 +74,7 @@
                     <li class="page-item">
                         <a class="page-link" title="Last" id="last" data-page="{{ $reviewData['links']['last'][1] }}" href="javascript:void(0);"><i class="mdi mdi-chevron-double-right"></i></a>
                     </li>
+                    @endif
                 </ul>
             </nav>
         </div>

application/routes/web.php

@@ -16,7 +16,7 @@
 });*/
 
 Route::get('/', 'SearchController@index')->name('search');
-Route::post('searchlocater', 'SearchController@searchlocater')->name('searchlocater');
+Route::post('searchLocater', 'SearchController@searchLocater')->name('searchLocater');
 Route::get('autocomplete', 'SearchController@autocomplete')->name('autocomplete');
 Route::get('detail/{slug}', 'SearchController@detail')->name('detail');
 Route::post('reviewPaginate', 'SearchController@reviewPaginate')->name('reviewPaginate');