Misc improvements. (website)

5 files changed, 19 insertions, 13 deletions

diff --git a/site/app/Http/Controllers/FeedController.php b/site/app/Http/Controllers/FeedController.php
index 9b82b5d..9ea3621 100644
--- a/site/app/Http/Controllers/FeedController.php
+++ b/site/app/Http/Controllers/FeedController.php
@@ -49,8 +49,8 @@ class FeedController extends Controller {
 	    }
 
 	    $order_by = $request->input("order");
-	    if ( "desc" != $order_by ) {
-		    $order_by = "asc";
+	    if ( "asc" != $order_by ) {
+		    $order_by = "desc";
 	    }
 
 	    /*
@@ -84,7 +84,7 @@ class FeedController extends Controller {
 
 	    foreach ( $data as $offer ) {
 		    $desc = '<p><img src="'.$offer->image_url.'"></p><p><strong>'.$offer->spirit_type.'</strong><br>Statt ' . \TF::fF($offer->original_price) . '€ nur noch ' . \TF::fF($offer->discounted_price) . "€ (".$offer->procent."% Rabatt).";
-		    $feed->add($offer->name, $offer->shop, $offer->url, $offer->created_at, $desc, $offer->name);
+		    $feed->add($offer->name, $offer->shop, $offer->url, $offer->created_at, $desc, $desc);
 	    }
 
 	    return $feed->render('atom');
diff --git a/site/app/Http/Controllers/IndexController.php b/site/app/Http/Controllers/IndexController.php
index d734ca9..7b5ced4 100644
--- a/site/app/Http/Controllers/IndexController.php
+++ b/site/app/Http/Controllers/IndexController.php
@@ -22,7 +22,8 @@ class IndexController extends Controller {
 		if ($query != "") {
 			$query .= " UNION ";
 		} 
-		$query .= "(SELECT name, image_url, spirit_type, spirit_type AS url, spirit_type AS angebotsname, original_price, discounted_price, procent, '' AS linktext FROM ". $view ."_view WHERE original_price > 19.98 ORDER BY procent DESC LIMIT 1)";
+		# 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, original_price, discounted_price, (SELECT MAX(procent) FROM " . $view . "_view) as procent, '' AS linktext FROM ". $view ."_view WHERE original_price > 19.98 ORDER BY procent DESC LIMIT 1)";
 	    }
 
 	    $data = DB::select($query);
diff --git a/site/app/Http/Controllers/OfferController.php b/site/app/Http/Controllers/OfferController.php
index dd3783b..7ffbd96 100644
--- a/site/app/Http/Controllers/OfferController.php
+++ b/site/app/Http/Controllers/OfferController.php
@@ -49,8 +49,8 @@ class OfferController extends Controller {
 	    }
 
 	    $order_by = $request->input("order");
-	    if ( "desc" != $order_by ) {
-		    $order_by = "asc";
+	    if ( "asc" != $order_by ) {
+		    $order_by = "desc";
 	    }
 
 	    /*
@@ -87,11 +87,6 @@ class OfferController extends Controller {
 	    } else {
 		    $title = ucfirst($view_name) . "-Angebote";
 	    }
-
-	    /*
-	     * For strftime() in view.
-	     */
-	    setlocale(LC_TIME, 'de_DE.utf8');
 	    
 	    return view('offer', ['data' => $data, 'spirit_type' => $view_name, 'rss_feed' => $rss_feed, 'title' => $title ]);
     }
diff --git a/site/app/Http/Controllers/SearchController.php b/site/app/Http/Controllers/SearchController.php
index 4a3e1da..4a454f8 100644
--- a/site/app/Http/Controllers/SearchController.php
+++ b/site/app/Http/Controllers/SearchController.php
@@ -65,6 +65,11 @@ class SearchController extends Controller {
 		}
 		$query_string = ltrim($query_string, "&");
 
+		/*
+		* For strftime() in view.
+		*/
+		#setlocale(LC_TIME, 'de_DE.utf8');
+
 		return view('search', ['data' => $data, 'search_phrase' => $query, 'rss_feed' => '/search/feed/?' . $query_string ]);
 	}
 
diff --git a/site/app/Providers/AppServiceProvider.php b/site/app/Providers/AppServiceProvider.php
index 338a677..4d3bd77 100644
--- a/site/app/Providers/AppServiceProvider.php
+++ b/site/app/Providers/AppServiceProvider.php
@@ -14,8 +14,13 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
-	    URL::forceScheme('https');
+
+	URL::forceScheme('https');
+
+	/*
+	* For strftime() in view.
+	*/
+	setlocale(LC_TIME, 'de_DE.utf8');
     }
 
     /**