From 4528bb22a003ee7e2924674a22445d5f1a8a0f0e Mon Sep 17 00:00:00 2001 From: Nathan Sherburn Date: Fri, 21 Jun 2024 11:32:20 +0000 Subject: [PATCH 1/4] Update bank transfer instructions email and form submit message --- donation/templates/bank_transfer_instructions.html | 5 +++++ .../apps/donation_form/pages/donation-result/index.js | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/donation/templates/bank_transfer_instructions.html b/donation/templates/bank_transfer_instructions.html index 0376d3f..de0178c 100644 --- a/donation/templates/bank_transfer_instructions.html +++ b/donation/templates/bank_transfer_instructions.html @@ -15,6 +15,11 @@

What to do next?

Account No: {{ pledge.account_number }}
Unique Reference Number: {{ pledge.reference }} +

Donating in late June?

+

+ Please note that according to the Australian Taxation Office (ATO), your donation is deductible for the financial year in which it was made, which is when the funds cleared your bank account. Therefore, if you made your donation by midnight 30 June, it is deductible for that financial year, even if our receipt is dated in early July (when we receive the funds). Additionally, if you are otherwise eligible for our June match campaign, your donation will be matched as long as it was made by midnight 30 June 2024. +

+

Please reply to this email if you have any questions and we'll get back to you as soon as we can.

Best regards and thanks,
diff --git a/react/apps/donation_form/pages/donation-result/index.js b/react/apps/donation_form/pages/donation-result/index.js index 915a25e..845b780 100755 --- a/react/apps/donation_form/pages/donation-result/index.js +++ b/react/apps/donation_form/pages/donation-result/index.js @@ -70,6 +70,16 @@ class DonationResult extends Component { We will send you a tax deductible receipt once we have confirmed the bank transfer.

+

+ Donating in late June? +

+

+ Please note that according to the Australian Taxation Office (ATO), your donation is deductible for the financial year in which it was made, which is when the funds cleared your bank account. Therefore, if you made your donation by midnight 30 June, it is deductible for that financial year, even if our receipt is dated in early July (when we receive the funds). Additionally, if you are otherwise eligible for our June match campaign, your donation will be matched as long as it was made by midnight 30 June 2024. +

+

+ For more details, please refer to the ATO guidelines on tax-deductible donations and/or your accountant. +

+

Any questions?

Please email us at info@eaa.org.au or call us on +61 492 841 596, if you have any questions. From 97c06a5153d4b4a00b7a6762d52a16557a62e408 Mon Sep 17 00:00:00 2001 From: Nathan Sherburn Date: Thu, 27 Jun 2024 07:43:07 +0000 Subject: [PATCH 2/4] Add python-memcached to deps (needed for testing) --- deps/pip | 1 + 1 file changed, 1 insertion(+) diff --git a/deps/pip b/deps/pip index 4da1cef..debb834 100644 --- a/deps/pip +++ b/deps/pip @@ -57,6 +57,7 @@ pyparsing==2.1.10 PyPDF2==1.26.0 pytest==4.0.1 python-dateutil==2.6.0 +python-memcached==1.59 python-postmark==0.4.12 pytz==2016.10 pyxero==0.9.3 From e7dd5f4157e6fb807befc535cbc968b90e3076e9 Mon Sep 17 00:00:00 2001 From: Nathan Sherburn Date: Thu, 27 Jun 2024 07:48:18 +0000 Subject: [PATCH 3/4] Add June 30 messages to receipts and emails --- donation/templates/bank_transfer_instructions.html | 12 +++++++----- donation/templates/bank_transfer_instructions.txt | 6 +++++- donation/templates/pledge.html | 7 +++++++ .../templates/receipts/eofy_receipt_message.html | 5 +++++ donation/templates/receipts/eofy_receipt_message.txt | 4 +++- donation/templates/receipts/eofy_receipt_page_1.html | 5 +++++ donation/templates/receipts/receipt.html | 5 +++++ 7 files changed, 37 insertions(+), 7 deletions(-) diff --git a/donation/templates/bank_transfer_instructions.html b/donation/templates/bank_transfer_instructions.html index de0178c..3c280f9 100644 --- a/donation/templates/bank_transfer_instructions.html +++ b/donation/templates/bank_transfer_instructions.html @@ -15,14 +15,16 @@

What to do next?

Account No: {{ pledge.account_number }}
Unique Reference Number: {{ pledge.reference }} -

Donating in late June?

-

- Please note that according to the Australian Taxation Office (ATO), your donation is deductible for the financial year in which it was made, which is when the funds cleared your bank account. Therefore, if you made your donation by midnight 30 June, it is deductible for that financial year, even if our receipt is dated in early July (when we receive the funds). Additionally, if you are otherwise eligible for our June match campaign, your donation will be matched as long as it was made by midnight 30 June 2024. -

-

Please reply to this email if you have any questions and we'll get back to you as soon as we can.

Best regards and thanks,
The team at Effective Altruism Australia

+
+ +

Donating in late June?

+

+ Please note that according to the Australian Taxation Office (ATO), your donation is deductible for the financial year in which it was made, which is when the funds cleared your bank account. Therefore, if you made your donation by midnight 30 June, it is deductible for that financial year, even if our receipt is dated in early July (when we receive the funds). Additionally, if you are otherwise eligible for our June match campaign, your donation will be matched as long as it was made by midnight 30 June 2024. +

+ {% endblock content %} diff --git a/donation/templates/bank_transfer_instructions.txt b/donation/templates/bank_transfer_instructions.txt index 05bd628..a41de7f 100644 --- a/donation/templates/bank_transfer_instructions.txt +++ b/donation/templates/bank_transfer_instructions.txt @@ -16,4 +16,8 @@ Please reply to this email if you have any questions and we'll get back to you a Best regards and thanks, The team at Effective Altruism Australia -Effective Altruism Australia is endorsed as a Deductible Gift Recipient by the Australian Taxation Office. Donations of $2 or more are tax deductible in Australia. \ No newline at end of file +Effective Altruism Australia is endorsed as a Deductible Gift Recipient by the Australian Taxation Office. Donations of $2 or more are tax deductible in Australia. + +Donating in late June? + +Please note that according to the Australian Taxation Office (ATO), your donation is deductible for the financial year in which it was made, which is when the funds cleared your bank account. Therefore, if you made your donation by midnight 30 June, it is deductible for that financial year, even if our receipt is dated in early July (when we receive the funds). Additionally, if you are otherwise eligible for our June match campaign, your donation will be matched as long as it was made by midnight 30 June 2024. \ No newline at end of file diff --git a/donation/templates/pledge.html b/donation/templates/pledge.html index ea25c1f..247e880 100644 --- a/donation/templates/pledge.html +++ b/donation/templates/pledge.html @@ -383,6 +383,13 @@

Any questions?

Please email us at info@eaa.org.au or call us on +61 492 841 596, if you have any questions.

+ +
+ +

Donating in late June?

+

+ Please note that according to the Australian Taxation Office (ATO), your donation is deductible for the financial year in which it was made, which is when the funds cleared your bank account. Therefore, if you made your donation by midnight 30 June, it is deductible for that financial year, even if our receipt is dated in early July (when we receive the funds). Additionally, if you are otherwise eligible for our June match campaign, your donation will be matched as long as it was made by midnight 30 June 2024. +

diff --git a/donation/templates/receipts/eofy_receipt_message.html b/donation/templates/receipts/eofy_receipt_message.html index c8e8d75..7818da9 100644 --- a/donation/templates/receipts/eofy_receipt_message.html +++ b/donation/templates/receipts/eofy_receipt_message.html @@ -17,4 +17,9 @@ {% else %} Effective Altruism Australia Limited {% endif %} +
+

Donating in late June?

+

+ Please note that according to the Australian Taxation Office (ATO), your donation is deductible for the financial year in which it was made, which is when the funds cleared your bank account. Therefore, if you made your donation by midnight 30 June, it is deductible for that financial year, even if our receipt is dated in early July (when we receive the funds). Additionally, if you are otherwise eligible for our June match campaign, your donation will be matched as long as it was made by midnight 30 June 2024. +

{% endblock content %} \ No newline at end of file diff --git a/donation/templates/receipts/eofy_receipt_message.txt b/donation/templates/receipts/eofy_receipt_message.txt index b0dc931..626b3ce 100644 --- a/donation/templates/receipts/eofy_receipt_message.txt +++ b/donation/templates/receipts/eofy_receipt_message.txt @@ -14,4 +14,6 @@ Best wishes, Effective Altruism Australia Environment {% else %} Effective Altruism Australia -{% endif %} \ No newline at end of file +{% endif %} + +Donating in late June? Please note that according to the Australian Taxation Office (ATO), your donation is deductible for the financial year in which it was made, which is when the funds cleared your bank account. Therefore, if you made your donation by midnight 30 June, it is deductible for that financial year, even if our receipt is dated in early July (when we receive the funds). Additionally, if you are otherwise eligible for our June match campaign, your donation will be matched as long as it was made by midnight 30 June 2024. \ No newline at end of file diff --git a/donation/templates/receipts/eofy_receipt_page_1.html b/donation/templates/receipts/eofy_receipt_page_1.html index 099673c..9406720 100755 --- a/donation/templates/receipts/eofy_receipt_page_1.html +++ b/donation/templates/receipts/eofy_receipt_page_1.html @@ -22,4 +22,9 @@

Notes

If you also made donations via cheque or via a workplace giving program, those donations are not listed on this receipt.
If you made donations from multiple email addresses, you'll receive a separate EOFY receipt at each email address.

+
+

Donating in late June?

+

+ Please note that according to the Australian Taxation Office (ATO), your donation is deductible for the financial year in which it was made, which is when the funds cleared your bank account. Therefore, if you made your donation by midnight 30 June, it is deductible for that financial year, even if our receipt is dated in early July (when we receive the funds). Additionally, if you are otherwise eligible for our June match campaign, your donation will be matched as long as it was made by midnight 30 June 2024. +

{% endblock above_footer %} diff --git a/donation/templates/receipts/receipt.html b/donation/templates/receipts/receipt.html index 5670300..02263e8 100755 --- a/donation/templates/receipts/receipt.html +++ b/donation/templates/receipts/receipt.html @@ -12,4 +12,9 @@

Details

Date received: {{ transaction.date }}

Donation Amount: ${{ transaction.amount}}

Designation: {{ transaction.donation.component_summary_str }}

+
+

Donating in late June?

+

+ Please note that according to the Australian Taxation Office (ATO), your donation is deductible for the financial year in which it was made, which is when the funds cleared your bank account. Therefore, if you made your donation by midnight 30 June, it is deductible for that financial year, even if our receipt is dated in early July (when we receive the funds). Additionally, if you are otherwise eligible for our June match campaign, your donation will be matched as long as it was made by midnight 30 June 2024. +

{% endblock content %} From d50cc79979f48e99c52db8a2e7e734aa8f7ba52c Mon Sep 17 00:00:00 2001 From: Nathan Sherburn Date: Thu, 27 Jun 2024 08:11:28 +0000 Subject: [PATCH 4/4] Add one last missing receipt message --- donation/templates/receipts/receipt_message.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/donation/templates/receipts/receipt_message.html b/donation/templates/receipts/receipt_message.html index 67b977d..f87a76c 100644 --- a/donation/templates/receipts/receipt_message.html +++ b/donation/templates/receipts/receipt_message.html @@ -17,7 +17,11 @@ Best wishes,

Effective Altruism Australia - +
+

Donating in late June?

+

+ Please note that according to the Australian Taxation Office (ATO), your donation is deductible for the financial year in which it was made, which is when the funds cleared your bank account. Therefore, if you made your donation by midnight 30 June, it is deductible for that financial year, even if our receipt is dated in early July (when we receive the funds). Additionally, if you are otherwise eligible for our June match campaign, your donation will be matched as long as it was made by midnight 30 June 2024. +

{% endblock content %} {% block footercontent %}