From 5e0f7d1e78cd160bc60359f7a706496fdc3bab36 Mon Sep 17 00:00:00 2001
From: Noe Antoine <nan@odoo.com>
Date: Wed, 17 Feb 2021 11:25:42 +0000
Subject: [PATCH] [IMP] website_crm : catch logged partner info on contact form

1) Improves user experience by filling contact form with logged partner info.
This facilitates the flow when logged.

The contact us form is filled with data from the partner linked
with logged in web visitor, logged_partner. Its data is used in priority.
Empty fields (e.g. no partner is logged) will be set to default values
in request.params if any. This way, previous behaviour is preserved (as well
as widget correct display behaviour).

2) This commit also adds a star next to the required field Subject in the contact
us form like for the rest of required fields of the form : s_website_form_mark
This improves coherence and clarity when filling the form.

Task-ID : 2241639
PR : #61126
---
 addons/website_crm/views/website_crm_templates.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/website_crm/views/website_crm_templates.xml b/addons/website_crm/views/website_crm_templates.xml
index 0394dcf3f96..8b5bf7d5b9f 100644
--- a/addons/website_crm/views/website_crm_templates.xml
+++ b/addons/website_crm/views/website_crm_templates.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
         <template id="contactus_form" name="Contact Form (Opportunity)" inherit_id="website_form.contactus_form" customize_show="True">
+            <xpath expr="//span[@data-for='contactus_form']" position="before">
+                <t t-set="logged_partner" t-value="request.env['website.visitor']._get_visitor_from_request().partner_id"/>
+            </xpath>
             <xpath expr="//span[@data-for='contactus_form']" position="attributes">
                 <attribute name="t-att-data-values">{
-                    'contact_name': request.params.get('contact_name', ''),
-                    'phone': request.params.get('phone', ''),
-                    'email_from': request.params.get('email_from', ''),
-                    'partner_name': request.params.get('partner_name', ''),
+                    'contact_name': request.params.get('contact_name', logged_partner.name if logged_partner else ''),
+                    'phone': request.params.get('phone', logged_partner.phone if logged_partner and logged_partner.phone else ''),
+                    'email_from': request.params.get('email_from', logged_partner.email if logged_partner else ''),
+                    'partner_name': request.params.get('partner_name', logged_partner.commercial_company_name if logged_partner else ''),
                     'name': request.params.get('name', ''),
                     'description': request.params.get('description', ''),
                 }</attribute>
@@ -63,6 +66,7 @@
                                         <div class="row s_col_no_resize s_col_no_bgcolor">
                                             <label class="col-form-label col-sm-auto s_website_form_label" style="width: 200px" for="opportunity5">
                                                 <span class="s_website_form_label_content">Subject</span>
+                                                <span class="s_website_form_mark"> *</span>
                                             </label>
                                             <div class="col-sm">
                                                 <input id="opportunity5" type="text" class="form-control s_website_form_input" name="name" required="" />