Merge branch 'dev' into LTD-5769-bulk-approval-fe

uktrade · Jan 14, 2025 · 72bc8fc · 72bc8fc
2 parents 08615fc + b03f8eb
commit 72bc8fc
Show file tree

Hide file tree

Showing 11 changed files with 453 additions and 403 deletions.
diff --git a/Pipfile b/Pipfile
@@ -76,7 +76,7 @@ django-redis = "~=4.12.1"
 django-log-formatter-ecs = "==0.0.5"
 django-ipware = "~=3.0.7"
 django-extra-views = "~=0.14.0"
-django = "~=4.2.15"
+django = "~=4.2.17"
 django-log-formatter-asim = "~=0.0.5"
 dbt-copilot-python = "~=0.2.1"
 cryptography = "~=43.0.1"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/exporter/assets/scss/components/_hub.scss b/exporter/assets/scss/components/_hub.scss
@@ -3,3 +3,7 @@
         max-width: 100%;
     }
 }
+
+#compliance-open-licence-app-tiles {
+    display: none;
+}
diff --git a/exporter/templates/core/hub.html b/exporter/templates/core/hub.html
@@ -192,7 +192,7 @@ <h2 class="govuk-heading-m govuk-!-margin-top-6 govuk-!-margin-bottom-3">{% lcs
 			</ul>
 		</div>
 
-		<div class="app-tiles" aria-label="Content currently unavailable">
+		<div id="compliance-open-licence-app-tiles" class="app-tiles" aria-label="Content currently unavailable">
 			{# Compliance licence tile #}
 			<div class="app-tile app-tile__disabled">
 				<h2 class="govuk-!-margin-top-0">

diff --git a/exporter/templates/core/registration/confirmation-registration-base.html b/exporter/templates/core/registration/confirmation-registration-base.html
@@ -26,7 +26,7 @@ <h1 class="govuk-heading-xl">
 	{% endblock %}
 
 	<div class="govuk-summary-list__row" id="org-name">
-		<h1 class="govuk-heading-m">Now send your application</h1>
+		<h2 class="govuk-heading-m">Now send your application</h2>
 		<p class="govuk-body">By submitting this notification you are confirming that, to the best of your knowledge, the details you are providing are correct. </p>
 	</div>
 

diff --git a/exporter/templates/core/registration/confirmation-registration-corporation-abroad.html b/exporter/templates/core/registration/confirmation-registration-corporation-abroad.html
@@ -4,9 +4,9 @@
 
         {% include "core/registration/includes/registration-details-corporation.html" %}
 
-        <h1 class="govuk-heading-m">
+        <h2 class="govuk-heading-m">
                 Where is your organisation based?
-        </h1>
+        </h2>
 
         {% include "core/registration/includes/address-details-abroad.html" %}
 

diff --git a/exporter/templates/core/registration/confirmation-registration-corporation-uk.html b/exporter/templates/core/registration/confirmation-registration-corporation-uk.html
@@ -4,9 +4,9 @@
 
         {% include "core/registration/includes/registration-details-corporation.html" %}
 
-        <h1 class="govuk-heading-m">
+        <h2 class="govuk-heading-m">
                 Where is your organisation based?
-        </h1>
+        </h2>
 
         {% include "core/registration/includes/address-details-uk.html" %}
 

diff --git a/exporter/templates/core/registration/confirmation-registration-individual-abroad.html b/exporter/templates/core/registration/confirmation-registration-individual-abroad.html
@@ -4,9 +4,9 @@
 
         {% include "core/registration/includes/registration-details-individual.html" %}
 
-        <h1 class="govuk-heading-m">
+        <h2 class="govuk-heading-m">
                 Where are you based?
-        </h1>
+        </h2>
 
         {% include "core/registration/includes/address-details-abroad.html" %}
 {% endblock %}
diff --git a/exporter/templates/core/registration/confirmation-registration-individual-uk.html b/exporter/templates/core/registration/confirmation-registration-individual-uk.html
@@ -4,9 +4,9 @@
 
     {% include "core/registration/includes/registration-details-individual.html" %}
 
-    <h1 class="govuk-heading-m">
+    <h2 class="govuk-heading-m">
          Where in the United Kingdom are you based?
-    </h1>
+    </h2>
 
     {% include "core/registration/includes/address-details-uk.html" %}
 {% endblock %}
diff --git a/exporter/templates/core/registration/includes/registration-details-corporation.html b/exporter/templates/core/registration/includes/registration-details-corporation.html
@@ -1,7 +1,7 @@
 
-<h1 class="govuk-heading-m">
+<h2 class="govuk-heading-m">
     Register a commercial organisation
-</h1>
+</h2>
 <dl class="govuk-summary-list govuk-!-margin-bottom-9" id="registration-summary">
     <div class="govuk-summary-list__row" id="org-name">
         <dt class="govuk-summary-list__key">

diff --git a/exporter/templates/core/registration/includes/registration-details-individual.html b/exporter/templates/core/registration/includes/registration-details-individual.html
@@ -1,8 +1,8 @@
 
 
-<h1 class="govuk-heading-m">
+<h2 class="govuk-heading-m">
     Organisation details
-</h1>
+</h2>
 <dl class="govuk-summary-list govuk-!-margin-bottom-9" id="registration-summary">
     <div class="govuk-summary-list__row" id="name">
         <dt class="govuk-summary-list__key">