From d0f25aa59a86df0d0a977caef55e6e853b5b69f0 Mon Sep 17 00:00:00 2001 From: ijas ahammed Date: Mon, 27 Sep 2021 11:45:14 +0000 Subject: [PATCH 1/5] [IMP] mass_mailing_sms: improve list view of SMS marketing This commit improves the list view of SMS Marketing to make it similar to Email Marketing. Now we have these fields in following order: - calendar_date - subject (string updated to `Title`) - mailing_model_id (optional hide) - user_id - campaign_id (optional hide, displayed when activated) - ab_testing_enabled (displayed when activated) - sent (added sum) - clicked (updated string to `Clicked (%)` and added progressbar widget, average) - bounced (updated string to `Bounced (%)`, optional hide with progressbar widget and average) - state TaskID-2653806 Part-of: odoo/odoo#77768 --- .../views/mailing_mailing_views.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/mass_mailing_sms/views/mailing_mailing_views.xml b/addons/mass_mailing_sms/views/mailing_mailing_views.xml index 12930f28b63..9eb40b66ead 100644 --- a/addons/mass_mailing_sms/views/mailing_mailing_views.xml +++ b/addons/mass_mailing_sms/views/mailing_mailing_views.xml @@ -233,17 +233,17 @@ 20 - + + - + - - - - - - - + + + + + + From 87e538dd1dbaecab9c3f06bed73126c80f300a7c Mon Sep 17 00:00:00 2001 From: ijas ahammed Date: Tue, 28 Sep 2021 12:11:49 +0000 Subject: [PATCH 2/5] [IMP] {mass_mailing}_sms: update the embed tree view on campaign This commit improves the embedded tree view of mailings, sms within a campaign, and makes it uniform with the original tree views. However, due to lack of space, we display the stats simply in numeric format instead using progressbar widget. Also, to save a bit space, if no mailing, sms has A/B testing enabled, we hide that column. Apart from that we have added sum for the field `sent` and average for these fields, - recieved_ratio - opened_ratio - clicks_ratio - replied_ratio - clicked - bounced TaskID-2653806 Part-of: odoo/odoo#77768 --- .../static/src/scss/mass_mailing.scss | 17 ------ .../static/src/scss/mass_mailing_mobile.scss | 5 -- .../mass_mailing/views/utm_campaign_views.xml | 60 +++++-------------- addons/mass_mailing_sms/models/utm.py | 20 ++++++- .../views/utm_campaign_views.xml | 19 ++++-- 5 files changed, 48 insertions(+), 73 deletions(-) diff --git a/addons/mass_mailing/static/src/scss/mass_mailing.scss b/addons/mass_mailing/static/src/scss/mass_mailing.scss index 1b0de618a99..e80cb417b1d 100644 --- a/addons/mass_mailing/static/src/scss/mass_mailing.scss +++ b/addons/mass_mailing/static/src/scss/mass_mailing.scss @@ -215,23 +215,6 @@ font-size: 90%; } -@media only screen and (min-width: 1200px) { - .o_utm_campaign_mass_mailing_substats { - padding-right: 210px; - div { - margin-left: 50px; - } - } -} - -@media only screen and (min-width: 768px) and (max-width: 1200px) { - .o_utm_campaign_mass_mailing_substats { - padding-right: 180px; - div { - margin-left: 30px; - } - } -} .o_mailing_contact_import_list { min-height: 150px; diff --git a/addons/mass_mailing/static/src/scss/mass_mailing_mobile.scss b/addons/mass_mailing/static/src/scss/mass_mailing_mobile.scss index 4c04e47f4a0..7ea9713d05e 100644 --- a/addons/mass_mailing/static/src/scss/mass_mailing_mobile.scss +++ b/addons/mass_mailing/static/src/scss/mass_mailing_mobile.scss @@ -1,9 +1,4 @@ @include media-breakpoint-down(md) { - .o_utm_campaign_mass_mailing_substats { - width: 80%; - margin: 0 auto; - justify-content: space-between !important; - } // For field to occupy full width in small devices. We need '!important' // here because of the 'w-auto' class used in the view. .o_form_editable div[name="mailing_filter_id"] { diff --git a/addons/mass_mailing/views/utm_campaign_views.xml b/addons/mass_mailing/views/utm_campaign_views.xml index 48afe6c1b12..7e7aa7663a4 100644 --- a/addons/mass_mailing/views/utm_campaign_views.xml +++ b/addons/mass_mailing/views/utm_campaign_views.xml @@ -17,6 +17,7 @@ attrs="{'invisible': ['|', ('mailing_mail_count', '=', 0), ('is_mailing_campaign_activated', '=', False)]}" groups="mass_mailing.group_mass_mailing_user"> + @@ -25,54 +26,23 @@ groups="mass_mailing.group_mass_mailing_user"> - - - - - - - + + + + + + + + + + + + @@ -26,11 +27,19 @@ - - - - - + + + + + + + + + + +