summaryrefslogtreecommitdiff
path: root/site/app
diff options
context:
space:
mode:
authorhorus2018-06-22 15:23:23 +0200
committerhorus2018-06-22 15:24:30 +0200
commit07f62219b933a2dfd06d59322cbd83e107937b08 (patch)
tree0af6b1431f3132f714f5e4cffdb96796baac6cf8 /site/app
parent73e1609f3b7e6d053b42bb33fdae2cf9cec2a518 (diff)
downloadalkobote-07f62219b933a2dfd06d59322cbd83e107937b08.tar.gz
Adds special styles explicitly for Drankdozijn. (website)
Diffstat (limited to 'site/app')
-rw-r--r--site/app/Http/Controllers/IndexController.php2
-rw-r--r--site/app/Http/Controllers/PageFeedController.php2
2 files changed, 2 insertions, 2 deletions
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