Merge branch 'fronkdev' into 'master'

enhanced preorder filter; fixed fixing wrong oaid origin

See merge request fronk/thetool!81
This commit is contained in:
Frank Schubert
2023-09-15 08:39:04 +00:00
12 changed files with 60 additions and 603 deletions

View File

@@ -175,7 +175,7 @@
<div class="col">
<button type="submit" class="btn btn-primary">Filter anwenden</button>
<?php if(isset($campaign) && $campaign->id): ?>
<a class="btn btn-secondary" href="<?=self::getUrl("Preorder", "Index", ['filter' => ['preordercampaign_id' => $campaign->id]])?>">Filter zurücksetzen</a>
<a class="btn btn-secondary" href="<?=self::getUrl("Preorder", "Index", ['filter' => ['preordercampaign_id' => $campaign->id], "resetFilter" => 1])?>">Filter zurücksetzen</a>
<?php else: ?>
<a class="btn btn-secondary" href="<?=self::getUrl("Preorder")?>">Filter zurücksetzen</a>
<?php endif; ?>