From 080e45bc9fe85f1407d10e6210f7b8a2478eb913 Mon Sep 17 00:00:00 2001
From: Anna-Sutton <anna.sutton9@nhs.net>
Date: Tue, 29 Sep 2026 15:00:57 +0100
Subject: [PATCH 1/4] Vaccine updates

Added explanatory paragraph about batch entry.
---
 app/views/vaccines/add-batch.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/vaccines/add-batch.html b/app/views/vaccines/add-batch.html
index e04a6a08..30fedc0e 100644
--- a/app/views/vaccines/add-batch.html
+++ b/app/views/vaccines/add-batch.html
@@ -16,6 +16,7 @@
     <div class="nhsuk-grid-column-two-thirds">
 
       <h1 class="nhsuk-heading-l">Add batch</h1>
+      <p>If you get several batches with the same number and expiry date, you only need to add the details here once.</p>
 
       <form action="/vaccines/check" method="post" novalidate="true">
 

From 91e8b11f1511bb44639f6eac3df1266def242f38 Mon Sep 17 00:00:00 2001
From: Anna-Sutton <anna.sutton9@nhs.net>
Date: Tue, 29 Sep 2026 15:04:30 +0100
Subject: [PATCH 2/4] Add site deactivated error page template

Added another error page for when a user select co-admin or same vax different person options - and can't continue because the site has been deactivated just now.
---
 .../site-deactivated-extra-scenario.html      | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 app/views/errors/site-deactivated-extra-scenario.html

diff --git a/app/views/errors/site-deactivated-extra-scenario.html b/app/views/errors/site-deactivated-extra-scenario.html
new file mode 100644
index 00000000..536cb833
--- /dev/null
+++ b/app/views/errors/site-deactivated-extra-scenario.html
@@ -0,0 +1,25 @@
+{% extends 'layout.html' %}
+
+{% set pageName = "There is a problem using this option" %}
+
+{% block content %}
+
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-two-thirds">
+
+      <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
+
+      <p>You cannot continue with this option because [site name] has been deactivated.</p>
+
+      <p>An administrator can reactivate the site in the Vaccines setion. Once the site is reactivated, you will be able to record this vaccination but you will have to start again.</p> 
+
+      <p>If no one is available to reactivate the site, record it on paper.</p>
+
+      <p><a href="https://guide.ravs.england.nhs.uk/service-unavailable/">Download our paper form (opens in new tab)</a></p>
+      
+      <p><a href="/record-vaccinations/patient">Go back to Record vaccinations</a></p>
+
+    </div>
+  </div>
+
+{% endblock %}

From c0d6de641b3e11d835cc374f3be14ba9eef730f4 Mon Sep 17 00:00:00 2001
From: Anna-Sutton <anna.sutton9@nhs.net>
Date: Tue, 29 Sep 2026 15:09:21 +0100
Subject: [PATCH 3/4] Add error to index for site deactivation scenario

---
 app/views/index.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/views/index.html b/app/views/index.html
index caeeac19..165786ca 100755
--- a/app/views/index.html
+++ b/app/views/index.html
@@ -307,6 +307,14 @@ <h2>Error pages</h2>
     ],
     [
     {
+    html: "<a href='/errors/site-deactivated-extra-scenario'>There is a problem using this option</a>"
+    },
+    {
+    text: "When a user has chosen the co-admin or same vax for a different patient option, and the site has just been deactivated."
+    }
+    ],
+    [
+    {
     html: "<a href='/errors/problem-deactivating-site-2-users-trying'>There is a problem deactivating this site</a>"
     },
     {

From 28fd4de0be078c1791c98c27832b3e6e7bf9c35f Mon Sep 17 00:00:00 2001
From: Benjy Stanton <2545065+benjystanton@users.noreply.github.com>
Date: Wed, 30 Sep 2026 16:28:28 +0100
Subject: [PATCH 4/4] Fix typo in 'section'

---
 app/views/errors/site-deactivated-extra-scenario.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/errors/site-deactivated-extra-scenario.html b/app/views/errors/site-deactivated-extra-scenario.html
index 536cb833..05e67ef4 100644
--- a/app/views/errors/site-deactivated-extra-scenario.html
+++ b/app/views/errors/site-deactivated-extra-scenario.html
@@ -11,7 +11,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
 
       <p>You cannot continue with this option because [site name] has been deactivated.</p>
 
-      <p>An administrator can reactivate the site in the Vaccines setion. Once the site is reactivated, you will be able to record this vaccination but you will have to start again.</p> 
+      <p>An administrator can reactivate the site in the Vaccines section. Once the site is reactivated, you will be able to record this vaccination but you will have to start again.</p> 
 
       <p>If no one is available to reactivate the site, record it on paper.</p>