Expo paid bugs

banners/models.py

@@ -10,4 +10,4 @@ class Redirect(models.Model):
         return self.redirect
 
     def get_object_url(self):
-        return '/redirect/reditect/%d/'%self.id
+        return '/redirect/redirect/%d/'%self.id

templates/client/exposition/exposition_detail.html

@@ -16,11 +16,11 @@
 {% endblock %}
 
 {% block content_list %}
-    {% ifnotequal object.url 'ipsa-osen-2015' %}
+    {% if not object.paid  %}
         {% include 'client/includes/exposition/exposition_object.html' with exposition=object %}
     {% else %}
         {% include 'client/includes/exposition/expo_paid.html' with exposition=object %}
-    {% endifnotequal %}
+    {% endif %}
 {% endblock %}
 
 {% block paginator %}

templates/client/includes/exposition/price.html

@@ -151,7 +151,11 @@
 
                                 <div class="tp-btn-wrap">
                                     <div class="tp-btn">
+                                        {% if not exposition.paid %}
                                         <a class="button big orange b-more" href="{{ exposition.get_permanent_url }}service/tickets/">{% trans 'Заказать билет' %}</a>
+                                        {% else %}
+                                            <a class="button big orange" href="{{ exposition.paid.tickets_link.get_object_url }}">{% trans 'Заказать билет' %}</a>
+                                        {% endif %}
                                     </div>
 									{% if exposition.get_audience %}
                                     <div class="tp-categories">
@@ -215,8 +219,11 @@
                         {% else %}
                             <p class="mb-2em">{% trans 'Цены на площадь доступны по запросу' %}</p>
                         {% endif %}
-
-                        <a class="button big orange b-more" href="{{ exposition.get_permanent_url }}service/participation/">{% trans 'Заявка на участие' %}</a>
+                        {% if not exposition.paid %}
+                            <a class="button big orange" href="{{ exposition.get_permanent_url }}service/participation/">{% trans 'Заявка на участие' %}</a>
+                        {% else %}
+                            <a class="button big orange" href="{{ exposition.paid.participation_link.get_object_url }}">{% trans 'Заявка на участие' %}</a>
+                        {% endif %}
 
                         {% if exposition.min_stand_size or exposition.registration_payment or exposition.application_deadline %}
                             <div class="epr-conditons">