diff --git a/deploy/template.yaml b/deploy/template.yaml index 9a44ab0cb..2f8e3d013 100644 --- a/deploy/template.yaml +++ b/deploy/template.yaml @@ -144,9 +144,9 @@ Mappings: SUPPORTTRIAGEPAGE: "1" SUPPORTWEBCHATDEMO: "1" WEBCHATSOURCEURL: "https://uat-chat-loader.smartagent.app/loader/main.js" - SUPPORTWEBCHATCONTACT: "1" - SUPPORTPHONECONTACT: "1" - SHOWCONTACTGUIDANCE: "1" + SUPPORTWEBCHATCONTACT: "0" + SUPPORTPHONECONTACT: "0" + SHOWCONTACTGUIDANCE: "0" CONTACTEMAILSERVICEURL: "https://signin.staging.account.gov.uk/contact-us-from-triage-page" build: NODEENV: "production" @@ -165,9 +165,9 @@ Mappings: SUPPORTTRIAGEPAGE: "1" SUPPORTWEBCHATDEMO: "1" WEBCHATSOURCEURL: "https://uat-chat-loader.smartagent.app/loader/main.js" - SUPPORTWEBCHATCONTACT: "1" - SUPPORTPHONECONTACT: "1" - SHOWCONTACTGUIDANCE: "1" + SUPPORTWEBCHATCONTACT: "0" + SUPPORTPHONECONTACT: "0" + SHOWCONTACTGUIDANCE: "0" CONTACTEMAILSERVICEURL: "https://signin.staging.account.gov.uk/contact-us-from-triage-page" staging: NODEENV: "production" @@ -208,7 +208,7 @@ Mappings: SUPPORTWEBCHATDEMO: "1" WEBCHATSOURCEURL: "https://uat-chat-loader.smartagent.app/loader/main.js" SUPPORTWEBCHATCONTACT: "0" - SUPPORTPHONECONTACT: "0" + SUPPORTPHONECONTACT: "1" SHOWCONTACTGUIDANCE: "1" CONTACTEMAILSERVICEURL: "https://signin.integration.account.gov.uk/contact-us-from-triage-page" production: @@ -225,7 +225,7 @@ Mappings: ANALYTICSCOOKIEDOMAIN: "account.gov.uk" SERVICEDOMAIN: "account.gov.uk" LOGSLEVEL: "info" - SUPPORTTRIAGEPAGE: "0" + SUPPORTTRIAGEPAGE: "1" SUPPORTWEBCHATDEMO: "0" WEBCHATSOURCEURL: "0" SUPPORTWEBCHATCONTACT: "0" diff --git a/src/components/contact-govuk-one-login/index.njk b/src/components/contact-govuk-one-login/index.njk index a4f7f10f9..a8e5618ac 100644 --- a/src/components/contact-govuk-one-login/index.njk +++ b/src/components/contact-govuk-one-login/index.njk @@ -2,97 +2,134 @@ {% from "govuk/components/inset-text/macro.njk" import govukInsetText %} {% set pageTitleName = 'pages.contact.title' | translate %} {% set hideAccountNavigation = true %} -{% set hidePhaseBanner = true %} {% set languageToggle = true %} -{% block pageContent %} - -{% if contactWebchatEnabled %} - -{% endif %} - -

{{'pages.contact.header' | translate}}

-{% if showContactGuidance %} +{% set secondaryContactMethodEnabled = contactPhoneEnabled or contactWebchatEnabled %} +{% set emailBlock %}
- {% set section1Paragraphs = 'pages.contact.section1.paragraphs' | translate({ returnObjects: true }) %} - {% set section1Links = 'pages.contact.section1.links' | translate({ returnObjects: true }) %} -

{{'pages.contact.section1.heading' | translate}}

- {% for paragraph in section1Paragraphs %} -

{{ paragraph }}

- {% endfor %} - {% if section1Links.length %} - + {% if secondaryContactMethodEnabled %} +

{{'pages.contact.section3.email.heading' | translate }}

{% endif %} + {% set emailParagraphs = 'pages.contact.section3.email.paragraphs' | translate({ returnObjects: true }) %} + {% for paragraph in emailParagraphs %} +

{{ paragraph | safe | replace('[emailServiceLinkHref]', contactEmailServiceUrl | translate ) }}

+ {% endfor %}
-{% endif %} +{% endset %} -
-

{{'pages.contact.section2.heading' | translate}}

- {% set section2Paragraphs = 'pages.contact.section2.paragraphs' | translate({ returnObjects: true }) %} - {% for paragraph in section2Paragraphs %} +{% set refCodeBlock %} + {% set refCodeBlockParagraphs = 'pages.contact.refCodeBlock.paragraphsWebchat' | translate({ returnObjects: true }) if contactWebchatEnabled else 'pages.contact.refCodeBlock.paragraphsNoWebchat' | translate({ returnObjects: true }) %} + {% for paragraph in refCodeBlockParagraphs %}

{{ paragraph }}

{% endfor %}

- {{'pages.contact.section2.refCode' | translate}} + {{'pages.contact.refCodeBlock.refCode' | translate}} {{ referenceCode }}

-
- -
-

{{'pages.contact.section3.heading' | translate}}

- {% if contactWebchatEnabled %} -
- {% set webchatParagraphs = 'pages.contact.section3.webchat.paragraphs' | translate({ returnObjects: true }) %} +{% endset %} -

{{'pages.contact.section3.webchat.heading' | translate}}

+{% set phoneBlock %} + {% set phoneParagraphs1 = 'pages.contact.section3.phone.paragraphs' | translate({ returnObjects: true }) %} + {% set phoneParagraphs2 = 'pages.contact.section3.phone.paragraphs2' | translate({ returnObjects: true }) %} + {% set insetTextHtml %} + {% set insetTextParagraphs = 'pages.contact.section3.phone.insetText.paragraphs' | translate({ returnObjects: true }) %} + {% for paragraph in insetTextParagraphs %} +

{{ paragraph | safe }}

+ {% endfor %} + {% endset %} - {% for paragraph in webchatParagraphs %} -

{{ paragraph | safe | replace('[useWebchatLinkHref]', 'pages.contact.section3.webchat.useWebchatLinkHref' | translate ) }}

+
+

{{'pages.contact.section3.phone.heading' | translate}}

+ {% if not contactWebchatEnabled %} + {{refCodeBlock | safe }} + {% else %} + {% for paragraph in phoneParagraphs1 %} +

{{ paragraph }}

{% endfor %} -
- {% endif %} + {% endif %} - {% if contactPhoneEnabled %} -
- {% set phoneParagraphs1 = 'pages.contact.section3.phone.paragraphs' | translate({ returnObjects: true }) %} - {% set phoneParagraphs2 = 'pages.contact.section3.phone.paragraphs2' | translate({ returnObjects: true }) %} - {% set insetTextHtml %} - {% set insetTextParagraphs = 'pages.contact.section3.phone.insetText.paragraphs' | translate({ returnObjects: true }) %} - {% for paragraph in insetTextParagraphs %} -

{{ paragraph | safe }}

- {% endfor %} - {% endset %} + {{ govukInsetText({ + html: insetTextHtml + }) }} -

{{'pages.contact.section3.phone.heading' | translate}}

+ {% for paragraph in phoneParagraphs2 %} +

{{ paragraph | safe | replace('[callChargesLinkHref]', 'pages.contact.section3.phone.callChargesLinkHref' | translate ) }}

+ {% endfor %} +
+{% endset %} - {% for paragraph in phoneParagraphs1 %} -

{{ paragraph }}

- {% endfor %} - {{ govukInsetText({ - html: insetTextHtml - }) }} +{# START page content #} + +{% block pageContent %} + +

{{'pages.contact.header' | translate}}

- {% for paragraph in phoneParagraphs2 %} -

{{ paragraph | safe | replace('[callChargesLinkHref]', 'pages.contact.section3.phone.callChargesLinkHref' | translate ) }}

+{% if not showContactGuidance and not contactWebchatEnabled and not contactPhoneEnabled %} + {# if everything is disabled, only show the contact form option #} + {{ emailBlock | safe }} +{% else %} + {% if showContactGuidance %} +
+ {% set section1Paragraphs = 'pages.contact.section1.paragraphs' | translate({ returnObjects: true }) %} + {% set section1Links = 'pages.contact.section1.links' | translate({ returnObjects: true }) %} +

{{'pages.contact.section1.heading' | translate}}

+ {% for paragraph in section1Paragraphs %} +

{{ paragraph }}

{% endfor %} + {% if section1Links.length %} + + {% endif %}
+
{% endif %} + + {% if contactPhoneEnabled and contactWebchatEnabled %} +
+

{{'pages.contact.section2.heading' | translate}}

+ {{ refCodeBlock | safe }} +
+
+ {% endif %} +
-

{{'pages.contact.section3.email.heading' | translate}}

- {% set emailParagraphs = 'pages.contact.section3.email.paragraphs' | translate({ returnObjects: true }) %} +

{% if secondaryContactMethodEnabled %}{{'pages.contact.section3.headingMany' | translate}}{% else %}{{'pages.contact.section3.headingOne' | translate }}{% endif %}

+ {% if contactWebchatEnabled %} +
+ {% set webchatParagraphs = 'pages.contact.section3.webchat.paragraphs' | translate({ returnObjects: true }) %} - {% for paragraph in emailParagraphs %} -

{{ paragraph | safe | replace('[emailServiceLinkHref]', contactEmailServiceUrl | translate ) }}

+

{{'pages.contact.section3.webchat.heading' | translate}}

+ + {% for paragraph in webchatParagraphs %} +

{{ paragraph | safe | replace('[useWebchatLinkHref]', 'pages.contact.section3.webchat.useWebchatLinkHref' | translate ) }}

+ {% endfor %} +
+ {% endif %} + + {% if contactPhoneEnabled %} + {{ phoneBlock | safe }} + {% endif %} + + {{ emailBlock | safe }} +
+
+
+ {% set section4Paragraphs = 'pages.contact.section4.paragraphs' | translate({ returnObjects: true }) %} +

{{'pages.contact.section4.heading' | translate}}

+ {% for paragraph in section4Paragraphs %} +

{{ paragraph | safe }}

{% endfor %}
-
+{% endif %} +{% if contactWebchatEnabled %} + +{% endif %} {% endblock %} diff --git a/src/locales/cy/translation.json b/src/locales/cy/translation.json index 9d44a3082..9ae9f2323 100644 --- a/src/locales/cy/translation.json +++ b/src/locales/cy/translation.json @@ -477,8 +477,92 @@ } }, "contact": { - "title": "Get help with GOV.UK One Login", - "header": "Contact GOV.UK One Login" + "title": "Cysylltu â GOV.UK One Login", + "header": "Cysylltu â GOV.UK One Login", + "section1": { + "heading": "Cyn i chi gysylltu â ni", + "paragraphs": [ + "Darllenwch ein canllaw os ydych yn cael problem gyda:" + ], + "links": [ + { + "href": "", + "text": "Defnyddio'r ap GOV.UK ID Check app" + },{ + "href": "", + "text": "Profi eich hunaniaeth gyda GOV.UK One Login drwy ateb cwestiynau diogelwch" + },{ + "href": "", + "text": "Newid y manylion mewngofnodi ar gyfer eich GOV.UK One Login" + },{ + "href": "", + "text": "Cael cod diogelwch ar gyfer GOV.UK One Login" + }, { + "href": "", + "text": "Dileu eich GOV.UK One Login" + } + ] + }, + "section2": { + "heading": "Pan fyddwch yn cysylltu â ni" + }, + "refCodeBlock": { + "paragraphsWebchat": [ + "Os ydych yn ffonio neu'n defnyddio gwesgwrs i gysylltu â'r tîm GOV.UK One Login, gofynnir i chi am god cyfeirinod.", + "Mae'r cod hwn yn ein helpu i weld lle y gallech fod yn cael problem." + ], + "paragraphsNoWebchat": [ + "Pan fyddwch yn cysylltu â ni dros y ffôn, gofynnir i chi am god cyfeirio.", + "Mae'r cod hwn yn ein helpu i weld lle y gallech fod yn cael problem." + ], + "refCode": "Eich cod cyfeirnod yw:" + }, + "section3": { + "headingOne": "Sut i gysylltu â ni", + "headingMany": "Ffyrdd o gysylltu â ni", + "webchat": { + "heading": "Gwesgwrs", + "paragraphs": [ + "Gofynnwch i gynorthwyydd digidol GOV.UK One Login i ddod o hyd i wybodaeth i'ch helpu chi neu sgwrsiwch ag ymgynghorydd.", + "Nid yw ein gwesgwrs yn gwbl hygyrch eto. Rydym yn gweithio i'w wella.Gallwch ddarganfod mwy am ein datganiad hygyrchedd.", + "Oriau agor:
Dydd Llun i ddydd Gwener, 8am i 8pm
Penwythnosau a gwyliau cyhoeddus, 9am i 5:30pm", + "Defnyddio gwesgwrs" + ], + "useWebchatLinkHref":"/webchat" + }, + "phone": { + "heading": "Ffôn", + "paragraphs": [ + "Byddwch angen eich cod cyfeirnod pan fyddwch yn ffonio." + ], + "insetText":{ + "paragraphs": [ + "O'r DU:
0300 123 2345", + "Y tu allan i'r DU:
+44 117 393 3928" + ] + }, + "paragraphs2": [ + "Oriau agor:
Dydd Llun i ddydd Gwener, 8am i 8pm
Penwythnosau a gwyliau cyhoeddus, 9am i 5:30pm", + "Darganfyddwch fwy am gostau galwadau" + ], + "callChargesLinkHref": "https://www.gov.uk/call-charges" + }, + "email": { + "heading": "E-bost", + "paragraphs": [ + "Cwblhewch y ffurflen gyswllt i ofyn am help.", + "Byddwn yn ateb drwy e-bost o fewn 2 ddiwrnod gwaith.", + "Byddwn yn ymateb yn ystod oriau swyddfa.", + "Oriau swyddfa:
Dydd Llun i ddydd Gwener, 9:30am i 5:30pm" + ] + } + }, + "section4": { + "heading": "Sut rydym yn defnyddio eich gwybodaeth", + "paragraphs": [ + "I ddarganfod pa wybodaeth rydym yn ei gadw pan fyddwch yn cysylltu â ni a sut rydym yn ei defnyddio, gweler hysbysiad preifatrwydd GOV.UK One Login" + ] + } }, "9fduJ6KAE8WwCb1VCKp788BC8mM" : { "header": "Darganfod corff asesu cydymffurfiaeth marchnad y DU", diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json index da9e5f683..724dabc46 100644 --- a/src/locales/en/translation.json +++ b/src/locales/en/translation.json @@ -478,7 +478,7 @@ } }, "contact": { - "title": "Get help with GOV.UK One Login", + "title": "Contact GOV.UK One Login", "header": "Contact GOV.UK One Login", "section1": { "heading": "Before you contact us", @@ -491,34 +491,42 @@ "text": "Using the GOV.UK ID Check app" },{ "href": "", - "text": "Scanning identity documents and your face in the GOV.UK ID Check app" + "text": "Proving your identity with GOV.UK One Login using security questions" },{ "href": "", - "text": "Confirming your identity if you do not have photo ID" + "text": "Change the sign in details for your GOV.UK One Login" },{ "href": "", - "text": "Changing your sign in details" + "text": "Getting a security code for GOV.UK One Login" }, { "href": "", - "text": "Getting a security code" + "text": "Deleting your GOV.UK One Login" } ] }, "section2": { - "heading": "When you contact us", - "paragraphs": [ - "If you call or use webchat to contact the GOV.UK One Login team, you will be asked for a reference code.", + "heading": "When you contact us" + }, + "refCodeBlock": { + "paragraphsWebchat": [ + "If you contact us by phone or use webchat, you'll be asked for a reference code.", + "This code helps us to see where you may be having a problem." + ], + "paragraphsNoWebchat": [ + "When you contact us by phone, you’ll be asked for a reference code.", "This code helps us to see where you may be having a problem." ], "refCode": "Your reference code is:" }, "section3": { - "heading": "Ways to contact us", + "headingOne": "How to contact us", + "headingMany": "Ways to contact us", "webchat": { "heading": "Webchat", "paragraphs": [ - "Ask GOV.UK One Login’s digital assistant to find information to help you. If the digital assistant cannot help you, you can chat live with a webchat adviser if they're available.", - "You'll need your reference code to chat with an adviser.", + "Ask GOV.UK One Login's digital assistant to find information to help you or chat with an advisor.", + "Our webchat is not yet fully accessible. Find out more about the limitations and how we're working to fix this.", + "Opening times:
Monday to Friday, 8am to 8pm
Weekends and public holidays, 9am to 5.30pm", "Use webchat" ], "useWebchatLinkHref":"/webchat" @@ -526,7 +534,6 @@ "phone": { "heading": "Phone", "paragraphs": [ - "Call GOV.UK One Login for help.", "You'll need your reference code when you call." ], "insetText":{ @@ -536,8 +543,7 @@ ] }, "paragraphs2": [ - "Opening times:", - "Monday to Friday, 8am to 8pm
Weekends and public holidays, 8am to 5.30pm", + "Opening times:
Monday to Friday, 8am to 8pm
Weekends and public holidays, 9am to 5.30pm", "Find out about call charges" ], "callChargesLinkHref": "https://www.gov.uk/call-charges" @@ -545,12 +551,18 @@ "email": { "heading": "Email", "paragraphs": [ - "Use our email service to ask for help.", - "We will respond to your support queries during office hours. Our office hours are 9:30am to 5:30pm, Monday to Friday.", - "We will try to reply within 2 working days." - ], - "emailServiceLinkHref": "/tbd" + "Fill in the contact form to ask for help.", + "We’ll reply by email within 2 working days.", + "We’ll respond during office hours.", + "Office hours:
Monday to Friday, 9:30am to 5:30pm" + ] } + }, + "section4": { + "heading": "How we use your information", + "paragraphs": [ + "To find out what information we store when you contact us and how we use it, see the GOV.UK One Login privacy notice." + ] } } },