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">
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/addons/mass_mailing_sms/models/utm.py b/addons/mass_mailing_sms/models/utm.py
index ca78910b6a6..94c7de9a9ad 100644
--- a/addons/mass_mailing_sms/models/utm.py
+++ b/addons/mass_mailing_sms/models/utm.py
@@ -18,6 +18,7 @@ class UtmCampaign(models.Model):
groups="mass_mailing.group_mass_mailing_user")
# A/B Testing
+ ab_testing_mailings_sms_count = fields.Integer("A/B Test Mailings SMS #", compute="_compute_mailing_sms_count")
ab_testing_sms_winner_selection = fields.Selection([
('manual', 'Manual'),
('clicks_ratio', 'Highest Click Rate')], string="SMS Winner Selection", default="clicks_ratio")
@@ -32,8 +33,25 @@ class UtmCampaign(models.Model):
@api.depends('mailing_sms_ids')
def _compute_mailing_sms_count(self):
+ if self.ids:
+ mailing_sms_data = self.env['mailing.mailing'].read_group(
+ [('campaign_id', 'in', self.ids), ('mailing_type', '=', 'sms')],
+ ['campaign_id', 'ab_testing_enabled'],
+ ['campaign_id', 'ab_testing_enabled'],
+ lazy=False,
+ )
+ ab_testing_mapped_sms_data = {}
+ mapped_sms_data = {}
+ for data in mailing_sms_data:
+ if data['ab_testing_enabled']:
+ ab_testing_mapped_sms_data.setdefault(data['campaign_id'][0], []).append(data['__count'])
+ mapped_sms_data.setdefault(data['campaign_id'][0], []).append(data['__count'])
+ else:
+ mapped_sms_data = dict()
+ ab_testing_mapped_sms_data = dict()
for campaign in self:
- campaign.mailing_sms_count = len(campaign.mailing_sms_ids)
+ campaign.mailing_sms_count = sum(mapped_sms_data.get(campaign.id, []))
+ campaign.ab_testing_mailings_sms_count = sum(ab_testing_mapped_sms_data.get(campaign.id, []))
def action_create_mass_sms(self):
action = self.env["ir.actions.actions"]._for_xml_id("mass_mailing.action_create_mass_mailings_from_campaign")
diff --git a/addons/mass_mailing_sms/views/utm_campaign_views.xml b/addons/mass_mailing_sms/views/utm_campaign_views.xml
index 1727a118f04..75e10d4b511 100644
--- a/addons/mass_mailing_sms/views/utm_campaign_views.xml
+++ b/addons/mass_mailing_sms/views/utm_campaign_views.xml
@@ -17,6 +17,7 @@
attrs="{'invisible': ['|', ('mailing_sms_count', '=', 0), ('is_mailing_campaign_activated', '=', False)]}"
icon="fa-mobile" groups="mass_mailing.group_mass_mailing_user">
+
@@ -26,11 +27,19 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+