diff --git a/app/settings.py b/app/settings.py index ecbec5e..c6c02af 100644 --- a/app/settings.py +++ b/app/settings.py @@ -348,6 +348,7 @@ CMS_TEMPLATES = ( DJANGOCMS_FORMS_TEMPLATES = ( ('djangocms_forms/form_template/default.html', 'Default'), ('form_template/consultation.html', 'Consultation'), + ('form_template/order_modal.html', 'Order Modal'), ('form_template/product_class.html', 'Trademark Product Class'), ) diff --git a/djangocms_forms/cms_plugins.py b/djangocms_forms/cms_plugins.py index e6d48f6..454c179 100644 --- a/djangocms_forms/cms_plugins.py +++ b/djangocms_forms/cms_plugins.py @@ -134,7 +134,7 @@ plugin_pool.register_plugin(FormPlugin) class FormResultsPlugin(CMSPluginBase): - name = 'Form Results' + name = 'Form Order Number' module = settings.DJANGOCMS_FORMS_PLUGIN_MODULE cache = False render_template = 'djangocms_forms/form_template/results.html' @@ -153,3 +153,25 @@ class FormResultsPlugin(CMSPluginBase): return context plugin_pool.register_plugin(FormResultsPlugin) + + +class FormDetailResultsPlugin(CMSPluginBase): + name = 'Form Detail Results' + module = settings.DJANGOCMS_FORMS_PLUGIN_MODULE + cache = False + render_template = 'djangocms_forms/form_template/detail_results.html' + + def render(self, context, instance, placeholder): + context = super(FormDetailResultsPlugin, self).render(context, instance, placeholder) + request = context['request'] + + if request.session.get('last-completed-form-id', False): + try: + form_instance = FormSubmission.objects.get(id=request.session.get('last-completed-form-id', False)) + context['results'] = form_instance + except (FormSubmission.DoesNotExist): + pass + + return context + +plugin_pool.register_plugin(FormDetailResultsPlugin) diff --git a/djangocms_forms/forms.py b/djangocms_forms/forms.py index 3bb3e12..cce556a 100644 --- a/djangocms_forms/forms.py +++ b/djangocms_forms/forms.py @@ -271,9 +271,6 @@ class FormBuilder(forms.Form): request.session[form_slug] = None form_instance = None - if data['name'] == 'end_session': - request.session['last-completed-form-id'] = form_instance.id - if form_instance: form_instance.form_data += form_data form_instance.save() @@ -310,6 +307,7 @@ class FormBuilder(forms.Form): for data in form_data: if data['name'] == 'end_session': request.session[form_slug] = None + request.session['last-completed-form-id'] = form_instance.id send = True if data['type'] == 'email': client_mail_to = data['value'] diff --git a/djangocms_forms/templates/djangocms_forms/form_template/detail_results.html b/djangocms_forms/templates/djangocms_forms/form_template/detail_results.html new file mode 100644 index 0000000..2b52f3d --- /dev/null +++ b/djangocms_forms/templates/djangocms_forms/form_template/detail_results.html @@ -0,0 +1,17 @@ +{% load cms_tags djangocms_forms_tags i18n sekizai_tags staticfiles %} + +

{{ results.plugin.name }}

+ +{% if request.LANGUAGE_CODE == 'ru' %} + + +

Ваше обращение № {{ results.id }} зарегистрировано

+{% else %} +

Your message is registered under № {{ results.id }}

+{% endif %} diff --git a/zsite/static/less/consultation.less b/zsite/static/less/consultation.less index a8aa409..f7eb6cd 100644 --- a/zsite/static/less/consultation.less +++ b/zsite/static/less/consultation.less @@ -1,4 +1,4 @@ -.modal-consultation { +.modal-consultation, .modal-form { img { float: left; width: 30%; } diff --git a/zsite/static/less/header.less b/zsite/static/less/header.less index 2651900..8b96176 100644 --- a/zsite/static/less/header.less +++ b/zsite/static/less/header.less @@ -27,6 +27,8 @@ opacity: 0.5; line-height: 17px; + + font-size: 14px; } } diff --git a/zsite/static/less/main.less b/zsite/static/less/main.less index 2559bb0..130ad18 100644 --- a/zsite/static/less/main.less +++ b/zsite/static/less/main.less @@ -119,6 +119,30 @@ h1 { } +.xs-offset-top { + margin-top: 5px +} + +.xs-offset-bottom { + margin-bottom: 5px +} + +.m-offset-top { + margin-top: 30px +} + +.m-offset-bottom { + margin-bottom: 30px +} + +.l-offset-top { + margin-top: 60px +} + +.l-offset-bottom { + margin-bottom: 60px +} + @media print { .no-print, .menu, .menu-xs, .header-menu, .header-menu-font, .theory-block, .about-clients, .consultation-person, #cms_toolbar { diff --git a/zsite/static/less/service.less b/zsite/static/less/service.less index 98a7656..310cbf3 100644 --- a/zsite/static/less/service.less +++ b/zsite/static/less/service.less @@ -106,6 +106,10 @@ margin-top: -7px; } +.sub-content .bill { + margin-top: 20px; +} + .bill { margin-top: 62px; diff --git a/zsite/templates/base.html b/zsite/templates/base.html index 789154d..819b786 100644 --- a/zsite/templates/base.html +++ b/zsite/templates/base.html @@ -26,7 +26,7 @@ -
{% trans 'Intellectual Property Protection' %}
+

{% trans 'Intellectual Property Protection' %}

{% if request.current_page.parent %} diff --git a/zsite/templates/form_template/order_modal.html b/zsite/templates/form_template/order_modal.html new file mode 100644 index 0000000..7d5b217 --- /dev/null +++ b/zsite/templates/form_template/order_modal.html @@ -0,0 +1,85 @@ +{% load cms_tags djangocms_forms_tags i18n sekizai_tags staticfiles %} + +
+ + + +

Вы можете обратить к нам с вопросом или заказать услугу «{{ instance.name }}»

+
+ +{% addtoblock "js" %} + + + + +{% endaddtoblock %}