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

DON-998: Remove & add ticket numbers to already-done regular-giving todo comments #1829

Merged
merged 3 commits into from
Jan 21, 2025
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
11 changes: 1 addition & 10 deletions src/app/mandate.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,20 @@ 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",
"dayOfMonth": number,
"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"
Expand Down
4 changes: 2 additions & 2 deletions src/app/mandate/mandate.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h2>Thank you!</h2>
<th scope="row">Matched Amount (for the first {{ mandate.numberOfMatchedDonations }} months)</th>
<td>{{ mandate.matchedAmount.amountInPence / 100 | exactCurrency:mandate.donationAmount.currency }}</td>
</tr>
<!-- @todo-regular-giving: consider displaying gift Aid and tip amount on the template (format copied from one-off cmpaign thank you page -->
<!-- @todo-regular-giving-DON-1008: consider displaying gift Aid and tip amount on the template (format copied from one-off cmpaign thank you page -->
<!-- @if (giftAidAmount > 0) {-->
<!-- <tr>-->
<!-- <th scope="row">Gift Aid Amount</th>-->
Expand All @@ -65,7 +65,7 @@ <h2>Thank you!</h2>
<hr aria-hidden="true">
</td>
</tr>
<!-- @todo-regular-giving: use giftAid value sent from matchbot (possibly also the matched amounts calculations -->
<!-- @todo-regular-giving-DON-1008: use giftAid value sent from matchbot (possibly also the matched amounts calculations -->
<tr class="receives">
<th scope="row">Charity Receives (Matched Donations)</th>
<td>{{ (mandate.donationAmount.amountInPence + mandate.matchedAmount.amountInPence) / 100 + ' ' | exactCurrency:mandate.donationAmount.currency }}</td>
Expand Down
8 changes: 4 additions & 4 deletions src/app/regular-giving/regular-giving.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,18 @@
>
<p> <!-- hack to take up space until I find a better way -->

<!-- @todo-regular-giving - make each or all payment detail fields read-only if already set on
<!-- @todo-regular-giving-DON-1021 - make each or all payment detail fields read-only if already set on
donor account - if donors want to edit them direct them to do so on the My Account page,
to make clear that it will affect existing mandates as well as the new one -->

@if (donorAccount.regularGivingPaymentMethod) {
<!-- @todo-regular-giving: show existing payment method here, and/or on account page -->
<!-- @todo-regular-giving-DON-1021: show existing payment method here, and/or on account page -->
<p style="border: 2px solid blue; background: pink">
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)
</p>
} @else {
<biggive-text-input>
Expand Down Expand Up @@ -168,7 +168,7 @@
<mat-icon class="b-va-bottom" aria-hidden="false" aria-label="Open in new tab">open_in_new</mat-icon>
read our Privacy Statement.</a>
</p>
<p>(todo-regular-giving: add link to regular giving terms & conditions)</p>
<p>(todo-regular-giving-OPS-766: add link to regular giving terms & conditions)</p>

@if (submitErrorMessage) {
<div
Expand Down
Loading