diff --git a/django_app/apply_for_a_licence/forms/forms_services.py b/django_app/apply_for_a_licence/forms/forms_services.py index 3ef4df8f..76c67828 100644 --- a/django_app/apply_for_a_licence/forms/forms_services.py +++ b/django_app/apply_for_a_licence/forms/forms_services.py @@ -1,5 +1,7 @@ from apply_for_a_licence import choices +from apply_for_a_licence.choices import TypeOfServicesChoices from apply_for_a_licence.models import Services +from apply_for_a_licence.utils import get_cleaned_data_for_step from core.crispy_fields import get_field_with_label_id from core.forms.base_forms import BaseForm, BaseModelForm from crispy_forms_gds.choices import Choice @@ -110,8 +112,11 @@ def __init__(self, *args: object, **kwargs: object) -> None: super().__init__(*args, **kwargs) self.fields["service_activities"].widget.attrs = {"rows": 5} - if professional_or_business_services := self.request.session.get("TypeOfServiceView", False): - if professional_or_business_services.get("type_of_service", False) == "professional_and_business": + if professional_or_business_services := get_cleaned_data_for_step(self.request, "type_of_service"): + if ( + professional_or_business_services.get("type_of_service", False) + == TypeOfServicesChoices.professional_and_business.value + ): self.fields["service_activities"].help_text = render_to_string( "apply_for_a_licence/form_steps/partials/professional_or_business_services.html" )