remotes/origin/1203
Назар Котюк 11 years ago
parent 68a5bee70d
commit 11ade8477b
  1. 7
      exposition/views.py
  2. 5
      service/models.py
  3. 12
      service/order_forms.py
  4. 1
      service/urls.py
  5. 18
      service/views.py
  6. 5
      templates/client/includes/exposition/exposition_object.html
  7. 47
      templates/client/popups/advertise_member.html

@ -145,12 +145,17 @@ def exposition_visit(request, id):
return HttpResponse(json.dumps(args), content_type='application/json') return HttpResponse(json.dumps(args), content_type='application/json')
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
from service.order_forms import AdvertiseForm
class ExpoDetail(DetailView): class ExpoDetail(DetailView):
model = Exposition model = Exposition
slug_field = 'url' slug_field = 'url'
template_name = 'client/exposition/exposition_detail.html' template_name = 'client/exposition/exposition_detail.html'
def get_context_data(self, **kwargs):
context = super(ExpoDetail, self).get_context_data(**kwargs)
context['advertising_form'] = AdvertiseForm()
return context
class ExpositionProgramme(DetailView): class ExpositionProgramme(DetailView):
model = Exposition model = Exposition
slug_field = 'url' slug_field = 'url'

@ -4,7 +4,7 @@ from hvad.models import TranslatableModel, TranslatedFields, TranslationManager
from functions.custom_fields import EnumField from functions.custom_fields import EnumField
CURENCIES = ('USD', 'RUB', 'EUR') CURENCIES = ('', 'USD', 'RUB', 'EUR')
@ -122,3 +122,6 @@ class Visit(AbstractOrder):
excursion = models.BooleanField() excursion = models.BooleanField()
notes = models.TextField(blank=True) notes = models.TextField(blank=True)
class Advertising(AbstractOrder):
pass

@ -2,7 +2,7 @@
from django import forms from django import forms
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from accounts.models import User from accounts.models import User
from models import Catalog, Tickets, Remote, Participation, Translation, Visit, CURENCIES from models import Catalog, Tickets, Remote, Participation, Translation, Visit, CURENCIES, Advertising
from exposition.models import Exposition from exposition.models import Exposition
from conference.models import Conference from conference.models import Conference
from seminar.models import Seminar from seminar.models import Seminar
@ -15,7 +15,7 @@ class AbstractOrderForm(forms.ModelForm):
phone = forms.CharField(widget=forms.TextInput(attrs={'placeholder': _(u'Контактный номер телефона')})) phone = forms.CharField(widget=forms.TextInput(attrs={'placeholder': _(u'Контактный номер телефона')}))
person = forms.EmailField(widget=forms.TextInput(attrs={'placeholder': _(u'Электронная почта')})) person = forms.EmailField(widget=forms.TextInput(attrs={'placeholder': _(u'Электронная почта')}))
currency = forms.CharField(widget=forms.HiddenInput()) currency = forms.CharField(widget=forms.HiddenInput(), required=False)
exposition = forms.CharField(widget=forms.HiddenInput(), required=False) exposition = forms.CharField(widget=forms.HiddenInput(), required=False)
conference = forms.CharField(widget=forms.HiddenInput(), required=False) conference = forms.CharField(widget=forms.HiddenInput(), required=False)
@ -195,4 +195,10 @@ class VisitForm(AbstractOrderForm):
if not avia_type: if not avia_type:
return '' return ''
else: else:
return ', '.join(avia_type) return ', '.join(avia_type)
class AdvertiseForm(AbstractOrderForm):
action = '/service/advertise/'
class Meta:
model = Advertising

@ -3,6 +3,7 @@ from django.conf.urls import patterns, include, url
from views import ServiceView from views import ServiceView
urlpatterns = patterns('', urlpatterns = patterns('',
url(r'service/advertise/$', 'service.views.advertise'),
url(r'service/(?P<url>.*)/$', ServiceView.as_view()), url(r'service/(?P<url>.*)/$', ServiceView.as_view()),
) )

@ -9,7 +9,7 @@ from django.http import Http404
import json import json
from functions.search_forms import CompanySearchForm from functions.search_forms import CompanySearchForm
from order_forms import TranslationForm, CatalogForm, VisitForm, RemoteForm, ParticipationForm, TicketsForm from order_forms import TranslationForm, CatalogForm, VisitForm, RemoteForm, ParticipationForm, TicketsForm, AdvertiseForm
order_forms = {'translator': TranslationForm, 'catalog': CatalogForm, 'participation': ParticipationForm, order_forms = {'translator': TranslationForm, 'catalog': CatalogForm, 'participation': ParticipationForm,
@ -34,3 +34,19 @@ class ServiceView(FormView):
return service.template return service.template
def advertise(request):
if request.POST:
response = {'success': False}
form = AdvertiseForm(request.POST)
if form.is_valid():
form.save()
response['success'] = True
else:
response['erros'] = form.errors
return HttpResponse(json.dumps(response), content_type='application/json')

@ -362,6 +362,7 @@
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
{% include 'client/popups/advertise_member.html' with form=advertising_form %}
{% endif %} {% endif %}
<!-- <!--
<div class="abn"><a href="#"><img src="{% static 'client/img/_del-temp/banner-2.gif' %}" alt="" /></a></div> <div class="abn"><a href="#"><img src="{% static 'client/img/_del-temp/banner-2.gif' %}" alt="" /></a></div>
@ -377,6 +378,10 @@
{% endblock %} {% endblock %}
{% block content_text %} {% block content_text %}
{% endblock %} {% endblock %}
{% block popup %}
{% include 'client/popups/advertise_member.html' with form=advertising_form %}
{% endblock %}
{% block scripts %} {% block scripts %}
<!-- todo: вернуть .min--> <!-- todo: вернуть .min-->
<!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.exposition.object{% if debug %}{% else %}.min{% endif %}.js"></script>--> <!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.exposition.object{% if debug %}{% else %}.min{% endif %}.js"></script>-->

@ -0,0 +1,47 @@
{% load static %}
{% load i18n %}
<div id="pw-advertise" class="popup-window">
<header class="clearfix">
<div class="pw-title">{% trans 'Рекламировать участника' %}</div>
</header>
<div class="pw-body clearfix">
<form id="advertise_form" method="post" class="pw-form" action="{{ form.action }}">{% csrf_token %}
<div class="pwf-line">
<div class="pwf-field required">
{{ form.person_inf }}
</div>
</div>
<div class="pwf-line">
<div class="pwf-field required">
{{ form.person }}
</div>
</div>
<div class="pwf-line">
<div class="pwf-field required">
{{ form.phone }}
</div>
</div>
<div class="pwf-line">
<div class="pwf-field select-input required">
{{ form.country }}
</div>
</div>
<div class="pwf-line">
<div class="pwf-field select-input required">
{{ form.city }}
</div>
</div>
<div class="pwf-buttons-line">
<button type="submit" class="icon-check">{% trans 'Рекламировать' %}</button>
</div>
</form>
</div>
</div>
Loading…
Cancel
Save