odoo-addon-mail-gateway-whatsapp 16.0.1.1.0.9__py3-none-any.whl → 18.0.1.0.0.2__py3-none-any.whl

odoo/addons/mail_gateway_whatsapp/i18n/it.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2025-06-03 07:06+0000\n"
+"PO-Revision-Date: 2025-01-09 13:06+0000\n"
 "Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10.4\n"
+"X-Generator: Weblate 5.6.2\n"
 
 #. module: mail_gateway_whatsapp
 #: model_terms:ir.ui.view,arch_db:mail_gateway_whatsapp.mail_gateway_form_view
@@ -111,7 +111,7 @@ msgstr "Azerbaigiano"
 #. module: mail_gateway_whatsapp
 #: model_terms:ir.ui.view,arch_db:mail_gateway_whatsapp.view_mail_whatsapp_template_form
 msgid "Back to draft"
-msgstr "Reimposta a bozza"
+msgstr "Ritorna a bozza"
 
 #. module: mail_gateway_whatsapp
 #: model:ir.model.fields.selection,name:mail_gateway_whatsapp.selection__mail_whatsapp_template__language__bn
@@ -699,21 +699,11 @@ msgstr "Contenuto messaggio"
 msgid "Message Delivery error"
 msgstr "Errore di consegna messaggio"
 
-#. module: mail_gateway_whatsapp
-#: model:ir.model.fields,field_description:mail_gateway_whatsapp.field_res_partner__message_search
-msgid "Message Search"
-msgstr "Ricerca messaggio"
-
 #. module: mail_gateway_whatsapp
 #: model:ir.model.fields,help:mail_gateway_whatsapp.field_res_partner__message_content
 msgid "Message content, to be used only in searches"
 msgstr "Contenuto messaggio, da utilizzare solo nelle ricerche"
 
-#. module: mail_gateway_whatsapp
-#: model:ir.model.fields,help:mail_gateway_whatsapp.field_res_partner__message_search
-msgid "Message search, to be used only in searches"
-msgstr "Ricerca messaggio, da utilizzare solo nelle ricerche"
-
 #. module: mail_gateway_whatsapp
 #: model:ir.model.fields,field_description:mail_gateway_whatsapp.field_res_partner__message_ids
 msgid "Messages"

odoo/addons/mail_gateway_whatsapp/i18n/mail_gateway_whatsapp.pot

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 16.0\n"
+"Project-Id-Version: Odoo Server 18.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -125,7 +125,6 @@ msgstr ""
 #. module: mail_gateway_whatsapp
 #. odoo-python
 #: code:addons/mail_gateway_whatsapp/wizards/whatsapp_composer.py:0
-#, python-format
 msgid "Body is required"
 msgstr ""
 
@@ -254,7 +253,7 @@ msgid "Disabled"
 msgstr ""
 
 #. module: mail_gateway_whatsapp
-#: model:ir.model,name:mail_gateway_whatsapp.model_mail_channel
+#: model:ir.model,name:mail_gateway_whatsapp.model_discuss_channel
 msgid "Discussion Channel"
 msgstr ""
 
@@ -324,11 +323,6 @@ msgstr ""
 msgid "Export Template"
 msgstr ""
 
-#. module: mail_gateway_whatsapp
-#: model:ir.model.fields,field_description:mail_gateway_whatsapp.field_res_partner__failed_message_ids
-msgid "Failed Messages"
-msgstr ""
-
 #. module: mail_gateway_whatsapp
 #: model:ir.model.fields,help:mail_gateway_whatsapp.field_res_partner__phone_sanitized
 msgid ""
@@ -570,12 +564,6 @@ msgstr ""
 msgid "Lao"
 msgstr ""
 
-#. module: mail_gateway_whatsapp
-#: model:ir.model.fields,field_description:mail_gateway_whatsapp.field_mail_whatsapp_template____last_update
-#: model:ir.model.fields,field_description:mail_gateway_whatsapp.field_whatsapp_composer____last_update
-msgid "Last Modified on"
-msgstr ""
-
 #. module: mail_gateway_whatsapp
 #: model:ir.model.fields,field_description:mail_gateway_whatsapp.field_mail_whatsapp_template__write_uid
 #: model:ir.model.fields,field_description:mail_gateway_whatsapp.field_whatsapp_composer__write_uid
@@ -623,11 +611,6 @@ msgstr ""
 msgid "Mail WhatsApp template"
 msgstr ""
 
-#. module: mail_gateway_whatsapp
-#: model:ir.model.fields,field_description:mail_gateway_whatsapp.field_res_partner__message_main_attachment_id
-msgid "Main Attachment"
-msgstr ""
-
 #. module: mail_gateway_whatsapp
 #: model:ir.model.fields.selection,name:mail_gateway_whatsapp.selection__mail_whatsapp_template__language__ms
 msgid "Malay"
@@ -653,31 +636,11 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#. module: mail_gateway_whatsapp
-#: model:ir.model.fields,field_description:mail_gateway_whatsapp.field_res_partner__message_content
-msgid "Message Content"
-msgstr ""
-
 #. module: mail_gateway_whatsapp
 #: model:ir.model.fields,field_description:mail_gateway_whatsapp.field_res_partner__message_has_error
 msgid "Message Delivery error"
 msgstr ""
 
-#. module: mail_gateway_whatsapp
-#: model:ir.model.fields,field_description:mail_gateway_whatsapp.field_res_partner__message_search
-msgid "Message Search"
-msgstr ""
-
-#. module: mail_gateway_whatsapp
-#: model:ir.model.fields,help:mail_gateway_whatsapp.field_res_partner__message_content
-msgid "Message content, to be used only in searches"
-msgstr ""
-
-#. module: mail_gateway_whatsapp
-#: model:ir.model.fields,help:mail_gateway_whatsapp.field_res_partner__message_search
-msgid "Message search, to be used only in searches"
-msgstr ""
-
 #. module: mail_gateway_whatsapp
 #: model:ir.model.fields,field_description:mail_gateway_whatsapp.field_res_partner__message_ids
 msgid "Messages"
@@ -691,7 +654,6 @@ msgstr ""
 #. module: mail_gateway_whatsapp
 #. odoo-python
 #: code:addons/mail_gateway_whatsapp/models/mail_gateway_whatsapp.py:0
-#, python-format
 msgid "Mimetype is not valid"
 msgstr ""
 
@@ -781,7 +743,6 @@ msgstr ""
 #. module: mail_gateway_whatsapp
 #. odoo-python
 #: code:addons/mail_gateway_whatsapp/models/mail_thread.py:0
-#, python-format
 msgid "Phone cannot be sanitized"
 msgstr ""
 
@@ -871,7 +832,6 @@ msgstr ""
 #. odoo-javascript
 #: code:addons/mail_gateway_whatsapp/static/src/components/send_whatsapp_button/send_whatsapp_button.esm.js:0
 #: model:ir.actions.act_window,name:mail_gateway_whatsapp.whatsapp_composer_act_window
-#, python-format
 msgid "Send Whatsapp Message"
 msgstr ""
 
@@ -951,7 +911,6 @@ msgstr ""
 #. module: mail_gateway_whatsapp
 #. odoo-python
 #: code:addons/mail_gateway_whatsapp/models/mail_gateway.py:0
-#, python-format
 msgid "Synchronization successfully."
 msgstr ""
 
@@ -1010,7 +969,6 @@ msgstr ""
 #. module: mail_gateway_whatsapp
 #. odoo-python
 #: code:addons/mail_gateway_whatsapp/models/mail_gateway_whatsapp.py:0
-#, python-format
 msgid "Unable to send the whatsapp message"
 msgstr ""
 
@@ -1042,20 +1000,9 @@ msgstr ""
 #. module: mail_gateway_whatsapp
 #. odoo-python
 #: code:addons/mail_gateway_whatsapp/models/mail_gateway.py:0
-#, python-format
 msgid "WathsApp Templates"
 msgstr ""
 
-#. module: mail_gateway_whatsapp
-#: model:ir.model.fields,field_description:mail_gateway_whatsapp.field_res_partner__website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: mail_gateway_whatsapp
-#: model:ir.model.fields,help:mail_gateway_whatsapp.field_res_partner__website_message_ids
-msgid "Website communication history"
-msgstr ""
-
 #. module: mail_gateway_whatsapp
 #: model:ir.model.fields.selection,name:mail_gateway_whatsapp.selection__mail_gateway__gateway_type__whatsapp
 msgid "WhatsApp"
@@ -1064,7 +1011,6 @@ msgstr ""
 #. module: mail_gateway_whatsapp
 #. odoo-python
 #: code:addons/mail_gateway_whatsapp/models/mail_gateway.py:0
-#, python-format
 msgid "WhatsApp Account is required to import templates."
 msgstr ""
 
@@ -1076,7 +1022,6 @@ msgstr ""
 #. module: mail_gateway_whatsapp
 #. odoo-javascript
 #: code:addons/mail_gateway_whatsapp/static/src/components/send_whatsapp_button/send_whatsapp_button.xml:0
-#, python-format
 msgid "Whatsapp"
 msgstr ""
 

odoo/addons/mail_gateway_whatsapp/models/__init__.py

@@ -1,6 +1,6 @@
 from . import mail_gateway
 from . import mail_thread
 from . import mail_gateway_whatsapp
-from . import mail_channel
+from . import discuss_channel
 from . import res_partner
 from . import mail_whatsapp_template

odoo/addons/mail_gateway_whatsapp/models/{mail_channel.py → discuss_channel.py}

@@ -2,21 +2,18 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import models
-from odoo.modules.module import get_resource_path
+from odoo.tools.misc import file_path
 
 from odoo.addons.base.models.avatar_mixin import get_hsl_from_seed
 
 
-class MailChannel(models.Model):
-
-    _inherit = "mail.channel"
+class DiscussChannel(models.Model):
+    _inherit = "discuss.channel"
 
     def _generate_avatar_gateway(self):
         if self.gateway_id.gateway_type == "whatsapp":
-            path = get_resource_path(
-                "mail_gateway_whatsapp", "static/description", "icon.svg"
-            )
-            with open(path, "r") as f:
+            path = file_path("mail_gateway_whatsapp/static/description/icon.svg")
+            with open(path) as f:
                 avatar = f.read()
 
             bgcolor = get_hsl_from_seed(self.uuid)

odoo/addons/mail_gateway_whatsapp/models/mail_gateway.py

@@ -17,7 +17,7 @@ class MailGateway(models.Model):
         selection_add=[("whatsapp", "WhatsApp")], ondelete={"whatsapp": "cascade"}
     )
     whatsapp_from_phone = fields.Char()
-    whatsapp_version = fields.Char(default="15.0")
+    whatsapp_version = fields.Char(default="23.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")

odoo/addons/mail_gateway_whatsapp/models/mail_gateway_whatsapp.py

@@ -43,17 +43,12 @@ class MailGatewayWhatsappService(models.AbstractModel):
         signature = request.httprequest.headers.get("x-hub-signature-256")
         if not signature:
             return False
-        if (
-            "sha256=%s"
-            % hmac.new(
-                bot_data["webhook_secret"].encode(),
-                request.httprequest.data,
-                hashlib.sha256,
-            ).hexdigest()
-            != signature
-        ):
-            return False
-        return True
+        hex_dig = hmac.new(
+            bot_data["webhook_secret"].encode(),
+            request.httprequest.data,
+            hashlib.sha256,
+        ).hexdigest()
+        return f"sha256={hex_dig}" == signature
 
     def _get_channel_vals(self, gateway, token, update):
         result = super()._get_channel_vals(gateway, token, update)
@@ -88,13 +83,10 @@ class MailGatewayWhatsappService(models.AbstractModel):
                 image_id = message.get(key).get("id")
                 if image_id:
                     image_info_request = requests.get(
-                        "https://graph.facebook.com/v%s/%s"
-                        % (
-                            chat.gateway_id.whatsapp_version,
-                            image_id,
-                        ),
+                        f"https://graph.facebook.com/"
+                        f"v{chat.gateway_id.whatsapp_version}/{image_id}",
                         headers={
-                            "Authorization": "Bearer %s" % chat.gateway_id.token,
+                            "Authorization": f"Bearer {chat.gateway_id.token}",
                         },
                         timeout=10,
                         proxies=self._get_proxies(),
@@ -109,7 +101,7 @@ class MailGatewayWhatsappService(models.AbstractModel):
                 image_request = requests.get(
                     image_url,
                     headers={
-                        "Authorization": "Bearer %s" % chat.gateway_id.token,
+                        "Authorization": f"Bearer {chat.gateway_id.token}",
                     },
                     timeout=10,
                     proxies=self._get_proxies(),
@@ -127,17 +119,19 @@ class MailGatewayWhatsappService(models.AbstractModel):
         if message.get("location"):
             body += (
                 '<a target="_blank" href="https://www.google.com/'
-                'maps/search/?api=1&query=%s,%s">Location</a>'
-                % (
-                    message["location"]["latitude"],
-                    message["location"]["longitude"],
-                )
+                f'maps/search/?api=1&query={message["location"]["latitude"]},'
+                f'{message["location"]["longitude"]}">Location</a>'
             )
         if message.get("contacts"):
             pass
         if len(body) > 0 or attachments:
             author = self._get_author(chat.gateway_id, value)
-            new_message = chat.message_post(
+            if author._name == "mail.guest":
+                chat = chat.with_user(self.env.ref("base.public_user").id).with_context(
+                    guest=author
+                )
+            # TODO: Check the sudo...
+            new_message = chat.sudo().message_post(
                 body=body,
                 author_id=author and author._name == "res.partner" and author.id,
                 gateway_type="whatsapp",
@@ -179,6 +173,13 @@ class MailGatewayWhatsappService(models.AbstractModel):
                     )
                     self._post_process_reply(related_message)
                     new_message.gateway_message_id = new_related_message
+                    gateway_thread_data = new_message.sudo().gateway_thread_data
+                    new_message._bus_send_store(
+                        new_message,
+                        {
+                            "gateway_thread_data": gateway_thread_data,
+                        },
+                    )
 
     def _send(
         self,
@@ -208,13 +209,10 @@ class MailGatewayWhatsappService(models.AbstractModel):
                 )
 
                 response = requests.post(
-                    "https://graph.facebook.com/v%s/%s/media"
-                    % (
-                        gateway.whatsapp_version,
-                        gateway.whatsapp_from_phone,
-                    ),
+                    f"https://graph.facebook.com/"
+                    f"v{gateway.whatsapp_version}/{gateway.whatsapp_from_phone}/media",
                     headers={
-                        "Authorization": "Bearer %s" % gateway.token,
+                        "Authorization": f"Bearer {gateway.token}",
                         "content-type": m.content_type,
                     },
                     data=m,
@@ -223,12 +221,9 @@ class MailGatewayWhatsappService(models.AbstractModel):
                 )
                 response.raise_for_status()
                 response = requests.post(
-                    "https://graph.facebook.com/v%s/%s/messages"
-                    % (
-                        gateway.whatsapp_version,
-                        gateway.whatsapp_from_phone,
-                    ),
-                    headers={"Authorization": "Bearer %s" % gateway.token},
+                    f"https://graph.facebook.com/"
+                    f"v{gateway.whatsapp_version}/{gateway.whatsapp_from_phone}/messages",
+                    headers={"Authorization": f"Bearer {gateway.token}"},
                     json=self._send_payload(
                         record.gateway_channel_id,
                         media_id=response.json()["id"],
@@ -243,12 +238,9 @@ class MailGatewayWhatsappService(models.AbstractModel):
             body = self._get_message_body(record)
             if body:
                 response = requests.post(
-                    "https://graph.facebook.com/v%s/%s/messages"
-                    % (
-                        gateway.whatsapp_version,
-                        gateway.whatsapp_from_phone,
-                    ),
-                    headers={"Authorization": "Bearer %s" % gateway.token},
+                    f"https://graph.facebook.com/"
+                    f"v{gateway.whatsapp_version}/{gateway.whatsapp_from_phone}/messages",
+                    headers={"Authorization": f"Bearer {gateway.token}"},
                     json=self._send_payload(record.gateway_channel_id, body=body),
                     timeout=10,
                     proxies=self._get_proxies(),
@@ -264,9 +256,7 @@ class MailGatewayWhatsappService(models.AbstractModel):
                     _("Unable to send the whatsapp message")
                 ) from exc
             else:
-                _logger.warning(
-                    "Issue sending message with id {}: {}".format(record.id, exc)
-                )
+                _logger.warning(f"Issue sending message with id {record.id}: {exc}")
                 record.sudo().write(
                     {"notification_status": "exception", "failure_reason": exc}
                 )

odoo/addons/mail_gateway_whatsapp/models/mail_thread.py

@@ -4,11 +4,8 @@
 from odoo import _, models
 from odoo.exceptions import UserError
 
-from odoo.addons.phone_validation.tools import phone_validation
-
 
 class MailThread(models.AbstractModel):
-
     _inherit = "mail.thread"
 
     def _get_whatsapp_channel_vals(self, token, gateway, partner):
@@ -22,12 +19,11 @@ class MailThread(models.AbstractModel):
         return result
 
     def _whatsapp_get_channel(self, field_name, gateway):
-        phone = self[field_name]
-        sanitize_res = phone_validation.phone_sanitize_numbers_w_record([phone], self)
-        sanitized_number = sanitize_res[phone].get("sanitized")
+        sanitized_number = self._phone_format(number=self[field_name])
         if not sanitized_number:
             raise UserError(_("Phone cannot be sanitized"))
-        sanitized_number = sanitized_number[1:]
+        # Avoid the plus sign prefix to match the whatsapp token
+        sanitized_number = sanitized_number.replace("+", "")
         partner = self._whatsapp_get_partner()
         if not self.env["res.partner.gateway.channel"].search(
             [

odoo/addons/mail_gateway_whatsapp/models/mail_whatsapp_template.py

@@ -9,8 +9,6 @@ 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
 
@@ -79,7 +77,7 @@ class MailWhatsAppTemplate(models.Model):
                 template.state == "draft" and not template.template_uid
             ):
                 template.template_name = re.sub(
-                    r"\W+", "_", slugify(template.name or "")
+                    r"\W+", "_", self.env["ir.http"]._slugify(template.name or "")
                 )
 
     def button_back2draft(self):
@@ -96,7 +94,7 @@ class MailWhatsAppTemplate(models.Model):
             payload = self._prepare_values_to_export()
             response = requests.post(
                 template_url,
-                headers={"Authorization": "Bearer %s" % gateway.token},
+                headers={"Authorization": f"Bearer {gateway.token}"},
                 json=payload,
                 timeout=10,
             )
@@ -154,7 +152,7 @@ class MailWhatsAppTemplate(models.Model):
         try:
             response = requests.get(
                 template_url,
-                headers={"Authorization": "Bearer %s" % gateway.token},
+                headers={"Authorization": f"Bearer {gateway.token}"},
                 timeout=10,
             )
             response.raise_for_status()

odoo/addons/mail_gateway_whatsapp/readme/CONFIGURE.md

@@ -0,0 +1,35 @@
+## First steps
+
+You need to create a WhatsApp Business Account (WABA), a Meta App and
+define a phone number. You can follow this
+[steps](https://developers.facebook.com/micro_site/url/?click_from_context_menu=true&country=ES&destination=https%3A%2F%2Fwww.facebook.com%2Fbusiness%2Fhelp%2F2087193751603668&event_type=click&last_nav_impression_id=0m3TRxrxOlly1eRmB&max_percent_page_viewed=22&max_viewport_height_px=1326&max_viewport_width_px=2560&orig_http_referrer=https%3A%2F%2Fdevelopers.facebook.com%2Fdocs%2Fwhatsapp%2Fcloud-api%2Fget-started-for-bsps%3Flocale%3Den_US&orig_request_uri=https%3A%2F%2Fdevelopers.facebook.com%2Fajax%2Fpagelet%2Fgeneric.php%2FDeveloperNotificationsPayloadPagelet%3Ffb_dtsg_ag%3D--sanitized--%26data%3D%257B%2522businessUserID%2522%253Anull%252C%2522cursor%2522%253Anull%252C%2522length%2522%253A15%252C%2522clientRequestID%2522%253A%2522js_k6%2522%257D%26__usid%3D6-Trd7hi4itpm%253APrd7ifiub2tvy%253A0-Ard7g9twdm0p1-RV%253D6%253AF%253D%26locale%3Den_US%26jazoest%3D24920&region=emea&scrolled=false&session_id=1jLoVJNU6iVMaw3ml&site=developers).
+
+If you create a test Business Account, passwords will change every 24
+hours.
+
+In order to make the webhook accessible, the system must be public.
+
+## Configure the gateway
+
+Once you have created the Meta App, you need to add the gateway and
+webhook. In order to make it you must follow this steps:
+
+- Access Settings \> Emails \> Mail Gateway
+- Create a Gateway of type WhatsApp
+
+> - 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
+> - Copy the webhook URL
+
+- Access [Facebook Apps website](https://developers.facebook.com/apps/)
+- Access your App then Whatsapp \> Configuration
+- Create your webhook using your URL and put the Whatsapp Security Key
+  as validation Key
+- Administer the Webhook and activate the messages webhook

odoo/addons/mail_gateway_whatsapp/readme/CONTRIBUTORS.md

@@ -0,0 +1,7 @@
+- Olga Marco \<<olga.marco@creublanca.es>\>
+
+- Enric Tobella \<<etobella@creublanca.es>\>
+
+- [Tecnativa](https://www.tecnativa.com):
+
+  > - Carlos Lopez

odoo/addons/mail_gateway_whatsapp/readme/{CREDITS.rst → CREDITS.md}

@@ -1 +1,2 @@
-This work has been funded by AEOdoo (Asociación Española de Odoo - https://www.aeodoo.org)
+This work has been funded by AEOdoo (Asociación Española de Odoo -
+<https://www.aeodoo.org>)

odoo/addons/mail_gateway_whatsapp/readme/{DESCRIPTION.rst → DESCRIPTION.md}

@@ -1,4 +1,4 @@
 This module allows to respond whatsapp chats.
 
-This way, a group of users can respond customers or any other set
-of partners in an integrated way.
+This way, a group of users can respond customers or any other set of
+partners in an integrated way.

odoo/addons/mail_gateway_whatsapp/readme/ROADMAP.md

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

odoo/addons/mail_gateway_whatsapp/readme/USAGE.md

@@ -0,0 +1,3 @@
+1.  Access Gateway
+2.  Wait until someone starts a conversation.
+3.  Now you will be able to respond and receive messages to this person.