Dtspb 4222 order extra copies drop off fix

app.js

@@ -52,7 +52,7 @@ exports.init = function (isA11yTest = false, a11yTestSession = {}, ftValue) {
     const njkEnv = nunjucks.configure([
         'app/steps',
         'app/views',
-        'node_modules/govuk-frontend/'
+        'node_modules/govuk-frontend/dist'
     ], {
         noCache: isDev,
         express: app
@@ -191,15 +191,15 @@ exports.init = function (isA11yTest = false, a11yTestSession = {}, ftValue) {
     app.use('/public/stylesheets', express.static(`${__dirname}/public/stylesheets`, caching));
     app.use('/public/images', express.static(`${__dirname}/app/assets/images`, caching));
     app.use('/public/locales', express.static(`${__dirname}/app/assets/locales`, caching));
-    app.use('/public/javascripts/govuk-frontend', express.static(`${__dirname}/node_modules/govuk-frontend`, caching));
+    app.use('/public/javascripts/govuk-frontend', express.static(`${__dirname}/node_modules/govuk-frontend/dist`, caching));
     app.use('/public/javascripts/jquery', express.static(`${__dirname}/node_modules/jquery/dist`, caching));
     app.use('/public/javascripts', express.static(`${__dirname}/app/assets/javascripts`, caching));
     app.use('/public/pdf', express.static(`${__dirname}/app/assets/pdf`));
-    app.use('/assets', express.static(`${__dirname}/node_modules/govuk-frontend/govuk/assets`, caching));
+    app.use('/assets', express.static(`${__dirname}/node_modules/govuk-frontend/dist/govuk/assets`, caching));
     app.use('/assets/locale', express.static(`${__dirname}/app/assets/locales/avaya-webchat`, caching));
 
     // Elements refers to icon folder instead of images folder
-    app.use(favicon(path.join(__dirname, 'node_modules', 'govuk-frontend', 'govuk', 'assets', 'images', 'favicon.ico')));
+    app.use(favicon(path.join(__dirname, 'node_modules', 'govuk-frontend', 'dist', 'govuk', 'assets', 'images', 'favicon.ico')));
 
     // Support for parsing data in POSTs
     app.use(bodyParser.json());

app/assets/sass/application-ie8.scss

@@ -1,36 +1,37 @@
 $path: "/public/images/";
 
 // Import GOV.UK Frontend
-@import "node_modules/govuk-frontend/govuk/base";
-@import "node_modules/govuk-frontend/govuk/settings/all";
-@import "node_modules/govuk-frontend/govuk/core/all";
-@import "node_modules/govuk-frontend/govuk/objects/all";
-@import "node_modules/govuk-frontend/govuk/components/button/button";
-@import "node_modules/govuk-frontend/govuk/components/checkboxes/checkboxes";
-@import "node_modules/govuk-frontend/govuk/components/cookie-banner/cookie-banner";
-@import "node_modules/govuk-frontend/govuk/components/date-input/date-input";
-@import "node_modules/govuk-frontend/govuk/components/details/details";
-@import "node_modules/govuk-frontend/govuk/components/error-message/error-message";
-@import "node_modules/govuk-frontend/govuk/components/error-summary/error-summary";
-@import "node_modules/govuk-frontend/govuk/components/fieldset/fieldset";
-@import "node_modules/govuk-frontend/govuk/components/footer/footer";
-@import "node_modules/govuk-frontend/govuk/components/header/header";
-@import "node_modules/govuk-frontend/govuk/components/hint/hint";
-@import "node_modules/govuk-frontend/govuk/components/input/input";
-@import "node_modules/govuk-frontend/govuk/components/inset-text/inset-text";
-@import "node_modules/govuk-frontend/govuk/components/panel/panel";
-@import "node_modules/govuk-frontend/govuk/components/phase-banner/phase-banner";
-@import "node_modules/govuk-frontend/govuk/components/radios/radios";
-@import "node_modules/govuk-frontend/govuk/components/select/select";
-@import "node_modules/govuk-frontend/govuk/components/skip-link/skip-link";
-@import "node_modules/govuk-frontend/govuk/components/summary-list/summary-list";
-@import "node_modules/govuk-frontend/govuk/components/table/table";
-@import "node_modules/govuk-frontend/govuk/components/tag/tag";
-@import "node_modules/govuk-frontend/govuk/components/textarea/textarea";
-@import "node_modules/govuk-frontend/govuk/components/warning-text/warning-text";
-@import "node_modules/govuk-frontend/govuk/utilities/all";
-@import "node_modules/govuk-frontend/govuk/overrides/all";
-@import "node_modules/govuk-frontend/govuk/components/notification-banner/notification-banner";
+@import "node_modules/govuk-frontend/dist/govuk/base";
+@import "node_modules/govuk-frontend/dist/govuk/settings/all";
+@import "node_modules/govuk-frontend/dist/govuk/core/all";
+@import "node_modules/govuk-frontend/dist/govuk/objects/all";
+@import "node_modules/govuk-frontend/dist/govuk/components/button/button";
+@import "node_modules/govuk-frontend/dist/govuk/components/checkboxes/checkboxes";
+@import "node_modules/govuk-frontend/dist/govuk/components/cookie-banner/cookie-banner";
+@import "node_modules/govuk-frontend/dist/govuk/components/date-input/date-input";
+@import "node_modules/govuk-frontend/dist/govuk/components/details/details";
+@import "node_modules/govuk-frontend/dist/govuk/components/error-message/error-message";
+@import "node_modules/govuk-frontend/dist/govuk/components/error-summary/error-summary";
+@import "node_modules/govuk-frontend/dist/govuk/components/fieldset/fieldset";
+@import "node_modules/govuk-frontend/dist/govuk/components/footer/footer";
+@import "node_modules/govuk-frontend/dist/govuk/components/header/header";
+@import "node_modules/govuk-frontend/dist/govuk/components/hint/hint";
+@import "node_modules/govuk-frontend/dist/govuk/components/input/input";
+@import "node_modules/govuk-frontend/dist/govuk/components/inset-text/inset-text";
+@import "node_modules/govuk-frontend/dist/govuk/components/panel/panel";
+@import "node_modules/govuk-frontend/dist/govuk/components/phase-banner/phase-banner";
+@import "node_modules/govuk-frontend/dist/govuk/components/radios/radios";
+@import "node_modules/govuk-frontend/dist/govuk/components/select/select";
+@import "node_modules/govuk-frontend/dist/govuk/components/skip-link/skip-link";
+@import "node_modules/govuk-frontend/dist/govuk/components/summary-list/summary-list";
+@import "node_modules/govuk-frontend/dist/govuk/components/table/table";
+@import "node_modules/govuk-frontend/dist/govuk/components/tag/tag";
+@import "node_modules/govuk-frontend/dist/govuk/components/textarea/textarea";
+@import "node_modules/govuk-frontend/dist/govuk/components/warning-text/warning-text";
+@import "node_modules/govuk-frontend/dist/govuk/utilities/all";
+@import "node_modules/govuk-frontend/dist/govuk/overrides/all";
+@import "node_modules/govuk-frontend/dist/govuk/components/notification-banner/notification-banner";
+@import "node_modules/govuk-frontend/dist/govuk/components/task-list/task-list";
 
 @import "patterns/phase-banner";
 @import "patterns/header";

app/assets/sass/application.scss

@@ -1,37 +1,38 @@
 $path: "/public/images/";
 
 // Import GOV.UK Frontend
-@import "node_modules/govuk-frontend/govuk/base";
-@import "node_modules/govuk-frontend/govuk/settings/all";
-@import "node_modules/govuk-frontend/govuk/core/all";
-@import "node_modules/govuk-frontend/govuk/objects/all";
-@import "node_modules/govuk-frontend/govuk/components/back-link/back-link";
-@import "node_modules/govuk-frontend/govuk/components/button/button";
-@import "node_modules/govuk-frontend/govuk/components/checkboxes/checkboxes";
-@import "node_modules/govuk-frontend/govuk/components/cookie-banner/cookie-banner";
-@import "node_modules/govuk-frontend/govuk/components/date-input/date-input";
-@import "node_modules/govuk-frontend/govuk/components/details/details";
-@import "node_modules/govuk-frontend/govuk/components/error-message/error-message";
-@import "node_modules/govuk-frontend/govuk/components/error-summary/error-summary";
-@import "node_modules/govuk-frontend/govuk/components/fieldset/fieldset";
-@import "node_modules/govuk-frontend/govuk/components/footer/footer";
-@import "node_modules/govuk-frontend/govuk/components/header/header";
-@import "node_modules/govuk-frontend/govuk/components/hint/hint";
-@import "node_modules/govuk-frontend/govuk/components/input/input";
-@import "node_modules/govuk-frontend/govuk/components/inset-text/inset-text";
-@import "node_modules/govuk-frontend/govuk/components/panel/panel";
-@import "node_modules/govuk-frontend/govuk/components/phase-banner/phase-banner";
-@import "node_modules/govuk-frontend/govuk/components/radios/radios";
-@import "node_modules/govuk-frontend/govuk/components/select/select";
-@import "node_modules/govuk-frontend/govuk/components/skip-link/skip-link";
-@import "node_modules/govuk-frontend/govuk/components/summary-list/summary-list";
-@import "node_modules/govuk-frontend/govuk/components/table/table";
-@import "node_modules/govuk-frontend/govuk/components/tag/tag";
-@import "node_modules/govuk-frontend/govuk/components/textarea/textarea";
-@import "node_modules/govuk-frontend/govuk/components/warning-text/warning-text";
-@import "node_modules/govuk-frontend/govuk/utilities/all";
-@import "node_modules/govuk-frontend/govuk/overrides/all";
-@import "node_modules/govuk-frontend/govuk/components/notification-banner/notification-banner";
+@import "node_modules/govuk-frontend/dist/govuk/base";
+@import "node_modules/govuk-frontend/dist/govuk/settings/all";
+@import "node_modules/govuk-frontend/dist/govuk/core/all";
+@import "node_modules/govuk-frontend/dist/govuk/objects/all";
+@import "node_modules/govuk-frontend/dist/govuk/components/back-link/back-link";
+@import "node_modules/govuk-frontend/dist/govuk/components/button/button";
+@import "node_modules/govuk-frontend/dist/govuk/components/checkboxes/checkboxes";
+@import "node_modules/govuk-frontend/dist/govuk/components/cookie-banner/cookie-banner";
+@import "node_modules/govuk-frontend/dist/govuk/components/date-input/date-input";
+@import "node_modules/govuk-frontend/dist/govuk/components/details/details";
+@import "node_modules/govuk-frontend/dist/govuk/components/error-message/error-message";
+@import "node_modules/govuk-frontend/dist/govuk/components/error-summary/error-summary";
+@import "node_modules/govuk-frontend/dist/govuk/components/fieldset/fieldset";
+@import "node_modules/govuk-frontend/dist/govuk/components/footer/footer";
+@import "node_modules/govuk-frontend/dist/govuk/components/header/header";
+@import "node_modules/govuk-frontend/dist/govuk/components/hint/hint";
+@import "node_modules/govuk-frontend/dist/govuk/components/input/input";
+@import "node_modules/govuk-frontend/dist/govuk/components/inset-text/inset-text";
+@import "node_modules/govuk-frontend/dist/govuk/components/panel/panel";
+@import "node_modules/govuk-frontend/dist/govuk/components/phase-banner/phase-banner";
+@import "node_modules/govuk-frontend/dist/govuk/components/radios/radios";
+@import "node_modules/govuk-frontend/dist/govuk/components/select/select";
+@import "node_modules/govuk-frontend/dist/govuk/components/skip-link/skip-link";
+@import "node_modules/govuk-frontend/dist/govuk/components/summary-list/summary-list";
+@import "node_modules/govuk-frontend/dist/govuk/components/table/table";
+@import "node_modules/govuk-frontend/dist/govuk/components/tag/tag";
+@import "node_modules/govuk-frontend/dist/govuk/components/textarea/textarea";
+@import "node_modules/govuk-frontend/dist/govuk/components/warning-text/warning-text";
+@import "node_modules/govuk-frontend/dist/govuk/utilities/all";
+@import "node_modules/govuk-frontend/dist/govuk/overrides/all";
+@import "node_modules/govuk-frontend/dist/govuk/components/notification-banner/notification-banner";
+@import "node_modules/govuk-frontend/dist/govuk/components/task-list/task-list";
 
 @import "patterns/phase-banner";
 @import "patterns/header";

app/assets/sass/patterns/_task-list.scss

@@ -36,7 +36,7 @@ Task List
 .task-item {
   border-top: 1px solid govuk-colour("mid-grey");
   line-height: 1.5;
-  padding: 20px 0 10px 0;
+  padding: 10px 0 10px 0;
 
   &:last-child {
     border-bottom: 1px solid govuk-colour("mid-grey");
@@ -57,12 +57,12 @@ Task List
 }
 
 .task-list-section-number {
-  width: govuk-spacing(5);
+  width: govuk-spacing(1);
   padding-right: 0;
   display: table-cell;
 
   @include govuk-media-query($from: desktop) {
-    width: govuk-spacing(8);
+    width: govuk-spacing(2);
   }
 }
 

app/components/step-utils.js

@@ -142,7 +142,7 @@ const getScrennersPreviousUrl = (ctx, req, res, steps, currentStepName) => {
 };
 
 const isNoBackLinkStepName = (stepName) => {
-    return stepName==='CitizensHub' || stepName==='PaymentBreakdown' || stepName==='PaymentStatus' ||
+    return stepName==='CitizensHub' || stepName==='PaymentStatus' ||
         stepName==='ExecutorsAdditionalInvite' || stepName==='ThankYou' || stepName==='ExecutorsChangeMade' ||
         stepName==='ExecutorsInvitesSent' || stepName==='ExecutorsUpdateInviteSent';
 };

app/journeys/intestacy.js

@@ -16,13 +16,8 @@ const taskList = {
         lastStep: 'TaskList',
         summary: 'Summary'
     },
-    CopiesTask: {
-        firstStep: 'CopiesStart',
-        lastStep: 'CopiesSummary',
-        summary: 'CopiesSummary'
-    },
     PaymentTask: {
-        firstStep: 'PaymentBreakdown',
+        firstStep: 'CopiesStart',
         lastStep: 'TaskList',
         summary: 'Summary'
     },
@@ -209,7 +204,7 @@ const stepList = {
         otherwise: 'CopiesSummary'
     },
     CopiesOverseas: 'CopiesSummary',
-    CopiesSummary: 'TaskList',
+    CopiesSummary: 'PaymentBreakdown',
     PaymentBreakdown: 'PaymentStatus',
     PaymentStatus: 'TaskList',
     Documents: 'ThankYou',

app/journeys/probate.js

@@ -16,13 +16,8 @@ const taskList = {
         lastStep: 'TaskList',
         summary: 'Summary'
     },
-    CopiesTask: {
-        firstStep: 'CopiesStart',
-        lastStep: 'CopiesSummary',
-        summary: 'CopiesSummary'
-    },
     PaymentTask: {
-        firstStep: 'PaymentBreakdown',
+        firstStep: 'CopiesStart',
         lastStep: 'TaskList',
         summary: 'Summary'
     },
@@ -255,7 +250,7 @@ const stepList = {
         otherwise: 'CopiesSummary'
     },
     CopiesOverseas: 'CopiesSummary',
-    CopiesSummary: 'TaskList',
+    CopiesSummary: 'PaymentBreakdown',
     PaymentBreakdown: 'PaymentStatus',
     PaymentStatus: 'TaskList',
     AddressLookup: 'AddressLookup',

app/resources/cy/translation/dashboard.json

@@ -8,9 +8,9 @@
   "tableHeaderActions": "Camau gweithredu",
   "statusDraftProbate": "Nid yw'r enw wedi'i nodi eto",
   "statusDraftIntestacy": "Nid yw'r enw wedi'i nodi eto",
-  "statusInProgress": "YN MYND RHAGDDO",
-  "statusSubmitted": "CYFLWYNWYD",
-  "statusGrantIssued": "GRANT WEDI'I GYHOEDDI",
+  "statusInProgress": "Yn mynd rhagddo",
+  "statusSubmitted": "Cyflwynwyd",
+  "statusGrantIssued": "Grant wedi'i gyhoeddi",
   "actionContinue": "Parhau gyda’r cais",
   "actionView": "Gweld cynnydd y cais",
   "actionFindMore": "Dewch o hyd i ragor o wybodaeth",

app/resources/cy/translation/tasklist.json

@@ -3,7 +3,11 @@
   "header": "Gwneud cais am brofiant",
   "introduction": "Cwblhewch y camau hyn i gael yr hawl gyfreithiol i ddelio ag eiddo rhywun sydd wedi marw.",
   "paragraph1": "Gallwch arbed eich cais a dychwelyd ato hwyrach ymlaen.",
-  "paragraph2": "Ar ddiwedd bob adran, gofynnir ichi wirio eich atebion. Os oes unrhyw un yn anghywir, cewch gyfle i’w newid cyn mynd ymlaen i’r adran nesaf.",
+  "paragraph2": "Ar ddiwedd bob adran, gofynnir ichi wirio eich atebion. Os oes unrhyw un yn anghywir, cewch gyfle i’w newid cyn mynd ymlaen i’r adran nesaf. Unwaith y byddwch wedi gwneud eich datganiad cyfreithiol, bydd yn rhaid i unrhyw ddiwygiadau rydych am eu gwneud i’ch cais ar ôl yr amser hwnnw gael eu hanfon ar bapur i’r gofrestrfa.",
+  "taskGroup1": "Gwirio cyn i chi gychwyn",
+  "taskGroup2": "Paratoi’r cais",
+  "taskGroup3": "Cyflwyno’r cais",
+  "eligibilityTask": "Gwirio cymhwysedd",
   "deceasedTask": "Dywedwch wrthym am yr unigolyn sydd wedi marw",
   "executorsTask": "Rhowch fanylion am yr ysgutorion",
   "applicantsTask": "Rhowch fanylion am y bobl sy’n gwneud cais",
@@ -12,19 +16,18 @@
   "reviewAndConfirmTaskMultiplesParagraph2": "Os byddwch chi’n newid eich atebion, bydd yr ysgutorion yn gallu gweld y datganiad wedi’i ddiweddaru gan ddefnyddio’r un ddolen a gafodd ei hanfon atynt drwy e-bost.",
   "reviewAndConfirmTaskMultiplesParagraph3Heading": "Ysgutorion sydd angen gwneud datganiad cyfreithiol",
   "reviewAndConfirmTaskMultiplesParagraph3": "Rhaid bod pob ysgutor wedi gwneud eu datganiad cyfreithiol cyn y gallwch barhau â’ch cais.",
-  "copiesTaskProbate": "Archebu copïau ychwanegol o’r grant",
-  "copiesTaskIntestacy": "Archebu copïau ychwanegol o’r llythyrau gweinyddu",
   "paymentTask": "Talu a chyflwyno eich cais",
   "documentTask": "Anfon dogfennau",
-  "taskNotStarted": "Dechrau",
-  "taskStarted": "Parhau",
-  "checkYourAnswers": "Gwirio a newid eich atebion",
+  "taskNotStarted": "Heb ddechrau eto",
+  "taskStarted": "Yn mynd rhagddo",
   "taskUnavailable": "Ni allwch ddechrau eto",
+  "checkYourAnswers": "Gwirio a newid eich atebion",
   "taskComplete": "Wedi cwblhau",
   "alreadyDeclared": "Wedi datgan yn barod",
   "agreed": "Wedi cytuno",
   "disagreed": "Anghytuno",
   "notDeclared": "Heb ddatgan",
   "executorName": "Enw’r ysgutor",
-  "declarationStatus": "Statws y datganiad cyfreithiol"
+  "declarationStatus": "Statws y datganiad cyfreithiol",
+  "notificationBanner": "Rhaid i bob ysgutor wneud eu datganiad cyfreithiol cyn y gallwch barhau â’ch cais."
 }

app/resources/en/translation/dashboard.json

@@ -8,9 +8,9 @@
   "tableHeaderActions": "Actions",
   "statusDraftProbate": "Name not entered yet",
   "statusDraftIntestacy": "Name not entered yet",
-  "statusInProgress": "IN PROGRESS",
-  "statusSubmitted": "SUBMITTED",
-  "statusGrantIssued": "GRANT ISSUED",
+  "statusInProgress": "In progress",
+  "statusSubmitted": "Submitted",
+  "statusGrantIssued": "Grant issued",
   "actionContinue": "Continue application",
   "actionView": "View application progress",
   "actionFindMore": "Find out more",