Services bugs

proj/settings.py

@@ -408,8 +408,8 @@ try:
     from local import *
 except ImportError, e:
     pass
-
-
+# save sessions in redis
+SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
 if not DEBUG:
     # cache template loading
     TEMPLATE_LOADERS = (

service/models.py

@@ -59,11 +59,12 @@ post_save.connect(post_save_handler, sender=Service)
 class AbstractOrder(models.Model):
     person = models.ForeignKey('accounts.User')
     phone = models.BigIntegerField()
-    city = models.CharField(max_length=255)
-    country = models.CharField(max_length=255)
+    city = models.CharField(max_length=255, blank=True, default='')
+    country = models.CharField(max_length=255, blank=True, default='')
     person_inf = models.CharField(max_length=255)
     price = models.IntegerField(blank=True, null=True)
     currency = EnumField(values=CURENCIES, blank=True)
+    event = models.CharField(max_length=255, blank=True, null=True)
     exposition = models.ForeignKey('exposition.Exposition', null=True)
     conference = models.ForeignKey('conference.Conference', null=True)
     seminar = models.ForeignKey('seminar.Seminar', null=True)
@@ -130,8 +131,13 @@ class Visit(AbstractOrder):
     excursion = models.BooleanField()
     notes = models.TextField(blank=True)
 
+ADVERTYSE_TYPES = ((u'Рекламировать участника', u'Рекламировать участника'),
+                  (u'Баннерная реклама', u'Баннерная реклама'),
+                  (u'Приоритетное размещение событий в каталоге',u'Приоритетное размещение событий в каталоге'),
+                  (u'Персональная визитка Вашей компании',u'Персональная визитка Вашей компании'))
 class Advertising(AbstractOrder):
-    pass
+    type = models.CharField(choices=ADVERTYSE_TYPES, max_length=255, blank=True, null=True)
+
 
 class CallBack(models.Model):
     phone = models.CharField(max_length=30)

service/order_forms.py

@@ -10,6 +10,7 @@ from django.conf import settings
 
 
 class AbstractOrderForm(forms.ModelForm):
+    event = forms.CharField(widget=forms.TextInput(attrs={'placeholder': _(u'Интересующее событие')}) ,required=False)
     person_inf = forms.CharField(widget=forms.TextInput(attrs={'placeholder': _(u'Контактное лицо')}))
     country = forms.CharField(widget=forms.TextInput(attrs={'placeholder': _(u'Страна')}))
     city = forms.CharField(widget=forms.TextInput(attrs={'placeholder': _(u'Город')}))
@@ -189,6 +190,8 @@ class VisitForm(AbstractOrderForm):
 
 class AdvertiseForm(AbstractOrderForm):
     action = '/service/com_rek/'
+    country = forms.CharField(required=False, widget=forms.TextInput(attrs={'placeholder': _(u'Страна')}))
+    city = forms.CharField(required=False, widget=forms.TextInput(attrs={'placeholder': _(u'Город')}))
     class Meta:
         model = Advertising
 

service/urls.py

@@ -5,6 +5,7 @@ from views import ServiceView, CallBackListView, VisitListView, TranslationListV
 
 urlpatterns = patterns('',
     url(r'service/thanks/$', Thanks.as_view()),
+    url(r'service/com_rek/(?P<catalog>.*)/(?P<event_url>.*)/$', 'service.views.advertise'),
     url(r'service/com_rek/$', 'service.views.advertise'),
     url(r'service/(?P<url>.*)/$', ServiceView.as_view()),
 

service/views.py

@@ -55,15 +55,40 @@ class ServiceView(MetadataMixin, FormView):
         kwargs.update({'meta_id': meta_id})
         return super(ServiceView, self).get_context_data(**kwargs)
 
+from exposition.models import Exposition
+from conference.models import Conference
 
+def advertise(request, catalog=None, event_url=None):
 
-def advertise(request):
     if request.POST:
         response = {'success': False}
         form = AdvertiseForm(request.POST)
         if form.is_valid():
-            form.save()
+            if not catalog or not event_url:
+                form.save()
+            else:
+                order = form.save(commit=False)
+                if catalog == 'expo':
+
+                    try:
+                        expo = Exposition.objects.get(url=event_url)
+                    except Exposition.DoesNotExist:
+                        expo = None
+                    order.exposition = expo
+                elif catalog == 'conference':
+                    try:
+                        conf = Conference.objects.get(url=event_url)
+                    except Conference.DoesNotExist:
+                        conf = None
+                    order.conference= conf
+
+                order.save()
+
+
             response['success'] = True
+
+
+
         else:
             response['errors'] = form.errors
 

templates/client/popups/advertise_member.html

@@ -10,7 +10,7 @@
 			<p>Оставьте свои контакты, и мы вышлем Вам информацию о вариантах и ценах!</p>
 		</header>
 		<div class="pw-body clearfix">
-			<form id="advert-member-form" method="post" class="pw-form"  action="{{ form.action }}">{% csrf_token %}
+			<form id="advert-member-form" method="post" class="pw-form"  action="{{ form.action }}{% if object %}{{ object.get_permanent_url|slice:"1:" }}{% endif %}">{% csrf_token %}
 				<div class="pwf-line">
 					<div class="pwf-field required">
 						{{ form.person_inf }}

templates/client/service/participation.html

@@ -96,6 +96,17 @@
                     <div class="rq-form-sect">
 
                         <div class="rqf-title">{% trans 'Ваши контактные данные' %}</div>
+                        {% if not object %}
+                        <div class="mf-line rq-person ">
+                            <div class="mf-field validate-field{% if form.event.errors %} error-field{% endif %}">
+                                {{ form.event }}
+                                <div class="error-blob">
+                                    {{ form.event.errors }}
+
+                                </div>
+                            </div>
+                        </div>
+                        {% endif %}
 
                         <div class="mf-line rq-person ">
                             <div class="mf-field validate-field{% if form.person_inf.errors %} error-field{% endif %}" >

templates/client/service/remotely.html

@@ -89,7 +89,17 @@
                 <div class="rq-form-sect">
 
                     <div class="rqf-title">{% trans 'Ваши контактные данные' %}</div>
-
+                    {% if not object %}
+                    <div class="mf-line rq-person ">
+                            <div class="mf-field validate-field{% if form.event.errors %} error-field{% endif %}">
+                                {{ form.event }}
+                                <div class="error-blob">
+                                    {{ form.event.errors }}
+
+                                </div>
+                            </div>
+                        </div>
+                    {% endif %}
                     <div class="mf-line rq-person">
                         <div class="mf-field validate-field{% if form.person_inf.errors %} error-field{% endif %}">
                             {{ form.person_inf }}

templates/client/service/tickets.html

@@ -91,6 +91,17 @@
                     <div class="rq-form-sect">
 
                         <div class="rqf-title">{% trans 'Ваши контактные данные' %}</div>
+                        {% if not object %}
+                        <div class="mf-line rq-person ">
+                            <div class="mf-field validate-field{% if form.event.errors %} error-field{% endif %}">
+                                {{ form.event }}
+                                <div class="error-blob">
+                                    {{ form.event.errors }}
+
+                                </div>
+                            </div>
+                        </div>
+                        {% endif %}
 
                         <div class="mf-line rq-person ">
                             <div class="mf-field validate-field{% if form.person_inf.errors %} error-field{% endif %}">

templates/client/service/tour.html

@@ -197,6 +197,17 @@
                 <div class="rq-form-sect">
 
                     <div class="rqf-title">{% trans 'Ваши контактные данные' %}</div>
+                    {% if not object %}
+                    <div class="mf-line rq-person ">
+                            <div class="mf-field validate-field{% if form.event.errors %} error-field{% endif %}">
+                                {{ form.event }}
+                                <div class="error-blob">
+                                    {{ form.event.errors }}
+
+                                </div>
+                            </div>
+                        </div>
+                    {% endif %}
 
                     <div class="mf-line rq-person">
                         <div class="mf-field validate-field{% if form.person_inf.errors %} error-field{% endif %}">

templates/client/service/translator.html

@@ -115,6 +115,17 @@
                 <div class="rq-form-sect">
 
                     <div class="rqf-title">{% trans 'Ваши контактные данные' %}</div>
+                    {% if not object %}
+                    <div class="mf-line rq-person ">
+                        <div class="mf-field validate-field{% if form.event.errors %} error-field{% endif %}">
+                            {{ form.event }}
+                            <div class="error-blob">
+                                {{ form.event.errors }}
+
+                            </div>
+                        </div>
+                    </div>
+                    {% endif %}
 
                     <div class="mf-line rq-person">
                         <div class="mf-field validate-field{% if form.person_inf.errors %} error-field{% endif %}">