I'll brief the team on this, do you have a timeline?

@Ejegg Emma is working in the TY page variant and the email team in the Email receipt (timeline for this August 29).
Posting here @ehughes question, could you support on this?
CCing @AKanji-WMF

Change #1067365 had a related patch set uploaded (by Ejegg; author: Ejegg):

[mediawiki/extensions/DonationInterface@master] Pass through frequency_unit to TY page

https://gerrit.wikimedia.org/r/1067365

@Ejegg Cross-tagging you in reference to the dynamic fields, please confirm those are still correct for annual recurring
https://app.asana.com/0/1130715260221313/1208066022237986

Hi @Ejegg just cross posting a question from Asana:

For the Thank You page, does this parameter mean that there will also be a frequency_unit=month ? Or is the current parameter we use for monthly (recurringConversion=1) unchanged? Thanks 🙂

Change #1067365 merged by jenkins-bot:

[mediawiki/extensions/DonationInterface@master] Pass through frequency_unit to TY page

https://gerrit.wikimedia.org/r/1067365

Change #1071967 had a related patch set uploaded (by Ejegg; author: Ejegg):

[wikimedia/fundraising/crm@master] Add $frequency_unit to thank you email

https://gerrit.wikimedia.org/r/1071967

Change #1071967 merged by jenkins-bot:

[wikimedia/fundraising/crm@master] Add $frequency_unit to thank you email

https://gerrit.wikimedia.org/r/1071967

Hi @Ejegg as we approach the final QA before testing Annual recurring, can you please confirm that the Thank You email and Thank you pages have been updated for annual recurring sign ups?

Hi @MSuijkerbuijk_WMF, the Thank You letters seem to still need an update. For example, I see this in the English version of the 'WMF Thank You' message template:

Thank <i>you</i> for your {if $recurring}monthly {/if}donation

The person who manages the TY message templates will have to add some additional logic using the new $frequency_unit token we have made available.

The Thank You pages on thankyou.wikipedia.org seem to be updated.

Thanks, this is with @RLopez-WMF for updating.

Hey @MSuijkerbuijk_WMF just to confirm that the english version of the ty email was updated and it now supports the $frequency_unit value

@Ejegg as per above, can you confirm it's all set? Thanks!

Thanks @RLopez-WMF - that 'WMF Thank You' English template looks great. I just looked over all the other templates to see what else we might need.

We'll want to update this 'WMF Monthly Convert' template too: https://civicrm.wikimedia.org/civicrm/admin/messageTemplates#/edit?id=319&lang=en_US Despite the 'Monthly' in the name, it's the same template that we'll use for annual recurrings when we start using the variant that allows either monthly or annual recurrings in the popup.

And I just noticed this one sent when a recurring donation fails has some monthly-specific language too: https://civicrm.wikimedia.org/civicrm/admin/messageTemplates?reset=1#/edit?id=304&lang=en_US . (We wouldn't be sending that to an annual donor till a year after the initial campaign, so I guess we could start without it.)

The 'End of Year' receipt also mentions 'monthly' for donors whose donation is active: https://civicrm.wikimedia.org/civicrm/admin/messageTemplates?reset=1#/edit?id=310&lang=en_US . As it currently stands, annual recurring donors will get that email. Perhaps they should be excluded and just get an email on each donation.

Finally a translation note: I see so far only English is using the new $frequency_unit token. When that is translated, we'll want to tweak it just a tiny bit to account for the value of $frequency_unit always being the English 'year' or 'month'.

@RLopez-WMF Oops I think we need a fix to the WMF Thank You template. I just set up a new monthly PayPal and noticed this in the TY mail:

Note the missing text where it should have $txtFrequency and $frequency_unit. I'm looking to see what could be wrong there.

OK, it might be a code issue - I'm not seeing where we feed the frequency_unit to the auto-thank you, despite having that in the sample data we use to render the example in the editor.

@Ejegg i will add the other templates to my to do list for this week.
Regarding your second comment, does that mean that it could happen that the frequency unit comes empty?
What should be the ideal way to handle that? Removing the entire sentence "Your donation will be debited once a frequency_unit"?

In T371848#10247122, @Ejegg wrote:

OK, it might be a code issue - I'm not seeing where we feed the frequency_unit to the auto-thank you, despite having that in the sample data we use to render the example in the editor.

Does that mean it's an issue of the template not being able to access the frequency_unit value?
If that is the case, let me know if i need to do something extra on my end

Change #1082005 had a related patch set uploaded (by Ejegg; author: Ejegg):

[wikimedia/fundraising/crm@master] Add frequency_unit to params for TY mails

https://gerrit.wikimedia.org/r/1082005

Hi @RLopez-WMF looks like it's something I have to fix in the PHP code that sends the message. I've got a fix up for review and am testing it locally. Meanwhile I've temporarily turned off the TY mail sender. Hopefully somebody can review the fix and we can get it deployed shortly.

I think we also need to add the Venmo username conditional back to the TY template:

{if $venmo_user_name}
  <p>Donated with venmo username: {$venmo_user_name}.</p>
{/if}

Hey @Ejegg I was asked by DR to remove the venmo_user_name part due to some complains from donors

Ahh, gotcha. Thanks! I think we can have the PHP fix deployed soon.

Change #1082005 merged by jenkins-bot:

[wikimedia/fundraising/crm@master] Add frequency_unit to params for TY mails

https://gerrit.wikimedia.org/r/1082005

OK @RLopez-WMF I've deployed the PHP fix and checked some recently-sent monthly recurring TY emails. They all have the right tokens now!

Hi, just checking if this is resolved? I see it mentioned in T368155#10043396 as being needed before we can test that post-payment annual recurring

hey @Pcoombe i have the draft ready on the following templates:

• WMF Monthly convert
• WMF Recurring failure message

I noticed that when trying to preview them, i am getting an empty value for the $frequency_unit so i haven't activate them yet.
For now, I am adding an else condition using "recurring" as a fallback so that the message makes sense if for some reason the $frequency_unit comes empty.
I believe last time @Ejegg did something to pass the values, so, want it to flag that again before activating the drafts.
Additionally, i noticed that in the Recurring failure message, there is a link that takes the user to the donation form passing the "monthly=true" param so wondering what should be URL for the annual donation.

Putting this back into Triage to review with the team.

Thanks @greg
Please also include the WMF End of year thank you message in the review, since that one also has a reference to monthly/annual (the draft version already includes that logic)

Thanks all!

Additionally, i noticed that in the Recurring failure message, there is a link that takes the user to the donation form passing the "monthly=true" param so wondering what should be URL for the annual donation.

We don't have annual forms live as control on donatewiki yet, but when we do you'll be able to use frequency=annual to pre-select annual.

Change #1100589 had a related patch set uploaded (by Cstone; author: Cstone):

[wikimedia/fundraising/crm@master] Add frequency_unit to examples

https://gerrit.wikimedia.org/r/1100589

Change #1100589 merged by jenkins-bot:

[wikimedia/fundraising/crm@master] Add frequency_unit to examples

https://gerrit.wikimedia.org/r/1100589

Change #1101614 had a related patch set uploaded (by Cstone; author: Cstone):

[wikimedia/fundraising/crm@master] Whoops should just have been month

https://gerrit.wikimedia.org/r/1101614

Change #1101614 merged by jenkins-bot:

[wikimedia/fundraising/crm@master] Whoops should just have been month

https://gerrit.wikimedia.org/r/1101614

Change #1105463 had a related patch set uploaded (by Cstone; author: Cstone):

[wikimedia/fundraising/crm@master] Add $frequency_unit to all TY examples

https://gerrit.wikimedia.org/r/1105463

@RLopez-WMF Sorry for the super delay on this, I was trying to go for a solution that makes more sense but it got much more complicated than I thought.

The monthly convert examples are generated based on the thank you email while the others all use their own examples which causes them to have different variables.

In the monthly convert example you can use {$frequency_unit}
In the other examples you can use {contribution_recur.frequency_unit}

The other examples should be visible now, there is one more patch to merge to get it to show up in the monthly convert examples

Change #1105463 merged by jenkins-bot:

[wikimedia/fundraising/crm@master] Add $frequency_unit to all TY examples

https://gerrit.wikimedia.org/r/1105463