@defra-fish/gafl-webapp-service 1.61.0-rc.4 → 1.61.0-rc.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.61.0-rc.4",
+  "version": "1.61.0-rc.6",
   "description": "The websales frontend for the GAFL service",
   "type": "module",
   "engines": {
@@ -36,8 +36,8 @@
     "prepare": "gulp --gulpfile build/gulpfile.cjs"
   },
   "dependencies": {
-    "@defra-fish/business-rules-lib": "1.61.0-rc.4",
-    "@defra-fish/connectors-lib": "1.61.0-rc.4",
+    "@defra-fish/business-rules-lib": "1.61.0-rc.6",
+    "@defra-fish/connectors-lib": "1.61.0-rc.6",
     "@defra/hapi-gapi": "^2.0.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
@@ -52,7 +52,6 @@
     "debug": "^4.3.3",
     "disinfect": "^1.1.0",
     "find": "^0.3.0",
-    "flatpickr": "^4.6.9",
     "govuk-frontend": "^5.2.0",
     "hapi-i18n": "^3.0.1",
     "joi": "^17.6.0",
@@ -80,5 +79,5 @@
       "./gafl-jest-matchers.js"
     ]
   },
-  "gitHead": "492a8abe5453ea44483fa565fc7bdec42e926993"
+  "gitHead": "38a3dd7bb9c0b5331ef38530b7a2ddc0de8ecfa4"
 }

package/src/locales/cy.json

@@ -552,11 +552,8 @@
   "order_complete_before_leave_page_bulletpoint_2_link": "darllen yr adroddiad blynyddol pysgodfeydd ar gyfer Lloegr (yn agor mewn tab newydd)",
   "order_complete_before_leave_page_paragraph": "Efallai yr hoffech:",
   "order_complete_before_leave_page_title": "Cyn i chi adael y dudalen hon",
-  "order_complete_future_payments_digital_paragraph_1": "Byddwch yn derbyn e-bost neu neges destun yn fuan yn cadarnhau eich cytundeb taliad cerdyn sy'n ailadrodd. Os ydych chi wedi newid eich meddwl, gallwch ",
-  "order_complete_future_payments_digital_paragraph_2": " neu ganslo’n ddiweddarach gan ddefnyddio'r ddolen yn yr e-bost neu'r neges destun.",
-  "order_complete_future_payments_link": "ganslo’r taliad ar gyfer trwyddedau yn y dyfodol nawr ",
-  "order_complete_future_payments_postal_paragraph_1": "Byddwch yn derbyn llythyr yn cadarnhau eich cytundeb taliad cerdyn sy’n ailadrodd. Os ydych chi wedi newid eich meddwl, gallwch ",
-  "order_complete_future_payments_postal_paragraph_2": " neu ganslo’n ddiweddarach gan ddefnyddio'r manylion yn y llythyr.",
+  "order_complete_future_payments_digital_paragraph": "Byddwch yn derbyn e-bost neu neges destun yn fuan yn cadarnhau eich cytundeb taliad cerdyn sy’n ailadrodd. Os ydych chi wedi newid eich meddwl, gallwch ganslo taliadau trwyddedau ar gyfer y dyfodol gan ddefnyddio’r manylion yn yr e-bost neu’r neges.",
+  "order_complete_future_payments_postal_paragraph": "Byddwch yn derbyn llythyr yn cadarnhau eich cytundeb taliad cerdyn sy’n ailadrodd. Os ydych chi wedi newid eich meddwl, gallwch ganslo taliadau trwyddedau ar gyfer y dyfodol gan ddefnyddio’r manylion yn eich llythyr.",
   "order_complete_future_payments_title": "Taliadau am drwyddedau yn y dyfodol",
   "order_complete_licence_details_bobo_digital_paragraph": "Bydd y drwydded hefyd yn cael ei hanfon ar ffurf e-bost neu neges destun.",
   "order_complete_licence_details_bobo_digital_confirmation_paragraph": "Bydd manylion y drwydded yn cael eu hanfon ar ffurf e-bost neu neges destun.",

package/src/locales/en.json

@@ -555,11 +555,8 @@
   "order_complete_before_leave_page_bulletpoint_2_link": "read the latest fisheries annual report for England (opens in new tab)",
   "order_complete_before_leave_page_paragraph": "You may like to:",
   "order_complete_before_leave_page_title": "Before you leave this page",
-  "order_complete_future_payments_digital_paragraph_1": "You will shortly get an email or text message confirming your recurring card payment agreement. If you have changed your mind, you can ",
-  "order_complete_future_payments_digital_paragraph_2": " or cancel later using the link in the email or text message.",
-  "order_complete_future_payments_link": "cancel the future licence payments now",
-  "order_complete_future_payments_postal_paragraph_1": "You will get a letter confirming your recurring card payment agreement. If you have changed your mind, you can ",
-  "order_complete_future_payments_postal_paragraph_2": " or cancel later using the details in the letter.",
+  "order_complete_future_payments_digital_paragraph": "You will shortly get an email or text message confirming your recurring card payment agreement. If you have changed your mind, you can cancel the future licence payments using the details in the email or text message.",
+  "order_complete_future_payments_postal_paragraph": "You will get a letter confirming your recurring card payment agreement. If you have changed your mind, you can cancel the future licence payments using the details in your letter.",
   "order_complete_future_payments_title": "Future licence payments",
   "order_complete_licence_details_bobo_digital_paragraph": "The licence will also be sent by email or text message.",
   "order_complete_licence_details_bobo_digital_confirmation_paragraph": "Licence details will also be sent by email or text message.",

package/src/pages/licence-details/licence-to-start/licence-to-start.njk

@@ -118,59 +118,4 @@
         import { initAll } from '/public/javascript/govuk-frontend-min.js'
         initAll()
     </script>
-    <script src="/public/javascript/flatpickr-min.js"></script>
-    <script nonce="{{nonce}}">(function () {
-        const dataInputDiv = document.getElementById('licence-start-date')
-        const calImageDiv = document.createElement('div')
-        calImageDiv.id = 'cal-image-div'
-        const calImage = document.createElement('img')
-        calImage.src = '/public/images/icon-calendar-2x.png'
-        calImage.alt = '{{ mssgs.licence_date_picker }}'
-        calImageDiv.appendChild(calImage)
-        calImageDiv.setAttribute('aria-hidden', true)
-        dataInputDiv.appendChild(calImageDiv)
-        const fpk = flatpickr(calImageDiv, {
-            dateFormat: "d m Y",
-            disableMobile: true,
-            minDate: 'today',
-            maxDate: '{{ data.maxStartDate }}',
-            position: 'below',
-            monthSelectorType: 'static',
-            showMonths: 1,
-            clickOpens: false,
-            ariaDateFormat: "",
-            onChange: function(selectedDates, dateStr, instance) {
-                var d = new Date(selectedDates[0])
-                document.getElementById('licence-start-date-day').value = d.getDate()
-                document.getElementById('licence-start-date-month').value = d.getMonth() + 1
-                document.getElementById('licence-start-date-year').value = d.getFullYear()
-            },
-            onOpen: [ function(selectedDates, dateStr, instance) {
-                if (!document.getElementById('year-read-only')) {
-                    const yearInputWrapper = document.getElementsByClassName('numInputWrapper')[0];
-                    yearInputWrapper.style.display= 'none';
-                    const currentMonthDiv = document.getElementsByClassName('flatpickr-current-month')[0];
-                    const yearReadOnly = document.createElement('span');
-                    yearReadOnly.id = 'year-read-only';
-                    yearReadOnly.innerHTML = ' ' + instance.currentYear;
-                    currentMonthDiv.appendChild(yearReadOnly);
-                }
-            } ],
-            onYearChange: function(selectedDates, dateStr, instance) {
-                const yearReadOnly = document.getElementById('year-read-only');
-                yearReadOnly.innerHTML = ' ' + instance.currentYear;
-            }
-        })
-        window.addEventListener('keydown', function (event) {
-            if (event.defaultPrevented) {
-                return;
-            }
-            if (event.key === 'Esc' || event.key === 'Escape' ) {
-                fpk.close()
-            }
-        })
-        calImageDiv.onclick = function() {
-            fpk.toggle()
-        }
-    })()</script>
 {% endblock %}

package/src/pages/order-complete/order-complete/__tests__/__snapshots__/order-complete.spec.js.snap

@@ -2,8 +2,7 @@
 
 exports[`The order completion handler 8 day licence sets as non_postal 1`] = `
 Object {
-  "futurePaymentsParagraphOne": "future payments digital one",
-  "futurePaymentsParagraphTwo": "future payments digital two",
+  "futurePaymentsParagraph": "future payments digital",
   "licenceDetailsDigitalParagraph": "fishing self digital confirmation licence details",
   "licenceDetailsParagraphTwo": "paragraph self licence details",
   "licenceTitle": "title self licence details",
@@ -16,8 +15,7 @@ Object {
 
 exports[`The order completion handler 12 month digital licence for someone else 1`] = `
 Object {
-  "futurePaymentsParagraphOne": "future payments digital one",
-  "futurePaymentsParagraphTwo": "future payments digital two",
+  "futurePaymentsParagraph": "future payments digital",
   "licenceDetailsDigitalParagraph": "fishing bobo digital licence details",
   "licenceDetailsParagraphTwo": "paragraph bobo licence details",
   "licenceTitle": "title bobo licence details",
@@ -30,8 +28,7 @@ Object {
 
 exports[`The order completion handler 12 month digital licence for you 1`] = `
 Object {
-  "futurePaymentsParagraphOne": "future payments digital one",
-  "futurePaymentsParagraphTwo": "future payments digital two",
+  "futurePaymentsParagraph": "future payments digital",
   "licenceDetailsDigitalParagraph": "fishing self digital licence details",
   "licenceDetailsParagraphTwo": "paragraph self licence details",
   "licenceTitle": "title self licence details",
@@ -44,8 +41,7 @@ Object {
 
 exports[`The order completion handler 12 month postal licence for someone else with digital confirmation 1`] = `
 Object {
-  "futurePaymentsParagraphOne": "future payments digital one",
-  "futurePaymentsParagraphTwo": "future payments digital two",
+  "futurePaymentsParagraph": "future payments digital",
   "licenceDetailsDigitalParagraph": "fishing bobo digital confirmation licence details",
   "licenceDetailsParagraphTwo": "paragraph bobo licence details",
   "licenceTitle": "title bobo licence details",
@@ -58,8 +54,7 @@ Object {
 
 exports[`The order completion handler 12 month postal licence for someone else with none digital confirmation 1`] = `
 Object {
-  "futurePaymentsParagraphOne": "future payments digital one",
-  "futurePaymentsParagraphTwo": "future payments digital two",
+  "futurePaymentsParagraph": "future payments digital",
   "licenceDetailsDigitalParagraph": undefined,
   "licenceDetailsParagraphTwo": "paragraph bobo licence details",
   "licenceTitle": "title bobo licence details",
@@ -72,8 +67,7 @@ Object {
 
 exports[`The order completion handler 12 month postal licence for you with digital confirmation 1`] = `
 Object {
-  "futurePaymentsParagraphOne": "future payments digital one",
-  "futurePaymentsParagraphTwo": "future payments digital two",
+  "futurePaymentsParagraph": "future payments digital",
   "licenceDetailsDigitalParagraph": "fishing self digital confirmation licence details",
   "licenceDetailsParagraphTwo": "paragraph self licence details",
   "licenceTitle": "title self licence details",
@@ -86,8 +80,7 @@ Object {
 
 exports[`The order completion handler 12 month postal licence for you with none digital confirmation 1`] = `
 Object {
-  "futurePaymentsParagraphOne": "future payments digital one",
-  "futurePaymentsParagraphTwo": "future payments digital two",
+  "futurePaymentsParagraph": "future payments digital",
   "licenceDetailsDigitalParagraph": undefined,
   "licenceDetailsParagraphTwo": "paragraph self licence details",
   "licenceTitle": "title self licence details",
@@ -100,8 +93,7 @@ Object {
 
 exports[`The order completion handler 12 month recurring payment with digital reminder 1`] = `
 Object {
-  "futurePaymentsParagraphOne": "future payments digital one",
-  "futurePaymentsParagraphTwo": "future payments digital two",
+  "futurePaymentsParagraph": "future payments digital",
   "licenceDetailsDigitalParagraph": "fishing self digital licence details",
   "licenceDetailsParagraphTwo": "paragraph self licence details",
   "licenceTitle": "title self licence details",
@@ -114,8 +106,7 @@ Object {
 
 exports[`The order completion handler 12 month recurring payment with postal reminder 1`] = `
 Object {
-  "futurePaymentsParagraphOne": "future payments postal one",
-  "futurePaymentsParagraphTwo": "future payments postal two",
+  "futurePaymentsParagraph": "future payments postal",
   "licenceDetailsDigitalParagraph": "fishing self digital licence details",
   "licenceDetailsParagraphTwo": "paragraph self licence details",
   "licenceTitle": "title self licence details",

package/src/pages/order-complete/order-complete/__tests__/order-complete.spec.js

@@ -99,10 +99,8 @@ const getMessages = () => ({
   order_complete_when_fishing_bobo_postal_digital: 'fishing bobo postal digital when fishing',
   order_complete_when_fishing_self_non_postal_digital: 'fishing self non postal digital when fishing',
   order_complete_when_fishing_bobo_non_postal_digital: 'fishing bobo non postal digital when fishing',
-  order_complete_future_payments_digital_paragraph_1: 'future payments digital one',
-  order_complete_future_payments_digital_paragraph_2: 'future payments digital two',
-  order_complete_future_payments_postal_paragraph_1: 'future payments postal one',
-  order_complete_future_payments_postal_paragraph_2: 'future payments postal two'
+  order_complete_future_payments_digital_paragraph: 'future payments digital',
+  order_complete_future_payments_postal_paragraph: 'future payments postal'
 })
 
 const getSampleRequest = ({

package/src/pages/order-complete/order-complete/order-complete.njk

@@ -29,7 +29,7 @@
 
             {% if (data.recurringPayment) %}
                 <h2 class="govuk-heading-m">{{ mssgs.order_complete_future_payments_title }}</h2>
-                <p class="govuk-body">{{ data.content.futurePaymentsParagraphOne }}<a class="govuk-link"  href="">{{ mssgs.order_complete_future_payments_link }}</a>{{ data.content.futurePaymentsParagraphTwo }}</p>
+                <p class="govuk-body">{{ data.content.futurePaymentsParagraph }}</p>
             {% endif %}
 
             <h2 class="govuk-heading-m">{{ mssgs.order_complete_when_fishing_title }}</h2>

package/src/pages/order-complete/order-complete/route.js

@@ -94,13 +94,9 @@ const getOrderCompleteContent = (permission, mssgs, transaction) => {
       ? mssgs.order_complete_when_fishing_self_postal_non_digital_2
       : mssgs.order_complete_when_fishing_bobo_postal_non_digital_2,
 
-    futurePaymentsParagraphOne: digitalReminder(permission)
-      ? mssgs.order_complete_future_payments_digital_paragraph_1
-      : mssgs.order_complete_future_payments_postal_paragraph_1,
-
-    futurePaymentsParagraphTwo: digitalReminder(permission)
-      ? mssgs.order_complete_future_payments_digital_paragraph_2
-      : mssgs.order_complete_future_payments_postal_paragraph_2
+    futurePaymentsParagraph: digitalReminder(permission)
+      ? mssgs.order_complete_future_payments_digital_paragraph
+      : mssgs.order_complete_future_payments_postal_paragraph
   }
 }