From c57d37df08e45a8a8917ef7b616b3d60b51f7ac4 Mon Sep 17 00:00:00 2001
From: christopherpettinga <chrispettinga@gmail.com>
Date: Thu, 29 Feb 2024 09:28:43 +0000
Subject: [PATCH 1/2] first

---
 web/domains/case/_import/fa/models.py              |  4 ++--
 .../case/import/fa/provide-report/report-info.html | 14 ++------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/web/domains/case/_import/fa/models.py b/web/domains/case/_import/fa/models.py
index 9581ba54c..40744d13b 100644
--- a/web/domains/case/_import/fa/models.py
+++ b/web/domains/case/_import/fa/models.py
@@ -83,8 +83,8 @@ class Meta:
         null=True,
         blank=True,
         verbose_name=(
-            "You haven't provided any reports on imported firearms. You must provide a reason"
-            " why no reporting is required before you confirm reporting complete."
+            "If you are not importing any firearms against this import licence then please "
+            "specify why in the text box and then confirm reporting complete."
         ),
     )
 
diff --git a/web/templates/web/domains/case/import/fa/provide-report/report-info.html b/web/templates/web/domains/case/import/fa/provide-report/report-info.html
index e11dc4d2b..0eab4ded8 100644
--- a/web/templates/web/domains/case/import/fa/provide-report/report-info.html
+++ b/web/templates/web/domains/case/import/fa/provide-report/report-info.html
@@ -57,14 +57,7 @@ <h3>Complete Supplementary Reporting</h3>
 
     {{ application_field(process.supplementary_info.completed_by, "Report Completed By") }}
     {{ application_field(process.supplementary_info.completed_datetime.strftime('%d-%b-%Y'), "Date Reporting Completed") }}
-  {% else %}
-    <div class="info-box info-box-info">
-      You must provide the details of who you bought the items from and one or more firearms
-      reports before you can complete reporting. Each report must include the means of transport,
-      the date the firearms were received and the details of who you bought the items from.
-      Once reporting has been completed you will still be able to access and update the reports from your application.
-    </div>
-
+  {% endif %}
     {% call forms.form(action='', method='post', csrf_input=csrf_input) -%}
       <div class="modal-popover-container hidden">
         <div class="modal-popover regular-popover" tabindex="0">
@@ -89,8 +82,7 @@ <h2 id="engine-modal-popover-title">Complete Supplementary Reporting Information
           </div>
         </div>
       </div>
-
-      {% if not process.supplementary_info.reports.exists() %}
+      {% if not process.supplementary_info.reports.exists() and not contacts %}
         {{ fields.field(form.no_report_reason) }}
       {% endif %}
     {%- endcall %}
@@ -98,6 +90,4 @@ <h2 id="engine-modal-popover-title">Complete Supplementary Reporting Information
     <button type="button" onclick="$('.modal-popover-container').show()" class="button primary-button">
       Confirm Reporting Complete
     </button>
-
-  {% endif %}
 {% endblock %}

From 03fb95b73416fdb0f83b97c6b5c7246f659e7267 Mon Sep 17 00:00:00 2001
From: christopherpettinga <chrispettinga@gmail.com>
Date: Thu, 29 Feb 2024 14:40:22 +0000
Subject: [PATCH 2/2] ICMSLST-1350 - Firearms Report - Correct guidance if not
 reporting any details.

---
 web/domains/case/_import/fa/models.py                         | 4 ++--
 .../domains/case/import/fa/provide-report/report-info.html    | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/web/domains/case/_import/fa/models.py b/web/domains/case/_import/fa/models.py
index 40744d13b..9581ba54c 100644
--- a/web/domains/case/_import/fa/models.py
+++ b/web/domains/case/_import/fa/models.py
@@ -83,8 +83,8 @@ class Meta:
         null=True,
         blank=True,
         verbose_name=(
-            "If you are not importing any firearms against this import licence then please "
-            "specify why in the text box and then confirm reporting complete."
+            "You haven't provided any reports on imported firearms. You must provide a reason"
+            " why no reporting is required before you confirm reporting complete."
         ),
     )
 
diff --git a/web/templates/web/domains/case/import/fa/provide-report/report-info.html b/web/templates/web/domains/case/import/fa/provide-report/report-info.html
index 0eab4ded8..8eb7aa4d4 100644
--- a/web/templates/web/domains/case/import/fa/provide-report/report-info.html
+++ b/web/templates/web/domains/case/import/fa/provide-report/report-info.html
@@ -83,6 +83,9 @@ <h2 id="engine-modal-popover-title">Complete Supplementary Reporting Information
         </div>
       </div>
       {% if not process.supplementary_info.reports.exists() and not contacts %}
+	      <div class="info-box info-box-info">
+		      If you are not importing any firearms against this import licence then please specify why in the text box and then confirm reporting complete.
+		    </div>
         {{ fields.field(form.no_report_reason) }}
       {% endif %}
     {%- endcall %}