Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MLPAB-2697: Remove fee denied page #1685

Merged
merged 5 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@ set-uploads-infected: ##@events calls emit-object-tags-added-with-virus for all
key=$$k $(MAKE) emit-object-tags-added-with-virus ; \
done

tail-logs: ##@app tails logs for app mock-notify, events-lambda, schedule-runner-lambda, mock-onelogin, mock-lpa-store and mock-uid
docker compose --ansi=always -f docker/docker-compose.yml -f docker/docker-compose.dev.yml logs app mock-notify events-lambda schedule-runner-lambda mock-onelogin mock-lpa-store mock-uid -f
tail-logs: ##@app tails logs for app mock-notify, mock-onelogin, mock-lpa-store, mock-uid and mock-pay
docker compose --ansi=always -f docker/docker-compose.yml -f docker/docker-compose.dev.yml logs app mock-notify mock-onelogin mock-lpa-store mock-uid mock-pay -f

terraform-update-docs: ##@terraform updates all terraform-docs managed documentation
terraform-docs --config terraform/environment/.terraform-docs.yml ./terraform/environment
Expand Down
4 changes: 0 additions & 4 deletions cypress/e2e/donor/payment.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,6 @@ describe('Pay for LPA', { pageLoadTimeout: 8000 }, () => {
cy.getCookie('pay').should('exist');
});

cy.url().should('contains', '/fee-denied')
cy.checkA11yApp();
cy.contains('button', 'Continue to payment').click();

cy.get('h1').should('contain', 'Payment received');
cy.checkA11yApp();
cy.getCookie('pay').should('not.exist');
Expand Down
69 changes: 2 additions & 67 deletions go.sum

Large diffs are not rendered by default.

26 changes: 0 additions & 26 deletions internal/donor/donorpage/fee_denied.go

This file was deleted.

65 changes: 0 additions & 65 deletions internal/donor/donorpage/fee_denied_test.go

This file was deleted.

4 changes: 1 addition & 3 deletions internal/donor/donorpage/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -380,10 +380,8 @@ func Register(
UploadEvidence(tmpls.Get("upload_evidence.gohtml"), logger, payer, documentStore))
handleWithDonor(donor.PathSendUsYourEvidenceByPost, page.CanGoBack,
SendUsYourEvidenceByPost(tmpls.Get("send_us_your_evidence_by_post.gohtml"), payer, eventClient))
handleWithDonor(donor.PathFeeApproved, page.None,
handleWithDonor(donor.PathPayFee, page.None,
payer)
handleWithDonor(donor.PathFeeDenied, page.None,
FeeDenied(tmpls.Get("fee_denied.gohtml"), payer))
handleWithDonor(donor.PathPaymentConfirmation, page.None,
PaymentConfirmation(logger, payClient, donorStore, sessionStore, shareCodeSender, lpaStoreClient, eventClient, notifyClient))
handleWithDonor(donor.PathPaymentSuccessful, page.None,
Expand Down
6 changes: 2 additions & 4 deletions internal/donor/donorpage/task_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,8 @@ func taskListCheckLpaPath(provided *donordata.Provided) donor.Path {
func taskListPaymentSection(provided *donordata.Provided) taskListSection {
var paymentPath string
switch provided.Tasks.PayForLpa {
case task.PaymentStateApproved:
paymentPath = donor.PathFeeApproved.Format(provided.LpaID)
case task.PaymentStateDenied:
paymentPath = donor.PathFeeDenied.Format(provided.LpaID)
case task.PaymentStateApproved, task.PaymentStateDenied:
paymentPath = donor.PathPayFee.Format(provided.LpaID)
case task.PaymentStateMoreEvidenceRequired:
paymentPath = donor.PathUploadEvidence.Format(provided.LpaID)
default:
Expand Down
4 changes: 2 additions & 2 deletions internal/donor/donorpage/task_list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func TestGetTaskList(t *testing.T) {
evidenceReceived: true,
expected: func(sections []taskListSection) []taskListSection {
sections[1].Items = []taskListItem{
{Name: "payForTheLpa", Path: donor.PathFeeDenied.Format("lpa-id"), PaymentState: task.PaymentStateDenied},
{Name: "payForTheLpa", Path: donor.PathPayFee.Format("lpa-id"), PaymentState: task.PaymentStateDenied},
}

return sections
Expand All @@ -81,7 +81,7 @@ func TestGetTaskList(t *testing.T) {
evidenceReceived: true,
expected: func(sections []taskListSection) []taskListSection {
sections[1].Items = []taskListItem{
{Name: "payForTheLpa", Path: donor.PathFeeApproved.Format("lpa-id"), PaymentState: task.PaymentStateApproved},
{Name: "payForTheLpa", Path: donor.PathPayFee.Format("lpa-id"), PaymentState: task.PaymentStateApproved},
}

return sections
Expand Down
3 changes: 1 addition & 2 deletions internal/donor/path.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ const (
PathEnterVoucher = Path("/enter-voucher")
PathEvidenceRequired = Path("/evidence-required")
PathEvidenceSuccessfullyUploaded = Path("/evidence-successfully-uploaded")
PathFeeApproved = Path("/fee-approved")
PathFeeDenied = Path("/fee-denied")
PathGettingHelpSigning = Path("/getting-help-signing")
PathHowDoYouKnowYourCertificateProvider = Path("/how-do-you-know-your-certificate-provider")
PathHowLongHaveYouKnownCertificateProvider = Path("/how-long-have-you-known-certificate-provider")
Expand All @@ -77,6 +75,7 @@ const (
PathLpaYourLegalRightsAndResponsibilities = Path("/your-legal-rights-and-responsibilities")
PathMakeANewLPA = Path("/make-a-new-lpa")
PathNeedHelpSigningConfirmation = Path("/need-help-signing-confirmation")
PathPayFee = Path("/pay-fee")
PathPaymentConfirmation = Path("/payment-confirmation")
PathPaymentSuccessful = Path("/payment-successful")
PathPreviousApplicationNumber = Path("/previous-application-number")
Expand Down
6 changes: 2 additions & 4 deletions internal/templatefn/paths.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,6 @@ type appPaths struct {
EnterVoucher donor.Path
EvidenceRequired donor.Path
EvidenceSuccessfullyUploaded donor.Path
FeeApproved donor.Path
FeeDenied donor.Path
GettingHelpSigning donor.Path
HowDoYouKnowYourCertificateProvider donor.Path
HowLongHaveYouKnownCertificateProvider donor.Path
Expand All @@ -189,6 +187,7 @@ type appPaths struct {
MakeANewLPA donor.Path
NeedHelpSigningConfirmation donor.Path
OneLoginIdentityDetails donor.Path
PayFee donor.Path
PaymentConfirmation donor.Path
PreviousApplicationNumber donor.Path
PreviousFee donor.Path
Expand Down Expand Up @@ -397,8 +396,6 @@ var paths = appPaths{
EnterVoucher: donor.PathEnterVoucher,
EvidenceRequired: donor.PathEvidenceRequired,
EvidenceSuccessfullyUploaded: donor.PathEvidenceSuccessfullyUploaded,
FeeApproved: donor.PathFeeApproved,
FeeDenied: donor.PathFeeDenied,
GettingHelpSigning: donor.PathGettingHelpSigning,
HowDoYouKnowYourCertificateProvider: donor.PathHowDoYouKnowYourCertificateProvider,
HowLongHaveYouKnownCertificateProvider: donor.PathHowLongHaveYouKnownCertificateProvider,
Expand All @@ -417,6 +414,7 @@ var paths = appPaths{
MakeANewLPA: donor.PathMakeANewLPA,
NeedHelpSigningConfirmation: donor.PathNeedHelpSigningConfirmation,
OneLoginIdentityDetails: donor.PathIdentityDetails,
PayFee: donor.PathPayFee,
PaymentConfirmation: donor.PathPaymentConfirmation,
PreviousApplicationNumber: donor.PathPreviousApplicationNumber,
PreviousFee: donor.PathPreviousFee,
Expand Down
1 change: 0 additions & 1 deletion lang/cy.json
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,6 @@
"chooseYourSignatoryAndIndependentWitness": "Dewis eich llofnodwr a thyst annibynnol",
"gettingHelpSigningYourLpa": "Cael help i lofnodi eich LPA",
"gettingHelpSigningYourLpaContent": "<p class=\"govuk-body\">Rydych chi wedi dweud wrthym na allwch lofnodi’r LPA eich hun.</p><p class=\"govuk-body\">Gallwch wneud eich LPA ar-lein o hyd. Fodd bynnag, bydd angen y canlynol arnoch:</p><ul class=\"govuk-list govuk-list--bullet\"><li>rhywun i lofnodi’r LPA ar eich rhan</li><li>tyst annibynnol ychwanegol, yno pan fydd yr LPA yn cael ei llofnodi</li></ul><p class=\"govuk-body\">Rhaid i’ch darparwr tystysgrif hefyd fod yn dyst i’r LPA yn cael ei llofnodi, ynghyd â’ch tyst annibynnol.</p><h2 class=\"govuk-heading-m\">Pwy all lofnodi ar eich rhan</h2><p class=\"govuk-body\">Gelwir y person sy’n llofnodi ar eich rhan yn ‘llofnodwr awdurdodedig’. Y rheswm dros hyn yw am eich bod yn eu hawdurdodi i lofnodi eich LPA ar eich rhan.</p><p class=\"govuk-body\">Pan fydd hi’n amser llofnodi, bydd angen iddynt allu dewis 2 flwch ar-lein. Mae hyn yn cyfrif fel eich llofnod cyfreithiol.</p><p class=\"govuk-body\">Ni all y person sy’n llofnodi ar eich rhan:</p><ul class=\"govuk-list govuk-list--bullet\"><li>hefyd fod yn dyst annibynnol i chi - rhaid iddynt fod yn ddau unigolyn gwahanol</li><li>bod yn atwrnai neu’n atwrnai wrth gefn ar yr LPA hon</li></ul><h2 class=\"govuk-heading-m\">Pwy all fod yn dyst annibynnol i chi</h2><p class=\"govuk-body\">Gofynnir i’ch tyst annibynnol gadarnhau ei fod wedi gweld eich LPA yn cael ei llofnodi. Rhaid iddynt fod dros 18 oed.</p><p class=\"govuk-body\">Ni all eich tyst annibynnol:</p><ul class=\"govuk-list govuk-list--bullet\"><li>hefyd lofnodi’r LPA ar eich rhan, fel llofnodydd awdurdodedig</li><li>bod yn atwrnai neu’n atwrnai wrth gefn ar yr LPA hon</li></ul><h2 class=\"govuk-heading-m\">Cysylltu â’ch llofnodydd awdurdodedig a’ch tystion</h2><p class=\"govuk-body\">Chi sy’n gyfrifol am gysylltu â’ch darparwr tystysgrif, eich tyst annibynnol a’r person a fydd yn llofnodi eich LPA ar eich rhan.</p><p class=\"govuk-body\">Rhaid i chi sicrhau bod pob un o’r 3 yn bresennol yn gorfforol pan fydd eich LPA yn cael ei llofnodi.</p>",
"feeDeniedContent": "<p class=\"govuk-body\">Parhau i dalu’r swm sy’n weddill o {{.RemainingAmountDuePounds}}.</p>",
"enterTheNameOfYourAuthorisedSignatory": "Rhowch enw eich llofnodwr awdurdodedig",
"thisIsThePersonWhoWillSignOnYourBehalf": "Dyma enw’r unigolyn a fydd yn llofnodi’r LPA ar eich rhan.",
"authorisedSignatoryThisPersonCannotBeWarning": "Ni chaiff yr unigolyn hwn fod yn dyst annibynnol, yn ddarparwr tystysgrif nac yn atwrnai ar yr LPA hon.",
Expand Down
1 change: 0 additions & 1 deletion lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,6 @@
"chooseYourSignatoryAndIndependentWitness": "Choose your signatory and independent witness",
"gettingHelpSigningYourLpa": "Getting help signing your LPA",
"gettingHelpSigningYourLpaContent": "<p class=\"govuk-body\">You have told us that you cannot sign the LPA yourself.</p><p class=\"govuk-body\">You can still make your LPA online. However, you’ll need:</p><ul class=\"govuk-list govuk-list--bullet\"><li>someone to sign the LPA on your behalf</li><li>an additional independent witness who must be there when the LPA is signed</li></ul><p class=\"govuk-body\">Your certificate provider must also witness the LPA being signed, along with your independent witness.</p><h2 class=\"govuk-heading-m\">Who can sign on your behalf</h2><p class=\"govuk-body\">The person who signs on your behalf is known as your ‘authorised signatory’. This is because you are authorising them to sign your LPA for you.</p><p class=\"govuk-body\">When it’s time to sign, they will need to be able to select 2 boxes online. This counts as your legal signature.</p><p class=\"govuk-body\">The person signing for you cannot:</p><ul class=\"govuk-list govuk-list--bullet\"><li>also be your independent witness - they must be two different people</li><li>be an attorney or replacement attorney on this LPA</li></ul><h2 class=\"govuk-heading-m\">Who can be your independent witness</h2><p class=\"govuk-body\">Your independent witness will be asked to confirm that they witnessed your LPA being signed. They must be over 18.</p><p class=\"govuk-body\">Your independent witness cannot:</p><ul class=\"govuk-list govuk-list--bullet\"><li>also sign the LPA for you, as your authorised signatory</li><li>be an attorney or replacement attorney on this LPA</li></ul><h2 class=\"govuk-heading-m\">Contacting your authorised signatory and witnesses</h2><p class=\"govuk-body\">You are responsible for contacting your certificate provider, independent witness and the person who will sign your LPA on your behalf.</p><p class=\"govuk-body\">You must make sure that all 3 people are there in person when your LPA is signed.</p>",
"feeDeniedContent": "<p class=\"govuk-body\">Continue to pay remaining amount of {{.RemainingAmountDuePounds}}.</p>",
"enterTheNameOfYourAuthorisedSignatory": "Enter the name of your authorised signatory",
"thisIsThePersonWhoWillSignOnYourBehalf": "This is the name of the person who will sign the LPA on your behalf.",
"authorisedSignatoryThisPersonCannotBeWarning": "This person cannot be your independent witness, certificate provider or an attorney on this LPA.",
Expand Down
18 changes: 0 additions & 18 deletions web/template/donor/fee_denied.gohtml

This file was deleted.

Loading