diff --git a/addons/crm_iap_lead_website/__manifest__.py b/addons/crm_iap_lead_website/__manifest__.py index 89886895d4d..edfd91b6923 100644 --- a/addons/crm_iap_lead_website/__manifest__.py +++ b/addons/crm_iap_lead_website/__manifest__.py @@ -10,7 +10,7 @@ 'iap_crm', 'iap_mail', 'crm_iap_lead', - 'website_form' + 'website' ], 'data': [ 'data/reveal_data.xml', diff --git a/addons/crm_iap_lead_website/controllers/main.py b/addons/crm_iap_lead_website/controllers/main.py index 4a9b63573bf..1ab69917cac 100644 --- a/addons/crm_iap_lead_website/controllers/main.py +++ b/addons/crm_iap_lead_website/controllers/main.py @@ -2,7 +2,7 @@ import json from odoo import http -from odoo.addons.website_form.controllers.main import WebsiteForm +from odoo.addons.website.controllers.form import WebsiteForm from odoo.http import request diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py index 2bd399831dc..d436126f29f 100644 --- a/addons/website/__manifest__.py +++ b/addons/website/__manifest__.py @@ -17,10 +17,13 @@ 'portal', 'social_media', 'auth_signup', + 'mail', + 'google_recaptcha', ], 'installable': True, 'data': [ 'data/ir_asset.xml', + 'data/mail_mail_data.xml', 'data/website_data.xml', 'data/website_visitor_cron.xml', 'security/website_security.xml', @@ -80,6 +83,7 @@ 'views/snippets/s_dynamic_snippet.xml', 'views/snippets/s_dynamic_snippet_carousel.xml', 'views/snippets/s_embed_code.xml', + 'views/snippets/s_website_form.xml', 'views/website_views.xml', 'views/website_visitor_views.xml', 'views/res_config_settings_views.xml', @@ -87,6 +91,7 @@ 'views/ir_actions_views.xml', 'views/ir_asset_views.xml', 'views/ir_attachment_views.xml', + 'views/ir_model_views.xml', 'views/res_partner_views.xml', 'wizard/base_language_install_views.xml', 'wizard/website_robots.xml', @@ -177,6 +182,7 @@ 'website/static/src/snippets/s_dynamic_snippet/options.js', 'website/static/src/snippets/s_dynamic_snippet_carousel/options.js', 'website/static/src/snippets/s_embed_code/options.js', + 'website/static/src/snippets/s_website_form/options.js', 'website/static/src/js/editor/wysiwyg.js', 'website/static/src/js/editor/widget_link.js', 'website/static/src/js/widgets/media.js', @@ -188,6 +194,7 @@ 'web/static/src/legacy/scss/ace.scss', 'website/static/src/scss/website.editor.ui.scss', 'website/static/src/scss/website.theme_install.scss', + 'website/static/src/js/form_editor_registry.js', 'website/static/src/js/menu/content.js', 'website/static/src/js/menu/customize.js', 'website/static/src/js/menu/debug_manager.js', diff --git a/addons/website/controllers/__init__.py b/addons/website/controllers/__init__.py index 5ee7aaab8f2..12c98dba766 100644 --- a/addons/website/controllers/__init__.py +++ b/addons/website/controllers/__init__.py @@ -2,4 +2,5 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import backend +from . import form from . import main diff --git a/addons/website_form/controllers/main.py b/addons/website/controllers/form.py similarity index 100% rename from addons/website_form/controllers/main.py rename to addons/website/controllers/form.py diff --git a/addons/website_form/data/mail_mail_data.xml b/addons/website/data/mail_mail_data.xml similarity index 100% rename from addons/website_form/data/mail_mail_data.xml rename to addons/website/data/mail_mail_data.xml diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml index cb985963714..968b64ca366 100644 --- a/addons/website/data/website_data.xml +++ b/addons/website/data/website_data.xml @@ -50,8 +50,94 @@ -
- Send us an email +
@@ -64,6 +150,48 @@ + + Thanks (Contact us) + qweb + /contactus-thank-you + + True + website_form.contactus_thanks + + + +
+
+
+
+
+
+
+
+

Thank You!

+
+
+
+
+ + Your message has been sent successfully +
+

We will get back to you shortly.

+
+
+
+
+ +
+
+
+
+
+ + + + +