Pārlūkot izejas kodu

Fixes #3844 suspend offer doesn't display with is_active 'NO'

master
Vallabh 2 gadus atpakaļ
vecāks
revīzija
f8b8d33cd3
1 mainītis faili ar 5 papildinājumiem un 1 dzēšanām
  1. 5
    1
      src/oscar/apps/dashboard/offers/views.py

+ 5
- 1
src/oscar/apps/dashboard/offers/views.py Parādīt failu

95
                 )
95
                 )
96
                 self.search_filters.append(_("Is active"))
96
                 self.search_filters.append(_("Is active"))
97
             else:
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
                 self.search_filters.append(_("Is inactive"))
103
                 self.search_filters.append(_("Is inactive"))
100
         if offer_type:
104
         if offer_type:
101
             qs = qs.filter(offer_type=offer_type)
105
             qs = qs.filter(offer_type=offer_type)

Notiek ielāde…
Atcelt
Saglabāt