|
|
@@ -95,7 +95,11 @@ class OfferListView(ListView):
|
|
95
|
95
|
)
|
|
96
|
96
|
self.search_filters.append(_("Is active"))
|
|
97
|
97
|
else:
|
|
98
|
|
- qs = qs.filter(Q(end_datetime__lt=now) | Q(start_datetime__gt=now))
|
|
|
98
|
+ qs = qs.filter(
|
|
|
99
|
+ (Q(start_datetime__lte=now) | Q(start_datetime__isnull=True))
|
|
|
100
|
+ & (Q(end_datetime__gte=now) | Q(end_datetime__isnull=True)),
|
|
|
101
|
+ status=ConditionalOffer.SUSPENDED,
|
|
|
102
|
+ )
|
|
99
|
103
|
self.search_filters.append(_("Is inactive"))
|
|
100
|
104
|
if offer_type:
|
|
101
|
105
|
qs = qs.filter(offer_type=offer_type)
|