Skip to content

Commit b6c22db

Browse files
committed
fix: badge feature id filter for order / tickets
1 parent 5fb3537 commit b6c22db

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

app/Repositories/Summit/DoctrineSummitAttendeeTicketRepository.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ protected function getFilterMappings()
240240
]
241241
),
242242
'owner_status' => 'a.status:json_string',
243-
'badge_features_id' => 'bf.id',
243+
'badge_features_id' => ['bf.id:json_int','bt_bf.id:json_int'],
244244
'assigned_to' => new DoctrineSwitchFilterMapping([
245245
'Me' => new DoctrineCaseFilterMapping(
246246
'Me',
@@ -285,6 +285,7 @@ protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null,
285285
$query = $query->leftJoin("b.prints", "prt");
286286
$query = $query->leftJoin("b.type", "bt");
287287
$query = $query->leftJoin("bt.access_levels", "al");
288+
$query = $query->leftJoin('bt.badge_features','bt_bf');
288289
$query = $query->leftJoin("a.member", "m");
289290
$query = $query->leftJoin("e.refund_requests", "rr");
290291
$query = $query->leftJoin("e.applied_taxes", "ta");

app/Repositories/Summit/DoctrineSummitOrderRepository.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ protected function getFilterMappings()
7272
'tickets_owner_status' => 'to.status:json_string',
7373
'tickets_promo_code' => 'pc.code:json_string',
7474
'tickets_type_id' => 'tt.id',
75-
'tickets_badge_features_id' => 'bf.id',
75+
'tickets_badge_features_id' => ['bf.id:json_int','bt_bf.id:json_int'],
7676
'tickets_assigned_to' => new DoctrineSwitchFilterMapping([
7777
'Me' => new DoctrineCaseFilterMapping(
7878
'Me',
@@ -119,7 +119,9 @@ protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null,
119119
}
120120
if((!is_null($filter) && $filter->hasFilter("tickets_badge_features_id"))){
121121
$query = $query->leftJoin('t.badge','b')
122-
->leftJoin('b.features','bf');
122+
->leftJoin('b.features','bf')
123+
->leftJoin('b.type','bt')
124+
->leftJoin('bt.badge_features','bt_bf');
123125
}
124126
if((!is_null($filter) && $filter->hasFilter("tickets_type_id"))){
125127
$query = $query->leftJoin('t.ticket_type','tt');

0 commit comments

Comments
 (0)