Florent de Labarre
16a0427bc4
During closing a livechat session an error occur : _get_visitor_leave_message() got an unexpected keyword argument 'speaking_with' Because argument 'speaking_with' is pass in this method https://github.com/odoo/odoo/blob/14.0/addons/im_livechat/models/mail_channel.py#L182, it should be operator. closes odoo/odoo#70697 X-original-commit: 36866412483af80da812a38842e6df35b232190a Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
24 lines
1.3 KiB
Python
24 lines
1.3 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from odoo import models, _
|
|
|
|
|
|
class ImLivechatChannel(models.Model):
|
|
_inherit = 'im_livechat.channel'
|
|
|
|
def _get_livechat_mail_channel_vals(self, anonymous_name, operator, user_id=None, country_id=None):
|
|
mail_channel_vals = super(ImLivechatChannel, self)._get_livechat_mail_channel_vals(anonymous_name, operator, user_id=user_id, country_id=country_id)
|
|
visitor_sudo = self.env['website.visitor']._get_visitor_from_request()
|
|
if visitor_sudo:
|
|
mail_channel_vals['livechat_visitor_id'] = visitor_sudo.id
|
|
if not user_id:
|
|
mail_channel_vals['anonymous_name'] = visitor_sudo.display_name + (' (%s)' % visitor_sudo.country_id.name if visitor_sudo.country_id else '')
|
|
# As chat requested by the visitor, delete the chat requested by an operator if any to avoid conflicts between two flows
|
|
# TODO DBE : Move this into the proper method (open or init mail channel)
|
|
chat_request_channel = self.env['mail.channel'].sudo().search([('livechat_visitor_id', '=', visitor_sudo.id), ('livechat_active', '=', True)])
|
|
for mail_channel in chat_request_channel:
|
|
mail_channel._close_livechat_session(cancel=True, operator=operator.name)
|
|
|
|
return mail_channel_vals
|