pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] mass_mailing, *: add TikTok to templates

Browse Source 
*: mass_mailing_themes, website_mass_mailing

This commit adds TikTok to the already existing social networks in all
email marketing templates (droppable blocks and default mail templates).

task-3235451

closes odoo/odoo#116837

Signed-off-by: Arthur Detroux (ard) <ard@odoo.com>
This commit is contained in:
Guillaume (gdi)
2023-05-11 09:36:21 +02:00
parent f10e85b475
commit 3952fbd15f
4 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mass_mailing/models/res_company.py
+2 -1
View File
@@ -13,5 +13,6 @@ class ResCompany(models.Model):
'social_facebook': self.social_facebook,
'social_linkedin': self.social_linkedin,
'social_twitter': self.social_twitter,
'social_instagram': self.social_instagram
'social_instagram': self.social_instagram,
'social_tiktok': self.social_tiktok,
}
addons/mass_mailing/views/snippets_themes.xml
+3
View File
@@ -250,6 +250,9 @@
</a>&amp;nbsp;&amp;nbsp;
<a t-att-href="social_links.get('social_instagram')" style="margin-left:10px" aria-label="Instagram" title="Instagram">
<span class="fa fa-instagram"></span>
</a>&amp;nbsp;&amp;nbsp;
<a t-att-href="social_links.get('social_tiktok')" style="margin-left:10px" aria-label="TikTok" title="TikTok">
<span class="fa fa-tiktok"></span>
</a>
</template>
addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml
+19
View File
@@ -54,6 +54,9 @@
</a>&amp;nbsp;&amp;nbsp;
<a style="margin-left:10px" title="Instagram" href="https://www.instagram.com/explore/tags/odoo/">
<span class="fa fa-instagram rounded-circle text-white" style="background-color: rgb(43, 59, 88) !important;"/>
</a>&amp;nbsp;&amp;nbsp;
<a style="margin-left:10px" title="TikTok" href="https://www.tiktok.com/@odoo">
<span class="fa fa-tiktok rounded-circle text-white" style="background-color: rgb(43, 59, 88) !important;"/>
</a>
</div>
</div>
@@ -201,6 +204,10 @@
<span class="fa fa-instagram" style="color: rgb(54, 166, 210) !important; font-size: 18px;"/>
</a>
&amp;nbsp; &amp;nbsp;
<a style="margin-left:10px" title="TikTok" href="https://www.tiktok.com/@odoo">
<span class="fa fa-tiktok" style="color: rgb(54, 166, 210) !important; font-size: 18px;"/>
</a>
&amp;nbsp; &amp;nbsp;
</div>
</div>
</div>
@@ -430,6 +437,9 @@
</a>&amp;nbsp;&amp;nbsp;
<a style="margin-left:10px" aria-label="Instagram" title="Instagram" href="https://www.instagram.com/explore/tags/odoo/">
<span class="fa fa-instagram rounded-circle" style="background-color: rgb(198, 150, 120) !important; color: rgb(36, 37, 48) !important;"></span>
</a>&amp;nbsp;&amp;nbsp;
<a style="margin-left:10px" aria-label="TikTok" title="TikTok" href="https://www.tiktok.com/@odoo">
<span class="fa fa-tiktok rounded-circle" style="background-color: rgb(198, 150, 120) !important; color: rgb(36, 37, 48) !important;"></span>
</a>
</div>
</div>
@@ -617,6 +627,9 @@
</a>&amp;nbsp;&amp;nbsp;
<a style="margin-left:10px" aria-label="Instagram" title="Instagram" href="https://www.instagram.com/explore/tags/odoo/">
<span class="fa fa-instagram"></span>
</a>&amp;nbsp;&amp;nbsp;
<a style="margin-left:10px" aria-label="TikTok" title="TikTok" href="https://www.tiktok.com/@odoo">
<span class="fa fa-tiktok"></span>
</a>
</div>
</div>
@@ -719,6 +732,9 @@
</a>&amp;nbsp;&amp;nbsp;
<a style="margin-left:10px" aria-label="Instagram" title="Instagram" href="https://www.instagram.com/explore/tags/odoo/">
<span class="fa fa-instagram" style="color: rgb(186, 0, 19) !important;"/>​
</a>&amp;nbsp;&amp;nbsp;
<a style="margin-left:10px" aria-label="TikTok" title="TikTok" href="https://www.tiktok.com/@odoo">
<span class="fa fa-tiktok" style="color: rgb(186, 0, 19) !important;"/>​
</a>
</div>
</div>
@@ -856,6 +872,9 @@
</a>&amp;nbsp;&amp;nbsp;
<a aria-label="Instagram" title="Instagram" href="https://www.instagram.com/explore/tags/odoo/">
<span class="fa fa-instagram rounded bg-black" style="color: rgb(255, 187, 0) !important;"/>
</a>&amp;nbsp;&amp;nbsp;
<a aria-label="TikTok" title="TikTok" href="https://www.tiktok.com/@odoo">
<span class="fa fa-tiktok rounded bg-black" style="color: rgb(255, 187, 0) !important;"/>
</a>
</div>
<p style="text-align: right">
addons/website_mass_mailing/models/res_company.py
+2 -1
View File
@@ -14,6 +14,7 @@ class ResCompany(models.Model):
'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')
'social_instagram': website_id.social_instagram or social_media_links.get('social_instagram'),
'social_tiktok': website_id.social_tiktok or social_media_links.get('social_tiktok'),
})
return social_media_links