[REF] {website_}mass_mailing: display social links in mass mailing templates

PURPOSE

Using Email Marketing or Marketing Automation without website installed will
not populate the links for your social media accounts.

SPECIFICATIONS

Move social_links template directly into mass_mailing and use company
information available through social_media module as default values, then
overridden by website information.

TaskID 2036094
PR #51025
Enterprise PR odoo/enterprise#10497

Related: odoo/upgrade#1212
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>

3 files changed, 22 insertions, 39 deletions

diff --git a/addons/website_mass_mailing/models/__init__.py b/addons/website_mass_mailing/models/__init__.py
index e8ef8b35d78..eecc2740faa 100644
--- a/addons/website_mass_mailing/models/__init__.py
+++ b/addons/website_mass_mailing/models/__init__.py
@@ -3,3 +3,4 @@
 
 from . import mailing_list
 from . import website_mass_mailing
+from . import res_company
diff --git a/addons/website_mass_mailing/models/res_company.py b/addons/website_mass_mailing/models/res_company.py
new file mode 100644
index 00000000000..892eea99c48
--- /dev/null
+++ b/addons/website_mass_mailing/models/res_company.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models
+
+
+class ResCompany(models.Model):
+    _inherit = "res.company"
+
+    def _get_social_media_links(self):
+        social_media_links = super()._get_social_media_links()
+        website_id = self.env['website'].get_current_website()
+        social_media_links.update({
+            'social_facebook': website_id.social_facebook or social_media_links.get('social_facebook'),
+            'social_linkedin': website_id.social_linkedin or social_media_links.get('social_linkedin'),
+            'social_twitter': website_id.social_twitter or social_media_links.get('social_twitter'),
+            'social_instagram': website_id.social_instagram or social_media_links.get('social_instagram')
+        })
+        return social_media_links
diff --git a/addons/website_mass_mailing/views/snippets_templates.xml b/addons/website_mass_mailing/views/snippets_templates.xml
index 4c055fb8224..da0c52465bf 100644
--- a/addons/website_mass_mailing/views/snippets_templates.xml
+++ b/addons/website_mass_mailing/views/snippets_templates.xml
@@ -75,37 +75,12 @@
 </template>
 
 <!-- Extend default mass_mailing snippets with website feature -->
-<template id="social_links">
-    <t t-if="not website">
-        <t t-set="website" t-value="request.env['website'].search([], limit=1)"/>
-    </t>
-    <t t-if="website.social_facebook">
-        <a t-att-href="website.social_facebook" aria-label="Facebook" title="Facebook">
-          <span class="fa fa-facebook"></span>
-        </a>
-    </t>
-    <t t-if="website.social_linkedin">
-        <a t-att-href="website.social_linkedin" style="margin-left:10px" aria-label="LinkedIn" title="LinkedIn">
-            <span class="fa fa-linkedin"></span>
-        </a>
-    </t>
-    <t t-if="website.social_twitter">
-        <a t-att-href="website.social_twitter" style="margin-left:10px" aria-label="Twitter" title="Twitter">
-            <span class="fa fa-twitter"></span>
-        </a>
-    </t>
-    <t t-if="website.social_instagram">
-        <a t-att-href="website.social_instagram" style="margin-left:10px" aria-label="Instagram" title="Instagram">
-            <span class="fa fa-instagram"></span>
-        </a>
-    </t>
-</template>
 
 <template id="s_mail_block_header_social" inherit_id="mass_mailing.s_mail_block_header_social">
     <xpath expr="//td[hasclass('o_mail_logo_container')]" position="after">
         <td width="30%" class="text-right o_mail_no_resize">
             <div class="o_mail_header_social">
-                <t t-call="website_mass_mailing.social_links"/>
+                <t t-call="mass_mailing.social_links"/>
             </div>
         </td>
     </xpath>
@@ -115,7 +90,7 @@
     <xpath expr="//table//td" position="after">
         <td width="30%" class="text-right o_mail_no_resize">
             <div class="o_mail_header_social">
-                <t t-call="website_mass_mailing.social_links"/>
+                <t t-call="mass_mailing.social_links"/>
             </div>
         </td>
     </xpath>
@@ -125,24 +100,12 @@
     <xpath expr="//td[hasclass('o_mail_footer_links')]" position="inside">
         <t> | <a role="button" href="/contactus" class="btn btn-link">Contact</a></t>
     </xpath>
-    <xpath expr="//tr" position="before">
-        <tr>
-            <td class="o_mail_footer_social">
-                <t t-call="website_mass_mailing.social_links"/>
-            </td>
-        </tr>
-    </xpath>
 </template>
 
 <template id="s_mail_block_footer_social_left" inherit_id="mass_mailing.s_mail_block_footer_social_left">
     <xpath expr="//div[hasclass('o_mail_footer_links')]" position="inside">
         <t> | <a role="button" href="/contactus" class="btn btn-link">Contact</a></t>
     </xpath>
-    <xpath expr="//td" position="after">
-        <td class="o_mail_footer_social">
-            <t t-call="website_mass_mailing.social_links"/>
-        </td>
-    </xpath>
 </template>
 
 </odoo>