From 665a0a61632eea9320246443419c7c03748a3bbf Mon Sep 17 00:00:00 2001
From: horus
Date: Thu, 7 Jan 2021 21:55:44 +0100
Subject: Minor improvements.
---
app/Http/Controllers/RSSController.php | 13 +++++++------
resources/views/index.blade.php | 2 +-
resources/views/layouts/base.blade.php | 12 ++++++------
resources/views/snippets/footer.blade.php | 2 +-
resources/views/snippets/navbar.blade.php | 2 +-
5 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/app/Http/Controllers/RSSController.php b/app/Http/Controllers/RSSController.php
index 7853b32..5d23b65 100644
--- a/app/Http/Controllers/RSSController.php
+++ b/app/Http/Controllers/RSSController.php
@@ -8,6 +8,7 @@ use App\Http\Controllers\Controller;
use Carbon;
use App\Libraries\Utility;
+use App\Libraries\TemplateFunction;
class RSSController extends Controller {
/**
@@ -57,7 +58,6 @@ class RSSController extends Controller {
* Database query
*/
$view_name = str_replace("_feed", "", \Request::route()->getName());
- $view_name = str_replace("/angebote/", "", $view_name);
if ( "search" == $view_name ) {
if ( "" != $request->get("q") ) {
@@ -68,7 +68,7 @@ class RSSController extends Controller {
$data = DB::table('all_view')->where('spirit_type', '=', $request->get('type'))->whereNotNull('url')->orderBy($sort_by, $order_by)->limit(20)->get();
}
} else {
- $data = DB::table($view_name . '_view')->orderBy($sort_by, $order_by)->limit(20)->get();
+ $data = DB::table($view_name . '_view')->where('procent', '>=', 10)->orderBy($sort_by, $order_by)->limit(20)->get();
}
/*
@@ -110,8 +110,9 @@ class RSSController extends Controller {
$feed->description = 'Finde immer die günstigsten Angebote im Bereich Spirituosen. Regelmäßig neue Schnäppchen.';
$feed->logo = url('https://angebote.fuselkoenig.de/img/paw-400-400.png');
$feed->link = url( $request->fullUrl() );
- $feed->setDateFormat('timestamp'); // 'datetime', 'timestamp' or 'carbon'
- $feed->pubdate = $data[0]->created_at;
+ #$feed->setDateFormat('timestamp'); // 'datetime', 'timestamp' or 'carbon'
+ $feed->setDateFormat('datetime'); // 'datetime', 'timestamp' or 'carbon'
+ $feed->pubdate = strftime('%Y-%m-%d', $data[0]->created_at);
$feed->lang = 'de';
$feed->setShortening(true); // true or false
$feed->setTextLimit(5000); // maximum length of description text
@@ -125,14 +126,14 @@ class RSSController extends Controller {
//$piwik->doTrackContentImpression($offer->spirit_type, $offer->name, $offer->long_url);
}
- $desc = '
'.$offer->spirit_type.'
'. $offer->name . ' gesenkt auf ' . \TF::fF($offer->discounted_price) . '€ statt ' . \TF::fF($offer->original_price) . '€ ('.$offer->procent.'% Rabatt auf '. $offer->shop .').';
+ $desc = '
.')
'.$offer->spirit_type.'
'. $offer->name . ' gesenkt auf ' . \TF::fF($offer->discounted_price) . '€ statt ' . \TF::fF($offer->original_price) . '€ ('.$offer->procent.'% Rabatt auf '. $offer->shop .').';
$feed->addItem( [
'title' => $offer->name,
'author' => $offer->shop,
'url' => $offer->url,
'link' => $offer->url,
- 'pubdate' => $offer->created_at,
+ 'pubdate' => strftime('%Y-%m-%d', $offer->created_at),
'description' => $desc,
'content' => $desc ] );
}
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index c542406..9e680a3 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -75,7 +75,7 @@ Angebote
-