Some goodies to slightly improve the UX while browsing.

2 files changed, 22 insertions, 3 deletions

diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php
index df12014..4f68801 100644
--- a/app/Http/Controllers/IndexController.php
+++ b/app/Http/Controllers/IndexController.php
@@ -24,7 +24,26 @@ class IndexController extends Controller {
 		} 
 		# subquery to get procent, because cheap spirits don't look good
 		#$query .= "(SELECT name, image_url, spirit_type, spirit_type AS url, spirit_type AS angebotsname, (SELECT MAX(procent) FROM " . $view . "_view) as procent, '' AS linktext FROM ". $view ."_view WHERE original_price > 19.98 AND shop != \"Drankdozijn\" ORDER BY procent DESC LIMIT 1)";
-		$query .= "(SELECT name, image_url, spirit_type, spirit_type AS url, spirit_type AS angebotsname, (SELECT MAX(procent) FROM " . $view . "_view) as procent, '' AS linktext FROM ". $view ."_view WHERE original_price > 29.98 AND spirit_type != 'Verschiedenes' ORDER BY procent DESC LIMIT 1)";
+		$query .= "
+			(SELECT
+				name,
+				image_url,
+				spirit_type,
+				spirit_type AS url,
+				spirit_type AS angebotsname,
+				(SELECT MAX(procent) FROM " . $view . "_view) as procent,
+				'' AS linktext FROM ". $view ."_view
+			WHERE
+				original_price > 29.98
+			AND
+				spirit_type != 'Verschiedenes'
+			AND
+				shop != 'Rum & Co'
+			AND
+				shop = 'Drankdozijn'
+			ORDER BY
+				created_at DESC,
+				procent DESC LIMIT 1)";
 	    }
 		$query .= " UNION (SELECT 'Alle Angebote' as name, 'https://angebote.fuselkoenig.de/img/feed-icon-gray.jpg' as image_url, 'RSS-Feeds' as spirit_type, 'feeds' AS url, 'RSS-Feeds' AS angebotsname, (SELECT MAX(procent) FROM all_view) as procent, 'Zu den RSS-Feeds' AS linktext FROM all_view LIMIT 1)";
 
diff --git a/app/Http/Controllers/ListOfferController.php b/app/Http/Controllers/ListOfferController.php
index ba4face..a471530 100644
--- a/app/Http/Controllers/ListOfferController.php
+++ b/app/Http/Controllers/ListOfferController.php
@@ -63,8 +63,8 @@ class ListOfferController extends Controller {
 	    	$count = DB::table($view_name . '_view')->where('spirit_type', '=', Input::get('type'))->whereNotNull('url')->count();
 
 	    } else {
-	    	$data = DB::table($view_name . '_view')->whereNotNull('url')->orderBy($sort_by, $order_by)->paginate(10);
-	    	$count = DB::table($view_name . '_view')->whereNotNull('url')->count();
+	    	$data = DB::table($view_name . '_view')->where('procent', '>=', '5')->whereNotNull('url')->orderBy($sort_by, $order_by)->paginate(10);
+	    	$count = DB::table($view_name . '_view')->where('procent', '>=', '5')->whereNotNull('url')->count();
 	    }
 
 	    # Only used on misc_view, all_view and search.