diff --git a/exposition/models.py b/exposition/models.py index 1ccab6e8..c13d80d2 100644 --- a/exposition/models.py +++ b/exposition/models.py @@ -181,6 +181,10 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): def __unicode__(self): return self.lazy_translation_getter('name', unicode(self.pk)) + @property + def get_price(self): + return self.price_day or self.price_all + def get_services(self): return self.get_services_detail() # country_ids = [item for item, bool in self.country.services if bool==True] diff --git a/functions/model_mixin.py b/functions/model_mixin.py index 95acc167..3102881b 100644 --- a/functions/model_mixin.py +++ b/functions/model_mixin.py @@ -101,9 +101,9 @@ class EventMixin(object): # qs = qs.filter(Q(Q(url__in=country_ids) & Q(type=_type)) | Q(url__in=ids)) qs = qs.filter(url__in=services) self._get_services_detail = list(qs) - + # import pdb; pdb.set_trace() #двигаем билеты сразу за переводом - if 'tickets' not in excluded: + if excluded is None or 'tickets' not in excluded: translator_idx = tickets = None for idx, service in enumerate(self._get_services_detail): if service.url == 'translator': diff --git a/templates/client/includes/event_steps.html b/templates/client/includes/event_steps.html index c55714a7..fa0d6f2b 100644 --- a/templates/client/includes/event_steps.html +++ b/templates/client/includes/event_steps.html @@ -5,11 +5,15 @@
