From 855a20d9fd7b036babd1c613c54bd43e9b9a0a26 Mon Sep 17 00:00:00 2001 From: Barney Laurance Date: Tue, 21 Jan 2025 10:24:11 +0000 Subject: [PATCH 1/3] DON-998: Remove already-done regular-giving todo comments --- src/app/mandate.model.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/app/mandate.model.ts b/src/app/mandate.model.ts index fcfa4de4a..10ee6a9cd 100644 --- a/src/app/mandate.model.ts +++ b/src/app/mandate.model.ts @@ -11,21 +11,12 @@ export interface Mandate { "activeFrom": string, "expectedNextPaymentDate": string }, - /** - * @todo-regular-giving: this property doesn't exist in matchbot yet - */ numberOfMatchedDonations: number, giftAid: boolean, - /** - * @todo-regular-giving: this property needs renaming in matchbot - */ donationAmount: { "amountInPence": number, "currency": "GBP" }, - /** - * @todo-regular-giving: this property doesn't exist in matchbot yet - */ matchedAmount: { "amountInPence": number, "currency": "GBP" From cfcf4cc48c5bdcda196e3101ee377b124385c806 Mon Sep 17 00:00:00 2001 From: Barney Laurance Date: Tue, 21 Jan 2025 10:26:09 +0000 Subject: [PATCH 2/3] DON-998: Add ticket number to todo comment --- src/app/mandate.model.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/mandate.model.ts b/src/app/mandate.model.ts index 10ee6a9cd..714d089d9 100644 --- a/src/app/mandate.model.ts +++ b/src/app/mandate.model.ts @@ -3,7 +3,7 @@ export interface Mandate { campaignId: string, charityName: string, status: 'active'|'pending', - // @todo-regular-giving : we might want to keep the total donated amount as part of the regular giving mandate + // @todo-regular-giving-DON-1008 : we might want to keep the total donated amount as part of the regular giving mandate // giftAidAmount: number = 0; "schedule": { "type": "monthly", From da67b98c0830625c736b604dfb713b7f247c1ad5 Mon Sep 17 00:00:00 2001 From: Barney Laurance Date: Tue, 21 Jan 2025 10:39:03 +0000 Subject: [PATCH 3/3] DON-998: Add ticket numbers to regular giving todo comments It's not obvious what to do with all the existing comments but I think none of them need to be done urgently or a substantial enough to be worth ticketing - maybe they are just things we can keep in mind and try to either do or decide to remove while working on other regular giving changes. Remainig todos in this repo (including those with ticket nos added here): $ git grep -ri todo-regular-giving . src/app/charity/charity.component.html: src/app/mandate/mandate.component.html: src/app/mandate/mandate.component.html: src/app/mandate/mandate.component.ts: // @todo-regular-giving: calculate the total in matchbot and show on template src/app/regular-giving/regular-giving.component.html: src/app/regular-giving/regular-giving.component.html: (todo-regular-giving-DON-1021: replace this paragraph with an element showing details of the saved method) src/app/regular-giving/regular-giving.component.html:

(todo-regular-giving-OPS-766: add link to regular giving terms & conditions)

src/app/regular-giving/regular-giving.component.ts: * @todo-regular-giving consider if we need to send this from FE - if we're not displaying it to donor better for matchbot to src/app/regular-giving/regular-giving.component.ts: // no-op for now, but @todo-regular-giving we may need to do some validation as we don the ad-hoc donation page. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Tue Jan 21 10:39:03 2025 +0000 # # On branch DON-998-regular-giving-cont --- src/app/mandate/mandate.component.html | 4 ++-- src/app/regular-giving/regular-giving.component.html | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/mandate/mandate.component.html b/src/app/mandate/mandate.component.html index f3ebec6ca..2cc6c91d5 100644 --- a/src/app/mandate/mandate.component.html +++ b/src/app/mandate/mandate.component.html @@ -53,7 +53,7 @@

Thank you!

Matched Amount (for the first {{ mandate.numberOfMatchedDonations }} months) {{ mandate.matchedAmount.amountInPence / 100 | exactCurrency:mandate.donationAmount.currency }} - + @@ -65,7 +65,7 @@

Thank you!

- + Charity Receives (Matched Donations) {{ (mandate.donationAmount.amountInPence + mandate.matchedAmount.amountInPence) / 100 + ' ' | exactCurrency:mandate.donationAmount.currency }} diff --git a/src/app/regular-giving/regular-giving.component.html b/src/app/regular-giving/regular-giving.component.html index dc474cdb6..398c2a7fb 100644 --- a/src/app/regular-giving/regular-giving.component.html +++ b/src/app/regular-giving/regular-giving.component.html @@ -77,18 +77,18 @@ >

- @if (donorAccount.regularGivingPaymentMethod) { - +

Your existing regular giving payment method {{ donorAccount.regularGivingPaymentMethod }} will be used for these donations. To change this please visit your account page - (todo-regular-giving: replace this paragraph with an element showing details of the saved method) + (todo-regular-giving-DON-1021: replace this paragraph with an element showing details of the saved method)

} @else { @@ -168,7 +168,7 @@ open_in_new read our Privacy Statement.

-

(todo-regular-giving: add link to regular giving terms & conditions)

+

(todo-regular-giving-OPS-766: add link to regular giving terms & conditions)

@if (submitErrorMessage) {