studio/blender-studio
3
4
Fork 4
Code Issues 37 Pull Requests 2 Projects 1 Releases 5 Wiki Activity

Stripe checkout #104411

Merged
Anna Sirota merged 61 commits from stripe into main 2024-06-17 18:08:41 +02:00
Conversation 0 Commits 61 Files Changed 65 +6 -6
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dbd9a27635 - Show all commits

2
subscriptions/templates/subscriptions/emails/base.html
View File

@ -6,7 +6,7 @@
{% endblock header_logo %} {% endblock header_logo %}
{% block body %} {% block body %}
<p>Dear {% firstof user.customer.billing_address.full_name user.customer.billing_address.full_name user.full_name user.email %},</p> <p>Dear {% firstof user.customer.billing_address.full_name user.full_name user.email %},</p>
{% block content %}{% endblock content %} {% block content %}{% endblock content %}
<p>Manage subscription in your billing settings: <a href="{{ billing_url }}">{{ billing_url }}</a>.</p> <p>Manage subscription in your billing settings: <a href="{{ billing_url }}">{{ billing_url }}</a>.</p>
<p> <p>

2
subscriptions/templates/subscriptions/emails/base.txt
View File

@ -1,4 +1,4 @@
Dear {% firstof user.customer.billing_address.full_name user.customer.billing_address.full_name user.full_name user.email %}, Dear {% firstof user.customer.billing_address.full_name user.full_name user.email %},
{% block content %}{% endblock content %} {% block content %}{% endblock content %}
Manage subscription in your billing settings: {{ billing_url }}. Manage subscription in your billing settings: {{ billing_url }}.

2
subscriptions/templates/subscriptions/emails/paypal_subscription_cancelled.html
View File

@ -7,7 +7,7 @@
{% endblock header_logo %} {% endblock header_logo %}
{% block body %} {% block body %}
<p>Dear {% firstof user.customer.billing_address.full_name user.customer.billing_address.full_name user.full_name user.email %},</p> <p>Dear {% firstof user.customer.billing_address.full_name user.full_name user.email %},</p>
<p> <p>
As you may have heard, Blender Studio's subscription system recently got a new shiny update, As you may have heard, Blender Studio's subscription system recently got a new shiny update,
more on that in <a href="https://studio.blender.org/blog/subscription-system-update-2021/">the blog post</a>. more on that in <a href="https://studio.blender.org/blog/subscription-system-update-2021/">the blog post</a>.

2
subscriptions/templates/subscriptions/emails/paypal_subscription_cancelled.txt
View File

@ -1,4 +1,4 @@
{% load subscriptions %}Dear {% firstof user.customer.billing_address.full_name user.customer.billing_address.full_name user.full_name user.email %}, {% load subscriptions %}Dear {% firstof user.customer.billing_address.full_name user.full_name user.email %},
As you may have heard, Blender Studio's subscription system recently got a new shiny update, As you may have heard, Blender Studio's subscription system recently got a new shiny update,
more on that in the blog post https://studio.blender.org/blog/subscription-system-update-2021/ . more on that in the blog post https://studio.blender.org/blog/subscription-system-update-2021/ .

2
subscriptions/templates/subscriptions/emails/subscription_expired.html
View File

@ -6,7 +6,7 @@
{% endblock header_logo %} {% endblock header_logo %}
{% block body %} {% block body %}
<p>Dear {% firstof user.customer.billing_address.full_name user.customer.billing_address.full_name user.full_name user.email %},</p> <p>Dear {% firstof user.customer.billing_address.full_name user.full_name user.email %},</p>
<p>Your Blender Studio subscription #{{subscription.pk}} has expired a while back. We miss you -- and you are missing some exciting content on Blender Studio as well.</p> <p>Your Blender Studio subscription #{{subscription.pk}} has expired a while back. We miss you -- and you are missing some exciting content on Blender Studio as well.</p>
{% if latest_posts or latest_trainings %} {% if latest_posts or latest_trainings %}
<p>Just recently, we've published:</p> <p>Just recently, we've published:</p>

2
subscriptions/templates/subscriptions/emails/subscription_expired.txt
View File

@ -1,4 +1,4 @@
Dear {% firstof user.customer.billing_address.full_name user.customer.billing_address.full_name user.full_name user.email %}, Dear {% firstof user.customer.billing_address.full_name user.full_name user.email %},
Your Blender Studio subscription #{{subscription.pk}} has expired a while back. We miss you -- and you are missing some exciting content on Blender Studio as well.{% if latest_posts or latest_trainings %} Just recently, we've published: Your Blender Studio subscription #{{subscription.pk}} has expired a while back. We miss you -- and you are missing some exciting content on Blender Studio as well.{% if latest_posts or latest_trainings %} Just recently, we've published:
{% for post in latest_posts|slice:":2" %} {% for post in latest_posts|slice:":2" %}