From 8e52f57e2654a4c3c00512175e78be26797f8cdc Mon Sep 17 00:00:00 2001
From: horus
Date: Thu, 15 Feb 2018 02:29:48 +0100
Subject: Fix links. (website)

---
 site/app/Http/Controllers/OfferController.php  | 2 +-
 site/app/Http/Controllers/SearchController.php | 2 +-
 site/resources/views/offer.blade.php           | 6 +++---
 site/resources/views/search.blade.php          | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/site/app/Http/Controllers/OfferController.php b/site/app/Http/Controllers/OfferController.php
index f046a7c..dd3783b 100644
--- a/site/app/Http/Controllers/OfferController.php
+++ b/site/app/Http/Controllers/OfferController.php
@@ -61,7 +61,7 @@ class OfferController extends Controller {
 
 	    $rss_feed = "/" . $view_name . "/feed/";
 	    $query_string = "";
-	    $query_params = Input::get();
+	    $query_params = Input::except('page');
 	    foreach( $query_params as $key => $value) {
 		    $query_string .= "&" . $key . "=" . $value;
 	    }
diff --git a/site/app/Http/Controllers/SearchController.php b/site/app/Http/Controllers/SearchController.php
index 9ec355a..4a3e1da 100644
--- a/site/app/Http/Controllers/SearchController.php
+++ b/site/app/Http/Controllers/SearchController.php
@@ -59,7 +59,7 @@ class SearchController extends Controller {
 		#var_dump($data); exit;
 
 		$query_string = "";
-		$query_params = Input::get();
+		$query_params = Input::except('page');
 		foreach( $query_params as $key => $value) {
 			$query_string .= "&" . $key . "=" . $value;
 		}
diff --git a/site/resources/views/offer.blade.php b/site/resources/views/offer.blade.php
index 03e6890..980d9c3 100644
--- a/site/resources/views/offer.blade.php
+++ b/site/resources/views/offer.blade.php
@@ -69,7 +69,7 @@ if ( !$data->count() ) {
 					</div>
 
 					<h4 class="mb-0 hide-overflow h-45">
-						<a class="text-dark ttext-truncate hide-overflow" href="#{{ $offer->name }}" title="{{$offer->name}}" >{{ $offer->name }}</a>
+						<a class="text-dark ttext-truncate hide-overflow" href="{{ $offer->url }}" title="{{$offer->name}}" >{{ $offer->name }}</a>
 						<span class="text-fade-out"></span>
 					</h4>
 
@@ -94,7 +94,7 @@ if ( !$data->count() ) {
 
 			<!-- <= sm -->
 			<!-- Maybe make the image a link
-				<a href="{{ $offer->url}}">
+				<a href="{{ $offer->url }}">
 				</a>
 			-->
 			<img class="card-img-top flex-auto d-sm-block img-thumbnail d-md-none" src="{{ $offer->image_url }}" alt="{{ $offer->name }}" title="{{$offer->name}} :: {{ $offer->shop }}">
@@ -113,7 +113,7 @@ if ( !$data->count() ) {
 						<strong class="text-primary">{{ $offer->spirit_type }}</strong>
 					</div>
 					<h3 class="mb-0 d-inline-block hide-overflow h-100">
-					<a class="text-dark ttext-truncate" href="#{{ $offer->name }}" title="{{$offer->name}}" >{{ $offer->name }}</a>
+					<a class="text-dark ttext-truncate" href="{{ $offer->url }}" title="{{$offer->name}}" >{{ $offer->name }}</a>
 					</h3>
 
 					<div class="mb-1 text-muted w-100">
diff --git a/site/resources/views/search.blade.php b/site/resources/views/search.blade.php
index c7b7e98..34ec2c3 100644
--- a/site/resources/views/search.blade.php
+++ b/site/resources/views/search.blade.php
@@ -102,7 +102,7 @@ if ( "" == $search_phrase || !$data->count()) {
 					</div>
 
 					<h4 class="mb-0 hide-overflow h-45">
-						<a class="text-dark ttext-truncate hide-overflow" href="#{{ $offer->name }}" title="{{$offer->name}}" >{{ $offer->name }}</a>
+						<a class="text-dark ttext-truncate hide-overflow" href="{{ $offer->url }}" title="{{$offer->name}}" >{{ $offer->name }}</a>
 						<span class="text-fade-out"></span>
 					</h4>
 
@@ -146,7 +146,7 @@ if ( "" == $search_phrase || !$data->count()) {
 						<strong class="text-primary">{{ $offer->spirit_type }}</strong>
 					</div>
 					<h3 class="mb-0 d-inline-block hide-overflow h-100">
-					<a class="text-dark ttext-truncate" href="#{{ $offer->name }}" title="{{$offer->name}}" >{{ $offer->name }}</a>
+					<a class="text-dark ttext-truncate" href="{{ $offer->url }}" title="{{$offer->name}}" >{{ $offer->name }}</a>
 					</h3>
 
 					<div class="mb-1 text-muted w-100">
-- 
cgit v1.2.3