Commit e713e0e2 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '238-confidential-issue' into 'development'

Produkte können nun auch per AJAX nachgeladen werden.

Produkte für die Uni Mainz deaktiviert
Closes #238

See merge request !398
parents 7bf32fc3 17d4804c
...@@ -252,6 +252,7 @@ class MetaGer ...@@ -252,6 +252,7 @@ class MetaGer
$password = md5($eingabe . $password); $password = md5($eingabe . $password);
if ($this->password === $password) { if ($this->password === $password) {
$this->ads = []; $this->ads = [];
$this->products = [];
$this->validated = true; $this->validated = true;
} }
} }
......
...@@ -17,10 +17,14 @@ ...@@ -17,10 +17,14 @@
</div> </div>
@endif @endif
<div class="col-xs-12 col-md-8"> <div class="col-xs-12 col-md-8">
{{-- 3-Mal Werbung --}} @if($metager->hasProducts())
@for($i = 0; $i <= 2; $i++) @include('layouts.products', ['products' => $metager->getProducts()])
@include('layouts.ad', ['ad' => $metager->popAd()]) @else
@endfor {{-- 3-Mal Werbung --}}
@for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
@foreach($metager->getResults() as $result) @foreach($metager->getResults() as $result)
@if($result->number % 7 === 0) @if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()]) @include('layouts.ad', ['ad' => $metager->popAd()])
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment