From 924f23c1c6b5deeea44b08c7d3032426826fa3bb Mon Sep 17 00:00:00 2001
From: horus
Date: Sun, 19 May 2019 17:07:34 +0200
Subject: Minor improvements.

---
 app/Http/Controllers/IndexController.php | 2 +-
 resources/views/index.blade.php          | 2 +-
 resources/views/offers.blade.php         | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php
index a6656e9..df12014 100644
--- a/app/Http/Controllers/IndexController.php
+++ b/app/Http/Controllers/IndexController.php
@@ -24,7 +24,7 @@ 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 > 19.98 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 .= " 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/resources/views/index.blade.php b/resources/views/index.blade.php
index f088a52..b4aa45b 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -85,7 +85,7 @@ if ( empty($data) ) {
 	    <p class="card-text float-right rounded off-badge"  >{{ $offer->procent}} %</p>
             </div>
 	<a href="/angebote/{{ $offer->url }}">
-	    <img src="{{ Tf::Camo($offer->image_url) }}" class="card-img img-fluid mx-auto d-block">
+	    <img src="{{ TF::Camo($offer->image_url) }}" class="card-img img-fluid mx-auto d-block">
 	</a>
           </div>
           <div class="col-md-8 px-10">
diff --git a/resources/views/offers.blade.php b/resources/views/offers.blade.php
index ffbe7ce..3ea9c33 100644
--- a/resources/views/offers.blade.php
+++ b/resources/views/offers.blade.php
@@ -30,6 +30,13 @@ foreach( $data as $offer) {
 		      <span class="card-text col-md-6">
 			<p>
 		              <strong class="new-price">Neuer Preis: {{ TF::fF($offer->discounted_price) }} €</strong>
+<?php
+	if ( 1 <= $offer->volume ) {
+?>
+		({{ TF::fF($offer->volume )}} Liter)
+<?php
+	}
+?>
 			      <br>
 			      statt <strong><del>{{ TF::fF($offer->original_price) }} €</del></strong>
 			      <br>
-- 
cgit v1.2.3