odoo-addon-mail-gateway-whatsapp 16.0.1.0.0.11__py3-none-any.whl → 16.0.1.1.0__py3-none-any.whl

odoo/addons/mail_gateway_whatsapp/models/__init__.py

@@ -3,3 +3,4 @@ from . import mail_thread
 from . import mail_gateway_whatsapp
 from . import mail_channel
 from . import res_partner
+from . import mail_whatsapp_template

odoo/addons/mail_gateway_whatsapp/models/mail_gateway.py

@@ -1,7 +1,12 @@
 # Copyright 2022 Creu Blanca
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+import requests
+from werkzeug.urls import url_join
 
-from odoo import fields, models
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
+
+BASE_URL = "https://graph.facebook.com/"
 
 
 class MailGateway(models.Model):
@@ -13,3 +18,58 @@ class MailGateway(models.Model):
     )
     whatsapp_from_phone = fields.Char()
     whatsapp_version = fields.Char(default="15.0")
+    whatsapp_account_id = fields.Char()
+    whatsapp_template_ids = fields.One2many("mail.whatsapp.template", "gateway_id")
+    whatsapp_template_count = fields.Integer(compute="_compute_whatsapp_template_count")
+
+    @api.depends("whatsapp_template_ids")
+    def _compute_whatsapp_template_count(self):
+        for gateway in self:
+            gateway.whatsapp_template_count = len(gateway.whatsapp_template_ids)
+
+    def button_import_whatsapp_template(self):
+        self.ensure_one()
+        WhatsappTemplate = self.env["mail.whatsapp.template"]
+        if not self.whatsapp_account_id:
+            raise UserError(_("WhatsApp Account is required to import templates."))
+        meta_info = {}
+        template_url = url_join(
+            BASE_URL,
+            f"v{self.whatsapp_version}/{self.whatsapp_account_id}/message_templates",
+        )
+        try:
+            meta_request = requests.get(
+                template_url,
+                headers={"Authorization": f"Bearer {self.token}"},
+                timeout=10,
+            )
+            meta_request.raise_for_status()
+            meta_info = meta_request.json()
+        except Exception as err:
+            raise UserError(str(err)) from err
+        current_templates = WhatsappTemplate.with_context(active_test=False).search(
+            [("gateway_id", "=", self.id)]
+        )
+        templates_by_id = {t.template_uid: t for t in current_templates}
+        create_vals = []
+        for template_data in meta_info.get("data", []):
+            ws_template = templates_by_id.get(template_data["id"])
+            if ws_template:
+                ws_template.write(
+                    WhatsappTemplate._prepare_values_to_import(self, template_data)
+                )
+            else:
+                create_vals.append(
+                    WhatsappTemplate._prepare_values_to_import(self, template_data)
+                )
+        WhatsappTemplate.create(create_vals)
+        return {
+            "type": "ir.actions.client",
+            "tag": "display_notification",
+            "params": {
+                "title": _("WathsApp Templates"),
+                "type": "success",
+                "message": _("Synchronization successfully."),
+                "next": {"type": "ir.actions.act_window_close"},
+            },
+        }

odoo/addons/mail_gateway_whatsapp/models/mail_gateway_whatsapp.py

@@ -285,14 +285,35 @@ class MailGatewayWhatsappService(models.AbstractModel):
     def _send_payload(
         self, channel, body=False, media_id=False, media_type=False, media_name=False
     ):
+        whatsapp_template = self.env["mail.whatsapp.template"]
+        if self.env.context.get("whatsapp_template_id"):
+            whatsapp_template = self.env["mail.whatsapp.template"].browse(
+                self.env.context.get("whatsapp_template_id")
+            )
         if body:
-            return {
+            payload = {
                 "messaging_product": "whatsapp",
                 "recipient_type": "individual",
                 "to": channel.gateway_channel_token,
-                "type": "text",
-                "text": {"preview_url": False, "body": html2plaintext(body)},
             }
+            if whatsapp_template:
+                payload.update(
+                    {
+                        "type": "template",
+                        "template": {
+                            "name": whatsapp_template.template_name,
+                            "language": {"code": whatsapp_template.language},
+                        },
+                    }
+                )
+            else:
+                payload.update(
+                    {
+                        "type": "text",
+                        "text": {"preview_url": False, "body": html2plaintext(body)},
+                    }
+                )
+            return payload
         if media_id:
             media_data = {"id": media_id}
             if media_type == "document":

odoo/addons/mail_gateway_whatsapp/models/mail_whatsapp_template.py

@@ -0,0 +1,193 @@
+# Copyright 2024 Tecnativa - Carlos López
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+import re
+
+import requests
+from werkzeug.urls import url_join
+
+from odoo import api, fields, models
+from odoo.exceptions import UserError
+from odoo.tools import ustr
+
+from odoo.addons.http_routing.models.ir_http import slugify
+
+from ..tools.const import supported_languages
+from .mail_gateway import BASE_URL
+
+
+class MailWhatsAppTemplate(models.Model):
+    _name = "mail.whatsapp.template"
+    _description = "Mail WhatsApp template"
+
+    name = fields.Char(required=True)
+    body = fields.Text(required=True)
+    header = fields.Char()
+    footer = fields.Char()
+    template_name = fields.Char(
+        compute="_compute_template_name", store=True, copy=False
+    )
+    is_supported = fields.Boolean(copy=False)
+    template_uid = fields.Char(readonly=True, copy=False)
+    category = fields.Selection(
+        [
+            ("authentication", "Authentication"),
+            ("marketing", "Marketing"),
+            ("utility", "Utility"),
+        ],
+        required=True,
+    )
+    state = fields.Selection(
+        [
+            ("draft", "Draft"),
+            ("pending", "Pending"),
+            ("approved", "Approved"),
+            ("in_appeal", "In Appeal"),
+            ("rejected", "Rejected"),
+            ("pending_deletion", "Pending Deletion"),
+            ("deleted", "Deleted"),
+            ("disabled", "Disabled"),
+            ("paused", "Paused"),
+            ("limit_exceeded", "Limit Exceeded"),
+            ("archived", "Archived"),
+        ],
+        default="draft",
+        required=True,
+    )
+    language = fields.Selection(supported_languages, required=True)
+    gateway_id = fields.Many2one(
+        "mail.gateway",
+        domain=[("gateway_type", "=", "whatsapp")],
+        required=True,
+        ondelete="cascade",
+    )
+    company_id = fields.Many2one(
+        "res.company", related="gateway_id.company_id", store=True
+    )
+
+    _sql_constraints = [
+        (
+            "unique_name_gateway_id",
+            "unique(name, language, gateway_id)",
+            "Duplicate name is not allowed for Gateway.",
+        )
+    ]
+
+    @api.depends("name", "state", "template_uid")
+    def _compute_template_name(self):
+        for template in self:
+            if not template.template_name or (
+                template.state == "draft" and not template.template_uid
+            ):
+                template.template_name = re.sub(
+                    r"\W+", "_", slugify(template.name or "")
+                )
+
+    def button_back2draft(self):
+        self.write({"state": "draft"})
+
+    def button_export_template(self):
+        self.ensure_one()
+        gateway = self.gateway_id
+        template_url = url_join(
+            BASE_URL,
+            f"v{gateway.whatsapp_version}/{gateway.whatsapp_account_id}/message_templates",
+        )
+        try:
+            payload = self._prepare_values_to_export()
+            response = requests.post(
+                template_url,
+                headers={"Authorization": "Bearer %s" % gateway.token},
+                json=payload,
+                timeout=10,
+            )
+            response.raise_for_status()
+            json_data = response.json()
+            self.write(
+                {
+                    "template_uid": json_data.get("id"),
+                    "state": json_data.get("status").lower(),
+                    "is_supported": True,
+                }
+            )
+        except requests.exceptions.HTTPError as ex:
+            msj = f"{ustr(ex)} \n{ex.response.text}"
+            raise UserError(msj) from ex
+        except Exception as err:
+            raise UserError(ustr(err)) from err
+
+    def _prepare_values_to_export(self):
+        components = self._prepare_components_to_export()
+        return {
+            "name": self.template_name,
+            "category": self.category.upper(),
+            "language": self.language,
+            "components": components,
+        }
+
+    def _prepare_components_to_export(self):
+        components = [{"type": "BODY", "text": self.body}]
+        if self.header:
+            components.append(
+                {
+                    "type": "HEADER",
+                    "format": "text",
+                    "text": self.header,
+                }
+            )
+        if self.footer:
+            components.append(
+                {
+                    "type": "FOOTER",
+                    "text": self.footer,
+                }
+            )
+        # TODO: add more components(buttons, location, etc)
+        return components
+
+    def button_sync_template(self):
+        self.ensure_one()
+        gateway = self.gateway_id
+        template_url = url_join(
+            BASE_URL,
+            f"{self.template_uid}",
+        )
+        try:
+            response = requests.get(
+                template_url,
+                headers={"Authorization": "Bearer %s" % gateway.token},
+                timeout=10,
+            )
+            response.raise_for_status()
+            json_data = response.json()
+            vals = self._prepare_values_to_import(gateway, json_data)
+            self.write(vals)
+        except Exception as err:
+            raise UserError(str(err)) from err
+        return {
+            "type": "ir.actions.client",
+            "tag": "reload",
+        }
+
+    @api.model
+    def _prepare_values_to_import(self, gateway, json_data):
+        vals = {
+            "name": json_data.get("name").replace("_", " ").title(),
+            "template_name": json_data.get("name"),
+            "category": json_data.get("category").lower(),
+            "language": json_data.get("language"),
+            "state": json_data.get("status").lower(),
+            "template_uid": json_data.get("id"),
+            "gateway_id": gateway.id,
+        }
+        is_supported = True
+        for component in json_data.get("components", []):
+            if component["type"] == "HEADER" and component["format"] == "TEXT":
+                vals["header"] = component["text"]
+            elif component["type"] == "BODY":
+                vals["body"] = component["text"]
+            elif component["type"] == "FOOTER":
+                vals["footer"] = component["text"]
+            else:
+                is_supported = False
+        vals["is_supported"] = is_supported
+        return vals

odoo/addons/mail_gateway_whatsapp/readme/CONFIGURE.rst

@@ -19,6 +19,7 @@ In order to make it you must follow this steps:
 
   *  Use the Meta App authentication key as `Token` field
   *  Use the Meta App Phone Number ID as `Whatsapp from Phone` field
+  *  Use the Meta Account Business ID as `Whatsapp account` field (only if you need sync templates)
   *  Write your own `Webhook key`
   *  Use the Application Secret Key on `Whatsapp Security Key`. It will be used in order to validate the data
   *  Press the `Integrate Webhook Key`. In this case, it will not integrate it, we need to make it manually

odoo/addons/mail_gateway_whatsapp/readme/CONTRIBUTORS.rst

@@ -1,2 +1,5 @@
 * Olga Marco <olga.marco@creublanca.es>
 * Enric Tobella <etobella@creublanca.es>
+* `Tecnativa <https://www.tecnativa.com>`_:
+
+    * Carlos Lopez

odoo/addons/mail_gateway_whatsapp/readme/ROADMAP.rst

@@ -0,0 +1,4 @@
+**WhatsApp templates**
+
+*  Add support for `Variables`
+*  Add support for `Buttons`

odoo/addons/mail_gateway_whatsapp/security/ir.model.access.csv

@@ -1,2 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_whatsapp_composer,access.whatsapp.composer,model_whatsapp_composer,base.group_user,1,1,1,0
+access_mail_whatsapp_template_group_system,mail_whatsapp_template_group_system,model_mail_whatsapp_template,base.group_system,1,1,1,1
+access_mail_whatsapp_template_group_user,mail_whatsapp_template_group_user,model_mail_whatsapp_template,base.group_user,1,0,0,0

odoo/addons/mail_gateway_whatsapp/security/security.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo noupdate="1">
+    <record id="mail_whatsapp_template_rule" model="ir.rule">
+        <field name="name">WhatsApp template: multicompany</field>
+        <field name="model_id" ref="model_mail_whatsapp_template" />
+        <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
+    </record>
+</odoo>

odoo/addons/mail_gateway_whatsapp/static/description/index.html

@@ -8,10 +8,11 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +275,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code {
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@ span.option {
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -366,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:7e8914aa79754fb57cdfe774336f8ffe4c6784994839b64e09cf393ed7c2aa4a
+!! source digest: sha256:70475641a2c7498a1ee67811eadb397e33c33435cdd2efb8edce729026ad09c4
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/social/tree/16.0/mail_gateway_whatsapp"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_gateway_whatsapp"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/social&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows to respond whatsapp chats.</p>
@@ -381,12 +382,13 @@ of partners in an integrated way.</p>
 </ul>
 </li>
 <li><a class="reference internal" href="#usage" id="toc-entry-4">Usage</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="toc-entry-5">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="toc-entry-6">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="toc-entry-7">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="toc-entry-8">Contributors</a></li>
-<li><a class="reference internal" href="#other-credits" id="toc-entry-9">Other credits</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-10">Maintainers</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-5">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-6">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-7">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-8">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-9">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-10">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-11">Maintainers</a></li>
 </ul>
 </li>
 </ul>
@@ -412,6 +414,7 @@ In order to make it you must follow this steps:</p>
 <ul class="simple">
 <li>Use the Meta App authentication key as <cite>Token</cite> field</li>
 <li>Use the Meta App Phone Number ID as <cite>Whatsapp from Phone</cite> field</li>
+<li>Use the Meta Account Business ID as <cite>Whatsapp account</cite> field (only if you need sync templates)</li>
 <li>Write your own <cite>Webhook key</cite></li>
 <li>Use the Application Secret Key on <cite>Whatsapp Security Key</cite>. It will be used in order to validate the data</li>
 <li>Press the <cite>Integrate Webhook Key</cite>. In this case, it will not integrate it, we need to make it manually</li>
@@ -434,8 +437,16 @@ In order to make it you must follow this steps:</p>
 <li>Now you will be able to respond and receive messages to this person.</li>
 </ol>
 </div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#toc-entry-5">Known issues / Roadmap</a></h1>
+<p><strong>WhatsApp templates</strong></p>
+<ul class="simple">
+<li>Add support for <cite>Variables</cite></li>
+<li>Add support for <cite>Buttons</cite></li>
+</ul>
+</div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-6">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/social/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
@@ -443,29 +454,40 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-6">Credits</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-7">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-7">Authors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-8">Authors</a></h2>
 <ul class="simple">
 <li>Creu Blanca</li>
 <li>Dixmit</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-8">Contributors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-9">Contributors</a></h2>
+<ul>
+<li><p class="first">Olga Marco &lt;<a class="reference external" href="mailto:olga.marco&#64;creublanca.es">olga.marco&#64;creublanca.es</a>&gt;</p>
+</li>
+<li><p class="first">Enric Tobella &lt;<a class="reference external" href="mailto:etobella&#64;creublanca.es">etobella&#64;creublanca.es</a>&gt;</p>
+</li>
+<li><p class="first"><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:</p>
+<blockquote>
 <ul class="simple">
-<li>Olga Marco &lt;<a class="reference external" href="mailto:olga.marco&#64;creublanca.es">olga.marco&#64;creublanca.es</a>&gt;</li>
-<li>Enric Tobella &lt;<a class="reference external" href="mailto:etobella&#64;creublanca.es">etobella&#64;creublanca.es</a>&gt;</li>
+<li>Carlos Lopez</li>
+</ul>
+</blockquote>
+</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
-<h2><a class="toc-backref" href="#toc-entry-9">Other credits</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-10">Other credits</a></h2>
 <p>This work has been funded by AEOdoo (Asociación Española de Odoo - <a class="reference external" href="https://www.aeodoo.org">https://www.aeodoo.org</a>)</p>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-10">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-11">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>

odoo/addons/mail_gateway_whatsapp/tests/__init__.py

@@ -1 +1,2 @@
 from . import test_mail_gateway_whatsapp
+from . import test_mail_whatsapp_template

odoo/addons/mail_gateway_whatsapp/tests/test_mail_gateway_whatsapp.py

@@ -6,7 +6,10 @@ import hmac
 import json
 from unittest.mock import MagicMock, patch
 
+from markupsafe import Markup
+
 from odoo.exceptions import UserError
+from odoo.tests import Form, RecordCapturer
 from odoo.tests.common import tagged
 from odoo.tools import mute_logger
 
@@ -14,7 +17,7 @@ from odoo.addons.mail_gateway.tests.common import MailGatewayTestCase
 
 
 @tagged("-at_install", "post_install")
-class TestMailGatewayTelegram(MailGatewayTestCase):
+class TestMailGatewayWhatsApp(MailGatewayTestCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -26,6 +29,18 @@ class TestMailGatewayTelegram(MailGatewayTestCase):
                 "token": "token",
                 "whatsapp_security_key": "key",
                 "webhook_secret": "MY-SECRET",
+                "member_ids": [(4, cls.env.user.id)],
+            }
+        )
+        cls.ws_template = cls.env["mail.whatsapp.template"].create(
+            {
+                "name": "New template",
+                "category": "marketing",
+                "language": "es",
+                "body": "Demo template",
+                "state": "approved",
+                "is_supported": True,
+                "gateway_id": cls.gateway.id,
             }
         )
         cls.partner = cls.env["res.partner"].create(
@@ -279,6 +294,65 @@ class TestMailGatewayTelegram(MailGatewayTestCase):
             )
         self.assertEqual(message.notification_ids.notification_status, "exception")
 
+    def test_send_message_text(self):
+        """
+        Test that the message is sent correctly
+        - First message need a template
+        - Second message does not need a template
+        """
+        ctx = {
+            "default_res_model": self.partner._name,
+            "default_res_id": self.partner.id,
+            "default_number_field_name": "mobile",
+            "default_composition_mode": "comment",
+            "default_gateway_id": self.gateway.id,
+        }
+        self.gateway.whatsapp_account_id = "123456"
+        form_composer = Form(self.env["whatsapp.composer"].with_context(**ctx))
+        form_composer.body = "Body test"
+        self.assertTrue(form_composer.is_required_template)
+        self.assertTrue(form_composer._get_modifier("template_id", "required"))
+        form_composer.template_id = self.ws_template
+        composer = form_composer.save()
+        self.assertEqual(composer.body, "Demo template")
+        channel = self.partner._whatsapp_get_channel(
+            composer.number_field_name, composer.gateway_id
+        )
+        message_domain = [
+            ("gateway_type", "=", "whatsapp"),
+            ("model", "=", channel._name),
+            ("res_id", "=", channel.id),
+        ]
+        with RecordCapturer(self.env["mail.message"], message_domain) as capture, patch(
+            "requests.post"
+        ) as post_mock:
+            post_mock.return_value = MagicMock()
+            composer.action_send_whatsapp()
+        self.assertEqual(len(capture.records), 1)
+        self.assertEqual(capture.records.body, Markup("<p>Demo template</p>"))
+        # second message
+        form_composer = Form(self.env["whatsapp.composer"].with_context(**ctx))
+        form_composer.body = "Body test"
+        self.assertFalse(form_composer.is_required_template)
+        self.assertFalse(form_composer._get_modifier("template_id", "required"))
+        composer = form_composer.save()
+        self.assertEqual(composer.body, "Body test")
+        channel = self.partner._whatsapp_get_channel(
+            composer.number_field_name, composer.gateway_id
+        )
+        message_domain = [
+            ("gateway_type", "=", "whatsapp"),
+            ("model", "=", channel._name),
+            ("res_id", "=", channel.id),
+        ]
+        with RecordCapturer(self.env["mail.message"], message_domain) as capture, patch(
+            "requests.post"
+        ) as post_mock:
+            post_mock.return_value = MagicMock()
+            composer.action_send_whatsapp()
+        self.assertEqual(len(capture.records), 1)
+        self.assertEqual(capture.records.body, Markup("<p>Body test</p>"))
+
     def test_compose(self):
         self.gateway.webhook_key = self.webhook
         self.gateway.set_webhook()