|
|
|
|
@ -99,6 +99,18 @@ class EventMixin(object): |
|
|
|
|
qs = qs.exclude(url__in=excluded) |
|
|
|
|
qs = qs.filter(Q(Q(url__in=country_ids) & Q(type=_type)) | Q(url__in=ids)) |
|
|
|
|
self._get_services_detail = list(qs) |
|
|
|
|
|
|
|
|
|
#двигаем билеты сразу за переводом |
|
|
|
|
if 'tickets' not in excluded: |
|
|
|
|
translator_idx = tickets = None |
|
|
|
|
for idx, service in enumerate(self._get_services_detail): |
|
|
|
|
if service.url == 'translator': |
|
|
|
|
translator_idx = idx + 1 |
|
|
|
|
elif service.url == 'tickets': |
|
|
|
|
tickets = service |
|
|
|
|
if tickets and translator_idx: |
|
|
|
|
self._get_services_detail.remove(tickets) |
|
|
|
|
self._get_services_detail.insert(translator_idx, tickets) |
|
|
|
|
return self._get_services_detail |
|
|
|
|
|
|
|
|
|
def duration_days(self, month=None): |
|
|
|
|
|