pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] mass_mailing: improved recipients warning

Browse Source 
Part-of: odoo/odoo#88997
This commit is contained in:
Pratik Raval
2023-07-17 12:05:47 +02:00
committed by Pratik Raval (PRRA)
parent 84316403ac
commit 06c70b5913
2 changed files with 62 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mass_mailing/static/src/scss/mass_mailing.scss
+7 -6
View File
@@ -48,6 +48,11 @@
width: 135px;
}
}
.o_notebook .tab-content .tab-pane .alert {
margin-left: -$o-sheet-cancel-hpadding;
margin-right: -$o-sheet-cancel-hpadding;
}
}
.o_form_view.o_mass_mailing_mailing_form .o_form_renderer {
@@ -178,15 +183,11 @@
}
.o_mass_mailing_mailing_form.o_mass_mailing_form_full_width .alert.alert-info:not(.o_invisible_modifier) {
margin: 0 0 0 12px;
flex: 1;
padding: unset;
padding: 0.5rem 0.5rem;
border-left-width: 1px;
border-left-color: #dee2e6;
> div {
min-height: 100%;
padding: 6px;
}
}
.o_form_view.o_xxl_form_view .o_mass_mailing_mailing_form {
addons/mass_mailing/views/mailing_mailing_views.xml
+55 -53
View File
@@ -72,61 +72,63 @@
<button name="action_cancel" type="object" attrs="{'invisible': [('state', '!=', 'in_queue')]}" class="btn-secondary" string="Cancel" data-hotkey="z"/>
<button name="action_retry_failed" type="object" attrs="{'invisible': ['|', ('state', '!=', 'done'), ('failed', '=', 0)]}" class="oe_highlight" string="Retry" data-hotkey="y"/>
<div class="alert alert-info mb-2 text-center" role="alert"
attrs="{'invisible': ['&amp;','&amp;','&amp;','&amp;','&amp;',('state', 'not in', ['in_queue', 'done']),('sent', '=', 0),('canceled', '=', 0),('scheduled', '=', 0),('failed', '=', 0),('warning_message', '=', False)]}">
<div class="o_mails_canceled" attrs="{'invisible': [('canceled', '=', 0)]}">
<button class="btn-link py-0"
name="action_view_traces_canceled"
type="object">
<strong>
<field name="canceled" class="oe_inline me-2"/>
<span name="canceled_text">emails have been canceled and will not be sent.</span>
</strong>
</button>
</div>
<div class="o_mails_scheduled" attrs="{'invisible': [('scheduled', '=', 0)]}">
<button class="btn-link py-0"
name="action_view_traces_scheduled"
type="object">
<strong>
<field name="scheduled" class="oe_inline me-2"/>
<span name="scheduled_text">emails are in queue and will be sent soon.</span>
</strong>
</button>
</div>
<div class="o_mails_sent" attrs="{'invisible': ['&amp;', ('sent', '=', 0), ('state', 'in', ('draft', 'test', 'in_queue'))]}">
<button class="btn-link py-0"
name="action_view_traces_sent"
type="object">
<strong>
<field name="sent" class="oe_inline me-2"/>
<span name="sent">emails have been sent.</span>
</strong>
</button>
<strong class="d-block" attrs="{'invisible': ['|', ('mailing_type', '=', 'mail'), '|', ('ab_testing_enabled', '=', False), '|', ('state', '!=', 'done'), '|', ('sent', '!=', 0), '|', ('failed', '!=', 0), ('canceled', '!=', 0)]}">
<span name="ab_test_text">There wasn't enough recipients given to this mailing. </span>
</strong>
</div>
<div class="o_mails_failed" attrs="{'invisible': ['|', ('state', '!=', 'done'), ('failed', '=', 0)]}">
<button class="btn-link py-0"
name="action_view_traces_failed"
type="object">
<strong>
<field name="failed" class="oe_inline me-2"/>
<span name="failed_text">emails could not be sent.</span>
</strong>
</button>
</div>
<div class="o_mails_in_queue" attrs="{'invisible': [('state', '!=', 'in_queue')]}">
<strong>
<span name="next_departure_text">This mailing is scheduled for </span>
<field name="next_departure" class="oe_inline"/>.
</strong>
</div>
<div attrs="{'invisible': [('warning_message', '=', False)]}">
<strong><field name="warning_message"/></strong>
</div>
</div>
<field name="state" readonly="1" widget="statusbar"/>
</header>
<div class="alert alert-info mb-2 text-center" role="alert"
attrs="{'invisible': ['&amp;','&amp;','&amp;','&amp;','&amp;',('state', '!=', 'in_queue'),('sent', '=', 0),('canceled', '=', 0),('scheduled', '=', 0),('failed', '=', 0),('warning_message', '=', False)]}">
<div class="o_mails_canceled" attrs="{'invisible': [('canceled', '=', 0)]}">
<button class="btn-link py-0"
name="action_view_traces_canceled"
type="object">
<strong>
<field name="canceled" class="oe_inline me-2"/>
<span name="canceled_text">emails have been canceled and will not be sent.</span>
</strong>
</button>
</div>
<div class="o_mails_scheduled" attrs="{'invisible': [('scheduled', '=', 0)]}">
<button class="btn-link py-0"
name="action_view_traces_scheduled"
type="object">
<strong>
<field name="scheduled" class="oe_inline me-2"/>
<span name="scheduled_text">emails are in queue and will be sent soon.</span>
</strong>
</button>
</div>
<div class="o_mails_sent" attrs="{'invisible': ['&amp;', ('sent', '=', 0), ('state', 'in', ('draft', 'test', 'in_queue'))]}">
<button class="btn-link py-0"
name="action_view_traces_sent"
type="object">
<strong>
<field name="sent" class="oe_inline me-2"/>
<span name="sent">emails have been sent.</span>
</strong>
</button>
</div>
<div class="o_mails_failed" attrs="{'invisible': ['|', ('state', '!=', 'done'), ('failed', '=', 0)]}">
<button class="btn-link py-0"
name="action_view_traces_failed"
type="object">
<strong>
<field name="failed" class="oe_inline me-2"/>
<span name="failed_text">emails could not be sent.</span>
</strong>
</button>
</div>
<div class="o_mails_in_queue" attrs="{'invisible': [('state', '!=', 'in_queue')]}">
<strong>
<span name="next_departure_text">This mailing is scheduled for </span>
<field name="next_departure" class="oe_inline"/>.
</strong>
</div>
<div attrs="{'invisible': [('warning_message', '=', False)]}">
<strong><field name="warning_message"/></strong>
</div>
</div>
<sheet>
<div class="oe_button_box" name="button_box">
<button name="action_view_delivered"