From 07f62219b933a2dfd06d59322cbd83e107937b08 Mon Sep 17 00:00:00 2001 From: horus Date: Fri, 22 Jun 2018 15:23:23 +0200 Subject: Adds special styles explicitly for Drankdozijn. (website) --- site/app/Http/Controllers/IndexController.php | 2 +- site/app/Http/Controllers/PageFeedController.php | 2 +- site/resources/views/feeds.blade.php | 8 +++--- site/resources/views/offer.blade.php | 31 +++++++++++++++++++++--- site/resources/views/search.blade.php | 4 +-- 5 files changed, 35 insertions(+), 12 deletions(-) (limited to 'site') diff --git a/site/app/Http/Controllers/IndexController.php b/site/app/Http/Controllers/IndexController.php index 09ff3a2..41fae3d 100644 --- a/site/app/Http/Controllers/IndexController.php +++ b/site/app/Http/Controllers/IndexController.php @@ -23,7 +23,7 @@ class IndexController extends Controller { $query .= " UNION "; } # 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 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 AND shop != \"Drankdozijn\" ORDER BY procent DESC LIMIT 1)"; } $query .= " UNION (SELECT 'Alle Angebote' as name, '/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/site/app/Http/Controllers/PageFeedController.php b/site/app/Http/Controllers/PageFeedController.php index 0dd1b95..ffe8629 100644 --- a/site/app/Http/Controllers/PageFeedController.php +++ b/site/app/Http/Controllers/PageFeedController.php @@ -22,7 +22,7 @@ class PageFeedController extends Controller { if ($query != "") { $query .= " UNION "; } - $query .= "(SELECT spirit_type as name, image_url, spirit_type, spirit_type AS url, CONCAT(spirit_type,'-Feed') AS feedname, CONCAT('Zum ', spirit_type, '-Feed') AS linktext FROM ". $view ."_view WHERE original_price > 19.98 ORDER BY created_at DESC LIMIT 1)"; + $query .= "(SELECT spirit_type as name, image_url, spirit_type, spirit_type AS url, CONCAT(spirit_type,'-Feed') AS feedname, CONCAT('Zum ', spirit_type, '-Feed') AS linktext FROM ". $view ."_view WHERE original_price > 19.98 AND shop != 'Drankdozijn' ORDER BY created_at DESC LIMIT 1)"; } # query mit festen parametern diff --git a/site/resources/views/feeds.blade.php b/site/resources/views/feeds.blade.php index e4b4aca..972114e 100644 --- a/site/resources/views/feeds.blade.php +++ b/site/resources/views/feeds.blade.php @@ -51,23 +51,21 @@ foreach( $data as $offer) {
{{ $offer->name }} -
-
+
{{ $offer->spirit_type }}

- + Hier geht es zum {{ $offer->feedname }}

- {{ $offer->linktext }} + {{ $offer->linktext }}
- {{ $offer->name }}
diff --git a/site/resources/views/offer.blade.php b/site/resources/views/offer.blade.php index 71fb21a..10f50a1 100644 --- a/site/resources/views/offer.blade.php +++ b/site/resources/views/offer.blade.php @@ -73,7 +73,7 @@ if ( !$data->count() ) { -

{{ TF::fF($offer->discounted_price) }}€* {{ TF::fF($offer->original_price) . "€" }} +

{{ TF::fF($offer->discounted_price) }}€* {{ TF::fF($offer->original_price) . "€" }} {{ TF::fF($offer->base_price ) }}€/L

@@ -108,7 +108,15 @@ if ( !$data->count() ) { --> - {{ $offer->name }} +shop ) { + $style = 'margin-left: auto; margin-right: 25px; width:50%; object-fit: cover; width: 70px;'; + } else { + $style = ''; + } +?> + {{ $offer->name }}