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 %} + +
Вы можете обратить к нам с вопросом или заказать услугу «{{ instance.name }}»
+