Merge branch 'develop' of http://git.general-servers.com/expomap/expomap

exposition/models.py

@@ -368,6 +368,7 @@ class Paid(models.Model):
     oficial_link = models.ForeignKey('banners.Redirect', null=True, blank=True, related_name='expo_oficial')
     participation_link = models.ForeignKey('banners.Redirect', null=True, blank=True, related_name='expo_participation')
     tickets_link = models.ForeignKey('banners.Redirect', null=True, blank=True, related_name='expo_tickets')
+    organiser = models.EmailField(blank=True)
 
 
 pre_save.connect(pre_save_handler, sender=Exposition)

exposition/urls.py

@@ -63,6 +63,7 @@ urlpatterns = patterns('',
     url(r'^expo/tag/(?P<slug>.*)/(?P<year>\d+)/$', ExpoTagCatalog.as_view(), {'meta_id':15}),
     url(r'^expo/tag/(?P<slug>.*)/$', ExpoTagCatalog.as_view(), {'meta_id':14}),
     # expo additional pages
+    url(r'^expo/(?P<slug>.*)/send_to_organiser/$', 'exposition.views.send_to_organiser'),
     url(r'^expo/(?P<slug>.*)/statistic/$', ExpositionStatistic.as_view(), {'meta_id':60}),
     url(r'^expo/(?P<slug>.*)/price/$', ExpositionPrice.as_view(), {'meta_id':61}),
     url(r'^expo/(?P<slug>.*)/program/$', ExpositionProgramme.as_view(), {'meta_id':62}),

exposition/views.py

@@ -507,3 +507,20 @@ def add_note(request, slug):
         args['success'] = True
 
     return HttpResponse(json.dumps(args), content_type='application/json')
+
+from django.core.mail import send_mail
+from django.core.mail import EmailMessage
+def send_to_organiser(request, slug):
+    exposition = get_object_or_404(Exposition, url=slug)
+    mail_send = exposition.paid.organiser
+    name = request.POST.get('person_inf')
+    email = request.POST.get('person')
+    phone = request.POST.get('phone', '')
+    question = request.POST.get('question', '')
+    text = u"выставка: %s\n Контактное лицо:%s\nEmail: %s\nтелефон:%s\n вопрос:%s"%(exposition.name, name, email,
+                                                                                    phone, question)
+    msg = EmailMessage(u'Проплаченная выставка', text, settings.DEFAULT_FROM_EMAIL, [mail_send])
+    msg.content_subtype = "html"
+    msg.send()
+    return HttpResponseRedirect('%sservice/thanks/'%exposition.get_permanent_url())
+

templates/client/popups/issue_organizer.html

@@ -11,7 +11,7 @@
 				Оставьте свои контакты и вопрос, и мы направим его организатору <span class="organizer-name">EXPONAME</span>
 			</p>
 		</div>
-		<form class="pw-form simple-validate" method="post" id="organizer-form" action="">
+		<form class="pw-form simple-validate" method="post" id="organizer-form" action="{{ object.get_permanent_url }}send_to_organiser/">
 			{% csrf_token %}
 			<div class="pwf-line">
 				<div class="pwf-field">