diff --git a/addons/website/models/website_visitor.py b/addons/website/models/website_visitor.py index 3995a438c7b..8eb1fb7ee33 100644 --- a/addons/website/models/website_visitor.py +++ b/addons/website/models/website_visitor.py @@ -34,7 +34,7 @@ class WebsiteVisitor(models.Model): access_token = fields.Char(required=True, default=lambda x: uuid.uuid4().hex, index=False, copy=False, groups='base.group_website_publisher') active = fields.Boolean('Active', default=True) website_id = fields.Many2one('website', "Website", readonly=True) - partner_id = fields.Many2one('res.partner', string="Linked Partner", help="Partner of the last logged in user.") + partner_id = fields.Many2one('res.partner', string="Contact", help="Partner of the last logged in user.") partner_image = fields.Binary(related='partner_id.image_1920') # localisation and info @@ -43,10 +43,10 @@ class WebsiteVisitor(models.Model): lang_id = fields.Many2one('res.lang', string='Language', help="Language from the website when visitor has been created") timezone = fields.Selection(_tz_get, string='Timezone') email = fields.Char(string='Email', compute='_compute_email_phone') - mobile = fields.Char(string='Mobile Phone', compute='_compute_email_phone') + mobile = fields.Char(string='Mobile', compute='_compute_email_phone') # Visit fields - visit_count = fields.Integer('Number of visits', default=1, readonly=True, help="A new visit is considered if last connection was more than 8 hours ago.") + visit_count = fields.Integer('# Visits', default=1, readonly=True, help="A new visit is considered if last connection was more than 8 hours ago.") website_track_ids = fields.One2many('website.track', 'visitor_id', string='Visited Pages History', readonly=True) visitor_page_count = fields.Integer('Page Views', compute="_compute_page_statistics", help="Total number of visits on tracked pages") page_ids = fields.Many2many('website.page', string="Visited Pages", compute="_compute_page_statistics") @@ -54,7 +54,7 @@ class WebsiteVisitor(models.Model): last_visited_page_id = fields.Many2one('website.page', string="Last Visited Page", compute="_compute_last_visited_page_id") # Time fields - create_date = fields.Datetime('First connection date', readonly=True) + create_date = fields.Datetime('First Connection', readonly=True) last_connection_datetime = fields.Datetime('Last Connection', default=fields.Datetime.now, help="Last page view date", readonly=True) time_since_last_action = fields.Char('Last action', compute="_compute_time_statistics", help='Time since last page view. E.g.: 2 minutes ago') is_connected = fields.Boolean('Is connected ?', compute='_compute_time_statistics', help='A visitor is considered as connected if his last page view was within the last 5 minutes.') diff --git a/addons/website/views/website_visitor_views.xml b/addons/website/views/website_visitor_views.xml index 4a0756aabb5..0821416b22e 100644 --- a/addons/website/views/website_visitor_views.xml +++ b/addons/website/views/website_visitor_views.xml @@ -103,7 +103,7 @@ t-attf-src="/base/static/img/avatar_grey.png" width="54px" height="54px" alt="Visitor"/> -
+
@@ -117,19 +117,19 @@
-
+
Last Action
-
+
Visits
-
+
Last Page
-
+
Visited Pages
@@ -195,7 +195,7 @@
@@ -205,7 +205,7 @@

- + @@ -215,9 +215,10 @@ + - + @@ -229,19 +230,21 @@ website.visitor.view.tree website.visitor - + - - + + + - + + - - + - - - website.visitor.view.kanban.inherit.event - website.visitor - - - - - - -
Registrations
-
- -
- -
Registrations
-
-
-
-
- diff --git a/addons/website_event_track/__manifest__.py b/addons/website_event_track/__manifest__.py index b9fed0b3ca4..55a69bd17de 100644 --- a/addons/website_event_track/__manifest__.py +++ b/addons/website_event_track/__manifest__.py @@ -5,7 +5,7 @@ 'name': 'Advanced Events', 'category': 'Marketing', 'summary': 'Sponsors, Tracks, Agenda, Event News', - 'version': '1.1', + 'version': '1.2', 'description': "", 'depends': ['website_event'], 'data': [ diff --git a/addons/website_event_track/views/website_visitor_views.xml b/addons/website_event_track/views/website_visitor_views.xml index 171186d73ca..b349aae46ee 100644 --- a/addons/website_event_track/views/website_visitor_views.xml +++ b/addons/website_event_track/views/website_visitor_views.xml @@ -7,7 +7,7 @@ - + @@ -27,25 +27,4 @@ - - - website.visitor.view.kanban.inherit.event.track - website.visitor - - - - - - -
Wishlisted Tracks
-
- -
- -
Wishlisted Tracks
-
-
-
-
- diff --git a/addons/website_livechat/views/website_visitor_views.xml b/addons/website_livechat/views/website_visitor_views.xml index 9fe94e7552e..595e7b6b5a3 100644 --- a/addons/website_livechat/views/website_visitor_views.xml +++ b/addons/website_livechat/views/website_visitor_views.xml @@ -36,20 +36,35 @@ +
Chats
- Speaking With + Speaking With +
+ Operator Avatar + +

-
+
- - - + -
Speaking With
+
Chats
+
+
+
+ Operator Avatar + +
+
Speaking With
@@ -79,14 +94,14 @@ attrs="{'invisible': ['|', ('livechat_operator_id', '!=', False), ('is_connected', '=', False)]}"/> - - + + @@ -97,9 +112,9 @@ website.visitor - - - - + @@ -81,7 +81,7 @@ - + diff --git a/addons/website_sms/views/website_visitor_views.xml b/addons/website_sms/views/website_visitor_views.xml index 3a7d43c9b63..e002830cdd9 100644 --- a/addons/website_sms/views/website_visitor_views.xml +++ b/addons/website_sms/views/website_visitor_views.xml @@ -38,10 +38,12 @@ website.visitor - + + +