Skip to content

Commit

Permalink
Merge branch 'main' into MLPAB-1518-how-to-get-lambda-insights-for-th…
Browse files Browse the repository at this point in the history 
…e-s-3-antivirus-lamdba-function
  • Loading branch information
@andrewpearce-digital
andrewpearce-digital authored Nov 1, 2023
2 parents 48deb82 + e0254c9 commit 8e93836
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 40 deletions.
2 changes: 1 addition & 1 deletion internal/page/donor/previous_fee.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func PreviousFee(tmpl template.Template, payer Payer, donorStore DonorStore) Han
return payer.Pay(appData, w, r, lpa)
}

return appData.Redirect(w, r, lpa, page.Paths.EvidenceRequiredForPreviousFee.Format(lpa.ID))
return appData.Redirect(w, r, lpa, page.Paths.EvidenceRequired.Format(lpa.ID))
}
}

Expand Down
4 changes: 2 additions & 2 deletions internal/page/donor/previous_fee_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func TestPostPreviousFeeWhenOtherFee(t *testing.T) {

assert.Nil(t, err)
assert.Equal(t, http.StatusFound, resp.StatusCode)
assert.Equal(t, page.Paths.EvidenceRequiredForPreviousFee.Format("lpa-id"), resp.Header.Get("Location"))
assert.Equal(t, page.Paths.EvidenceRequired.Format("lpa-id"), resp.Header.Get("Location"))
}

func TestPostPreviousFeeWhenNotChanged(t *testing.T) {
Expand All @@ -141,7 +141,7 @@ func TestPostPreviousFeeWhenNotChanged(t *testing.T) {

assert.Nil(t, err)
assert.Equal(t, http.StatusFound, resp.StatusCode)
assert.Equal(t, page.Paths.EvidenceRequiredForPreviousFee.Format("lpa-id"), resp.Header.Get("Location"))
assert.Equal(t, page.Paths.EvidenceRequired.Format("lpa-id"), resp.Header.Get("Location"))
}

func TestPostPreviousFeeWhenStoreErrors(t *testing.T) {
Expand Down
2 changes: 0 additions & 2 deletions internal/page/paths.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ type AppPaths struct {
EnterTrustCorporation LpaPath
EnterTrustCorporationAddress LpaPath
EvidenceRequired LpaPath
EvidenceRequiredForPreviousFee LpaPath
FeeDenied LpaPath
GettingHelpSigning LpaPath
HowDoYouKnowYourCertificateProvider LpaPath
Expand Down Expand Up @@ -330,5 +329,4 @@ var Paths = AppPaths{
YourIndependentWitnessAddress: "/your-independent-witness-address",
YourIndependentWitnessMobile: "/your-independent-witness-mobile",
YourLegalRightsAndResponsibilities: "/your-legal-rights-and-responsibilities",
EvidenceRequiredForPreviousFee: "/evidence-required-for-previous-fee",
}
7 changes: 7 additions & 0 deletions lang/cy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -837,20 +837,27 @@
"repeatApplicationDiscount": "Welsh",
"hardshipFeeWaiver": "Welsh",
"evidenceRequiredHalfFee": "Welsh",
"newEvidenceRequiredHalf": "Welsh",
"evidenceRequiredHalfFeeIntroContent": "<p class=\"govuk-body\">Welsh</p> <p class=\"govuk-body\">Welsh</p> <h2 class=\"govuk-heading-l\">Welsh</h2> <p class=\"govuk-body\">Welsh</p> <p class=\"govuk-body\">Welsh</p>",
"newEvidenceRequiredHalfFeeIntroContent": "<p class=\"govuk-body\">Welsh</p>",
"evidenceRequiredHalfFeeIncomeContent": "<p class=\"govuk-body\">Welsh</p>",
"whereYourIncomeCanComeFrom": "Welsh",
"whereYourIncomeCanComeFromDetail": "<p class=\"govuk-body\">Welsh</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>Welsh</li> <li>Welsh</li> <li>Welsh</li> <li>Welsh</li> <li>Welsh</li> </ul> <p class=\"govuk-body\">Welsh</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>Welsh</li> <li>Welsh</li> <li>Welsh</li> </ul>",
"evidenceRequiredHalfFeeEvidenceContent": "<h3 class=\"govuk-heading-m\">Welsh</h3> <p class=\"govuk-body\">Welsh</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>Welsh</li> <li>Welsh</li> <li>Welsh</li> <li>Welsh</li> </ul> <p class=\"govuk-body\">Welsh</p>",
"ifYouHaveNoIncome": "Welsh",
"ifYouHaveNoIncomeDetail": "<p class=\"govuk-body\">Welsh</p>",
"evidenceRequiredHalfFeeUniversalCreditContent": "<h2 class=\"govuk-heading-l\">Welsh</h2> <p class=\"govuk-body\">Welsh</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>Welsh</li> <li>Welsh</li> <li>Welsh</li> </ul>",
"evidenceRequiredNoFee": "Welsh",
"newEvidenceRequiredExemption": "Welsh",
"evidenceRequiredNoFeeIntroContent": "<p class=\"govuk-body\">Welsh</p>",
"newEvidenceRequiredNoFeeIntroContent": "<p class=\"govuk-body\">Welsh</p>",
"eligibleMeansTestedBenefits": "Welsh",
"eligibleMeansTestedBenefitsDetail": "<p class=\"govuk-body\">Welsh</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>Welsh</li> <li>Welsh</li> <li>Welsh</li> <li>Welsh</li> <li>Welsh</li> <li>Welsh</li> <li>Welsh</li> </ul> <p class=\"govuk-body\">Welsh <span class=\"govuk-!-font-weight-bold\">Welsh</span> Welsh</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>Welsh</li> <li>Welsh</li> <li>Welsh</li> </ul> <p class=\"govuk-body\">Welsh</p> <h3 class=\"govuk-heading-s\">Welsh</h3> <p class=\"govuk-body\">Welsh</p>",
"evidenceRequiredNoFeeEvidenceContent": "<h2 class=\"govuk-heading-l\">Welsh</h2> <p class=\"govuk-body\">Welsh</p> <p class=\"govuk-body\">Welsh</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>Welsh</li> <li>Welsh</li> </ul>",
"evidenceRequiredHardshipFee": "Welsh",
"newEvidenceRequiredHardship": "Welsh",
"evidenceRequiredHardshipFeeContent": "<p class=\"govuk-body\">Welsh</p> <p class=\"govuk-body\">Welsh</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>Welsh</li> <li>Welsh</li> </ul> <p class=\"govuk-body\">Welsh</p>",
"newEvidenceRequiredHardshipFeeContent": "<p class=\"govuk-body\">Welsh</p> <p class=\"govuk-body\">Welsh</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>Welsh</li> <li>Welsh</li> </ul> <p class=\"govuk-body\">Welsh</p>",
"howWouldYouLikeToSendUsYourEvidence": "Welsh",
"howWouldYouLikeToSendUsYourEvidenceContent": "<p class=\"govuk-body\">Welsh</p>",
"howYouWouldLikeToSendUsYourEvidence": "Welsh",
Expand Down
21 changes: 14 additions & 7 deletions lang/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -781,20 +781,27 @@
"repeatApplicationDiscount": "Repeat application discount",
"hardshipFeeWaiver": "Hardship (fee waiver)",
"evidenceRequiredHalfFee": "Evidence required to pay a half fee",
"evidenceRequiredHalfFeeIntroContent": "<p class=\"govuk-body\">You’ve told us you’re applying to pay a half fee for your LPA.</p> <p class=\"govuk-body\">What evidence we need depends on whether you’re applying based on your income or because you get Universal Credit.</p> <h2 class=\"govuk-heading-l\">If you’re applying based on your income</h2> <p class=\"govuk-body\">If your gross annual income (your yearly income before tax) is less than £12,000, you can apply for a half fee.</p> <p class=\"govuk-body\">You need to upload or send us recent proof of your gross annual income.</p>",
"newEvidenceRequiredHalf": "New evidence required to pay a half fee",
"evidenceRequiredHalfFeeIntroContent": "<p class=\"govuk-body\">You’ve told us you’re applying to pay a half fee for your LPA.</p><p class=\"govuk-body\">What evidence we need depends on whether you’re applying based on your income or because you get Universal Credit.</p>",
"newEvidenceRequiredHalfFeeIntroContent": "<p class=\"govuk-body\">You’ve told us that you previously made an LPA application and that you paid a half fee (a ‘remission’).</p><p class=\"govuk-body\">You must provide new evidence to pay a half fee on this application.</p><p class=\"govuk-body\">What evidence we need depends on whether you’re applying based on your income or because you get Universal Credit.</p>",
"evidenceRequiredHalfFeeIncomeContent": "<h2 class=\"govuk-heading-l\">If you’re applying based on your income</h2><p class=\"govuk-body\">If your gross annual income (your yearly income before tax) is less than £12,000, you can apply for a half fee.</p><p class=\"govuk-body\">You need to upload or send us recent proof of your gross annual income.</p>",
"whereYourIncomeCanComeFrom": "Where your income can come from",
"whereYourIncomeCanComeFromDetail": "<p class=\"govuk-body\">Your income can be from:</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>employment</li> <li>pensions</li> <li>Pensions Savings Credit</li> <li>interest from savings and investments</li> <li>the rent of property</li> </ul> <p class=\"govuk-body\">It can also come from non-means-tested benefits, such as:</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>Attendance Allowance</li> <li>Disability Living Allowance</li> <li>Personal Independence Payment</li> </ul>",
"evidenceRequiredHalfFeeEvidenceContent": "<h3 class=\"govuk-heading-m\">Supporting evidence of your income</h3> <p class=\"govuk-body\">Your evidence can come from:</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>paid employment – provide your P60 or 3 months’ consecutive wage slips from current employment</li> <li>non-means-tested benefits and pensions – an official letter or notice</li> <li>interest from capital, stocks, shares or bonds – statements or vouchers showing your gross income</li> <li>self-employment – your most recent self-assessment tax return and HMRC tax calculation, or audited account certified by a qualified accountant</li> </ul> <p class=\"govuk-body\">We do not accept bank statements.</p>",
"whereYourIncomeCanComeFromDetail": "<p class=\"govuk-body\">Your income can be from:</p><ul class=\"govuk-list govuk-list--bullet\"><li>employment</li><li>pensions</li><li>Pensions Savings Credit</li><li>interest from savings and investments</li><li>the rent of property</li></ul><p class=\"govuk-body\">It can also come from non-means-tested benefits, such as:</p><ul class=\"govuk-list govuk-list--bullet\"><li>Attendance Allowance</li><li>Disability Living Allowance</li><li>Personal Independence Payment</li></ul>",
"evidenceRequiredHalfFeeEvidenceContent": "<h3 class=\"govuk-heading-m\">Supporting evidence of your income</h3><p class=\"govuk-body\">Your evidence can come from:</p><ul class=\"govuk-list govuk-list--bullet\"><li>paid employment – provide your P60 or 3 months’ consecutive wage slips from current employment</li><li>non-means-tested benefits and pensions – an official letter or notice</li><li>interest from capital, stocks, shares or bonds – statements or vouchers showing your gross income</li><li>self-employment – your most recent self-assessment tax return and HMRC tax calculation, or audited account certified by a qualified accountant</li></ul><p class=\"govuk-body\">We do not accept bank statements.</p>",
"ifYouHaveNoIncome": "If you have no income",
"ifYouHaveNoIncomeDetail": "<p class=\"govuk-body\">If you receive no income, you must write a signed statement explaining how you support yourself.</p>",
"evidenceRequiredHalfFeeUniversalCreditContent": "<h2 class=\"govuk-heading-l\">If you’re applying based on Universal Credit</h2> <p class=\"govuk-body\">If you’re applying to pay a half fee because you get Universal Credit, you need to upload or send us copies of letters that:</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>show you currently receive Universal Credit</li> <li>confirm that the benefit is being paid to you</li> <li>include your printed details (your title, full name, address and postcode)</li> </ul>",
"evidenceRequiredHalfFeeUniversalCreditContent": "<h2 class=\"govuk-heading-l\">If you’re applying based on Universal Credit</h2><p class=\"govuk-body\">If you’re applying to pay a half fee because you get Universal Credit, you need to upload or send us copies of letters that:</p><ul class=\"govuk-list govuk-list--bullet\"><li>show you currently receive Universal Credit</li><li>confirm that the benefit is being paid to you</li><li>include your printed details (your title, full name, address and postcode)</li></ul>",
"evidenceRequiredNoFee": "Evidence required to pay no fee",
"newEvidenceRequiredExemption": "New evidence required to pay no fee",
"evidenceRequiredNoFeeIntroContent": "<p class=\"govuk-body\">You’ve told us you’re applying to pay no fee because you currently receive an eligible means-tested benefit.</p>",
"newEvidenceRequiredNoFeeIntroContent": "<p class=\"govuk-body\">You’ve told us that you previously made an LPA application and that you paid no fee because you got an exemption.</p><p class=\"govuk-body\">You must provide evidence to qualify for an exemption on your new application.</p><p class=\"govuk-body\">You must currently receive an eligible means-tested benefit.</p>",
"eligibleMeansTestedBenefits": "Eligible means-tested benefits",
"eligibleMeansTestedBenefitsDetail": "<p class=\"govuk-body\">You can apply to pay no fee (an ‘exemption’) if you currently get:</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>Income Support</li> <li>Income-based Employment and Support Allowance</li> <li>Income-based Jobseeker’s Allowance</li> <li>Guarantee Credit element of State Pension Credit</li> <li>Housing Benefit</li> <li>Local Housing Allowance</li> <li>Council Tax Reduction or Council Tax Support (does not include the 25% single-person discount or the Class U exemption for severely mentally impaired people)</li> </ul> <p class=\"govuk-body\">Or if you get a combination of Working Tax Credit <span class=\"govuk-!-font-weight-bold\">and at least one</span> of these:</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>Child Tax Credit</li> <li>Disability Element of Working Tax Credit</li> <li>Severe Disability Element of Working Tax Credit</li> </ul> <p class=\"govuk-body\">Disability Living Allowance, Invalidity Benefit and Personal Independence Payment are not included.</p> <h3 class=\"govuk-heading-s\">Personal injury damages exclusion</h3> <p class=\"govuk-body\">If you were awarded personal injury damages of more than £16,000 and these were ignored when you were assessed for any of these benefits, you do not qualify for an exemption.</p>",
"evidenceRequiredNoFeeEvidenceContent": "<h2 class=\"govuk-heading-l\">Supporting evidence</h2> <p class=\"govuk-body\">You need to upload or send us copies of letters from a benefit provider showing that you currently get at least one eligible benefit.</p> <p class=\"govuk-body\">Letters must:</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>confirm that the benefit is being paid to you</li> <li>include your printed details (title, full name, address and postcode)</li> </ul>",
"eligibleMeansTestedBenefitsDetail": "<p class=\"govuk-body\">You can apply to pay no fee (an ‘exemption’) if you currently get:</p><ul class=\"govuk-list govuk-list--bullet\"><li>Income Support</li><li>Income-based Employment and Support Allowance</li><li>Income-based Jobseeker’s Allowance</li><li>Guarantee Credit element of State Pension Credit</li><li>Housing Benefit</li><li>Local Housing Allowance</li><li>Council Tax Reduction or Council Tax Support (does not include the 25% single-person discount or the Class U exemption for severely mentally impaired people)</li></ul><p class=\"govuk-body\">Or if you get a combination of Working Tax Credit <span class=\"govuk-!-font-weight-bold\">and at least one</span> of these:</p><ul class=\"govuk-list govuk-list--bullet\"><li>Child Tax Credit</li><li>Disability Element of Working Tax Credit</li><li>Severe Disability Element of Working Tax Credit</li></ul><p class=\"govuk-body\">Disability Living Allowance, Invalidity Benefit and Personal Independence Payment are not included.</p><h3 class=\"govuk-heading-s\">Personal injury damages exclusion</h3><p class=\"govuk-body\">If you were awarded personal injury damages of more than £16,000 and these were ignored when you were assessed for any of these benefits, you do not qualify for an exemption.</p>",
"evidenceRequiredNoFeeEvidenceContent": "<h2 class=\"govuk-heading-l\">Supporting evidence</h2><p class=\"govuk-body\">You need to upload or send us copies of letters from a benefit provider showing that you currently get at least one eligible benefit.</p><p class=\"govuk-body\">Letters must:</p><ul class=\"govuk-list govuk-list--bullet\"><li>confirm that the benefit is being paid to you</li><li>include your printed details (title, full name, address and postcode)</li></ul>",
"evidenceRequiredHardshipFee": "Evidence required for a hardship application",
"evidenceRequiredHardshipFeeContent": "<p class=\"govuk-body\">You’ve told us that you’d like to make a hardship application to have your LPA fee waived.</p> <p class=\"govuk-body\">To apply, you need to:</p> <ul class=\"govuk-list govuk-list--bullet\"> <li>explain why paying the LPA fee would cause you financial hardship</li> <li>provide bank statements and other documents showing all savings, income and outgoings</li> </ul> <p class=\"govuk-body\">You can upload these online or send them to us in the post.</p>",
"newEvidenceRequiredHardship": "New evidence required for a hardship application",
"evidenceRequiredHardshipFeeContent": "<p class=\"govuk-body\">You’ve told us that you’d like to make a hardship application to have your LPA fee waived.</p><p class=\"govuk-body\">To apply, you need to:</p><ul class=\"govuk-list govuk-list--bullet\"><li>explain why paying the LPA fee would cause you financial hardship</li><li>provide bank statements and other documents showing all savings, income and outgoings</li></ul><p class=\"govuk-body\">You can upload these online or send them to us in the post.</p>",
"newEvidenceRequiredHardshipFeeContent": "<p class=\"govuk-body\">You’ve told us that you previously made an LPA application and that you paid no fee because you were approved for a hardship fee waiver.</p><p class=\"govuk-body\">You can apply again, but you will need to provide new evidence.</p><p class=\"govuk-body\">To apply, you need to:</p><ul class=\"govuk-list govuk-list--bullet\"><li>explain why paying the LPA fee would cause you financial hardship</li><li>provide bank statements and other documents showing all savings, income and outgoings</li></ul><p class=\"govuk-body\">You can upload these online or send them to us in the post.</p>",
"howWouldYouLikeToSendUsYourEvidence": "How would you like to send us your evidence?",
"howWouldYouLikeToSendUsYourEvidenceContent": "<p class=\"govuk-body\">You can upload your supporting evidence on the next page, or you can send it to us in the post.</p>",
"howYouWouldLikeToSendUsYourEvidence": "how you would like to send us your evidence",
Expand Down
Loading

0 comments on commit 8e93836

Please sign in to comment.