File tree Expand file tree Collapse file tree 3 files changed +22
-2
lines changed
main/views/service_settings Expand file tree Collapse file tree 3 files changed +22
-2
lines changed Original file line number Diff line number Diff line change @@ -150,6 +150,7 @@ def service_email_sender_change(service_id):
150150 new_sender = current_service .name
151151
152152 current_service .update (custom_email_sender_name = new_sender )
153+ redis_client .set (f"{ service_id } _has_confirmed_email_sender" , b"true" , ex = cache .DEFAULT_TTL )
153154
154155 if from_sender_flow and not current_service .email_reply_to_addresses :
155156 return redirect (
Original file line number Diff line number Diff line change @@ -294,6 +294,16 @@ def intending_to_send_sms(self):
294294 return self .has_sms_templates
295295 return self .volume_sms > 0
296296
297+ @property
298+ def has_confirmed_email_sender (self ):
299+ if redis_client .get (f"{ self .id } _has_confirmed_email_sender" ):
300+ return True
301+ return False
302+
303+ @property
304+ def needs_to_confirm_email_sender (self ):
305+ return self .intending_to_send_email and not self .has_confirmed_email_sender
306+
297307 @cached_property
298308 def email_reply_to_addresses (self ):
299309 return service_api_client .get_reply_to_email_addresses (self .id )
@@ -429,6 +439,7 @@ def go_live_checklist_completed(self):
429439 self .go_live_sending_options_complete ,
430440 self .has_team_members_with_manage_service_permission ,
431441 self .has_templates ,
442+ not self .needs_to_confirm_email_sender ,
432443 not self .needs_to_add_email_reply_to_address ,
433444 not self .needs_to_change_sms_sender ,
434445 self .confirmed_unique ,
Original file line number Diff line number Diff line change 7373
7474 {# all the conditional task #}
7575 {% if current_service.intending_to_send_email %}
76- {% do task_list_items.append(
76+ {% do task_list_items.extend(
77+ [{
78+ "title": {
79+ "text": "Choose a ‘from’ name",
80+ "classes": "govuk-link--no-visited-state",
81+ },
82+ "href": url_for('main.service_email_sender_change', service_id=current_service.id),
83+ "status": completed_status if current_service.has_confirmed_email_sender else not_completed_status,
84+ },
7785 {
7886 "title": {
7987 "text": "Add a reply-to email address",
8088 "classes": "govuk-link--no-visited-state",
8189 },
8290 "href": url_for('main.service_email_reply_to', service_id=current_service.id),
8391 "status": completed_status if current_service.has_email_reply_to_address else not_completed_status,
84- }
92+ }]
8593 )%}
8694 {% endif %}
8795 {% if (current_service.intending_to_send_sms and current_service.shouldnt_use_govuk_as_sms_sender) %}
You can’t perform that action at this time.
0 commit comments