[18.0][IMP] mail_gateway_whatsapp: Add support for buttons and variables in WhatsApp templates - #1780
Merged
OCA-git-bot merged 1 commit intoFeb 26, 2026
Conversation
eduezerouali-tecnativa
force-pushed
the
18.0-mail_gateway_whatsapp-add-variables
branch
from
December 24, 2025 10:52
a8bd1dc to
a865522
Compare
eduezerouali-tecnativa
changed the title
eduezerouali-tecnativa
force-pushed
the
18.0-mail_gateway_whatsapp-add-variables
branch
from
December 24, 2025 11:49
a865522 to
e8ac1aa
Compare
1 task
pedrobaeza
reviewed
Jan 17, 2026
pedrobaeza
force-pushed
the
18.0-mail_gateway_whatsapp-add-variables
branch
from
January 17, 2026 09:08
e8ac1aa to
2b25749
Compare
Member
|
@carlos-lopez-tecnativa can you review it and check if anything should be fw-ported from the final 17 PR (I think at least the removal of |
Contributor
I checked this, and nothing is missing from v17. The |
carlos-lopez-tecnativa
suggested changes
Jan 29, 2026
carlos-lopez-tecnativa
left a comment
carlos-lopez-tecnativa
left a comment
Contributor
There was a problem hiding this comment.
I haven’t tested this PR yet, but I think we can update the translation method in v18. @eduezerouali-tecnativa
| def _check_buttons(self): | ||
| for template in self: | ||
| if len(template.button_ids) > 10: | ||
| raise ValidationError(_("A maximum of 10 buttons is allowed.")) |
Contributor
There was a problem hiding this comment.
Suggested change
| raise ValidationError(_("A maximum of 10 buttons is allowed.")) | |
| raise ValidationError(self.env._("A maximum of 10 buttons is allowed.")) |
eduezerouali-tecnativa
force-pushed
the
18.0-mail_gateway_whatsapp-add-variables
branch
2 times, most recently
from
February 2, 2026 13:20
20b04bf to
d73f81b
Compare
Member
|
@eduezerouali-tecnativa please finish this. |
carlos-lopez-tecnativa
suggested changes
Feb 26, 2026
Comment on lines
+253
to
+346
| def _compute_variable_ids(self): | ||
| for template in self: | ||
| to_remove = self.env["mail.whatsapp.template.variable"] | ||
| to_keep = self.env["mail.whatsapp.template.variable"] | ||
| new_values = [] | ||
| header_variables = list(re.findall(REG_VARIABLE, template.header or "")) | ||
| body_variables = set(re.findall(REG_VARIABLE, template.body or "")) | ||
| # header | ||
| current_header_variable = template.variable_ids.filtered( | ||
| lambda line: line.line_type == "header" | ||
| ) | ||
| if header_variables and not current_header_variable: | ||
| new_values.append( | ||
| { | ||
| "name": header_variables[0], | ||
| "line_type": "header", | ||
| "template_id": template.id, | ||
| } | ||
| ) | ||
| elif not header_variables and current_header_variable: | ||
| to_remove += current_header_variable | ||
| elif current_header_variable: | ||
| to_keep += current_header_variable | ||
| # body | ||
| current_body_variables = template.variable_ids.filtered( | ||
| lambda line: line.line_type == "body" | ||
| ) | ||
| new_body_variable_names = [ | ||
| var_name | ||
| for var_name in body_variables | ||
| if var_name not in current_body_variables.mapped("name") | ||
| ] | ||
| deleted_variables = current_body_variables.filtered( | ||
| lambda var, body_variables=body_variables: var.name | ||
| not in body_variables | ||
| ) | ||
|
|
||
| new_values += [ | ||
| {"name": var_name, "line_type": "body", "template_id": template.id} | ||
| for var_name in set(new_body_variable_names) | ||
| ] | ||
| to_remove += deleted_variables | ||
| to_keep += current_body_variables - deleted_variables | ||
| template.variable_ids = [(3, to_remove.id) for to_remove in to_remove] + [ | ||
| Command.create(vals) for vals in new_values | ||
| ] | ||
|
|
||
| @api.depends("header", "body") | ||
| def _compute_variable_ids(self): | ||
| for template in self: | ||
| to_remove = self.env["mail.whatsapp.template.variable"] | ||
| to_keep = self.env["mail.whatsapp.template.variable"] | ||
| new_values = [] | ||
| header_variables = list(re.findall(REG_VARIABLE, template.header or "")) | ||
| body_variables = set(re.findall(REG_VARIABLE, template.body or "")) | ||
| # header | ||
| current_header_variable = template.variable_ids.filtered( | ||
| lambda line: line.line_type == "header" | ||
| ) | ||
| if header_variables and not current_header_variable: | ||
| new_values.append( | ||
| { | ||
| "name": header_variables[0], | ||
| "line_type": "header", | ||
| "template_id": template.id, | ||
| } | ||
| ) | ||
| elif not header_variables and current_header_variable: | ||
| to_remove += current_header_variable | ||
| elif current_header_variable: | ||
| to_keep += current_header_variable | ||
| # body | ||
| current_body_variables = template.variable_ids.filtered( | ||
| lambda line: line.line_type == "body" | ||
| ) | ||
| new_body_variable_names = [ | ||
| var_name | ||
| for var_name in body_variables | ||
| if var_name not in current_body_variables.mapped("name") | ||
| ] | ||
| deleted_variables = current_body_variables.filtered( | ||
| lambda var, body_variables=body_variables: var.name | ||
| not in body_variables | ||
| ) | ||
|
|
||
| new_values += [ | ||
| {"name": var_name, "line_type": "body", "template_id": template.id} | ||
| for var_name in set(new_body_variable_names) | ||
| ] | ||
| to_remove += deleted_variables | ||
| to_keep += current_body_variables - deleted_variables | ||
| template.variable_ids = [(3, to_remove.id) for to_remove in to_remove] + [ | ||
| Command.create(vals) for vals in new_values | ||
| ] |
eduezerouali-tecnativa
force-pushed
the
18.0-mail_gateway_whatsapp-add-variables
branch
from
February 26, 2026 11:51
d73f81b to
e005eb4
Compare
carlos-lopez-tecnativa
suggested changes
Feb 26, 2026
Comment on lines
+289
to
+315
| for button in self.button_ids: | ||
| button_data = {"type": button.button_type.upper(), "text": button.name} | ||
| if button.button_type == "url": | ||
| button_data["url"] = button.website_url | ||
| if button.url_type == "dynamic": | ||
| button_data["url"] += "{{1}}" | ||
| button_data["example"] = button.variable_ids[0].sample_value | ||
| elif button.button_type == "phone_number": | ||
| button_data["phone_number"] = button.call_number | ||
| buttons.append(button_data) | ||
| if buttons: | ||
| components.append({"type": "BUTTONS", "buttons": buttons}) | ||
| # TODO: add more components(location, etc) | ||
| components.append({"type": "FOOTER", "text": self.footer}) | ||
| buttons = [] | ||
| for button in self.button_ids: | ||
| button_data = {"type": button.button_type.upper(), "text": button.name} | ||
| if button.button_type == "url": | ||
| button_data["url"] = button.website_url | ||
| if button.url_type == "dynamic": | ||
| button_data["url"] += "{{1}}" | ||
| button_data["example"] = button.variable_ids[0].sample_value | ||
| elif button.button_type == "phone_number": | ||
| button_data["phone_number"] = button.call_number | ||
| buttons.append(button_data) | ||
| if buttons: | ||
| components.append({"type": "BUTTONS", "buttons": buttons}) |
Contributor
There was a problem hiding this comment.
The same here
eduezerouali-tecnativa
force-pushed
the
18.0-mail_gateway_whatsapp-add-variables
branch
from
February 26, 2026 15:58
e005eb4 to
5cc21ff
Compare
carlos-lopez-tecnativa
suggested changes
Feb 26, 2026
carlos-lopez-tecnativa
force-pushed
the
18.0-mail_gateway_whatsapp-add-variables
branch
from
February 26, 2026 18:30
5cc21ff to
16efbea
Compare
… WhatsApp templates
carlos-lopez-tecnativa
force-pushed
the
18.0-mail_gateway_whatsapp-add-variables
branch
from
February 26, 2026 18:34
16efbea to
c4818c5
Compare
carlos-lopez-tecnativa
approved these changes
Feb 26, 2026
carlos-lopez-tecnativa
left a comment
carlos-lopez-tecnativa
left a comment
Contributor
There was a problem hiding this comment.
I updated the code to fix the problems. It has been tested and is working.
Contributor
|
What a great day to merge this nice PR. Let's do it! |
Contributor
|
Congratulations, your PR was merged at c7acc58. Thanks a lot for contributing to OCA. ❤️ |
carlos-lopez-tecnativa
deleted the
18.0-mail_gateway_whatsapp-add-variables
branch
February 26, 2026 18:47
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is FWP from #1723
cc @Tecnativa TT57145
ping @pedrobaeza @carlos-lopez-tecnativa @CarlosRoca13