archive/blender-cloud
0
1
Fork 1
Code Issues 24 Pull Requests Projects Releases Wiki Activity

Avoid error when Store cannot be reached.

Browse Source
This commit is contained in:
Sybren A. Stüvel
2018-01-25 10:16:29 +01:00
parent 06414ab0ed
commit 0908a13519
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cloud/routes.py
View File

@@ -358,10 +358,14 @@ def billing():
groups.append(group.name) groups.append(group.name)
store_user = store.fetch_subscription_info(user.email) store_user = store.fetch_subscription_info(user.email)
if store_user is None:
expiration_date = 'Unable to reach Blender Store to check'
else:
expiration_date = store_user['expiration_date'][:10]
return render_template( return render_template(
'users/settings/billing.html', 'users/settings/billing.html',
store_user=store_user, groups=groups, title='billing') expiration_date=expiration_date, groups=groups, title='billing')
@blueprint.route('/terms-and-conditions') @blueprint.route('/terms-and-conditions')

4
src/templates/users/settings/billing.pug
View File

@@ -22,13 +22,13 @@ style(type='text/css').
| Your subscription is active | Your subscription is active
h4 Thank you for supporting us! h4 Thank you for supporting us!
hr hr
p Subscription expires on: <strong>{{ store_user['expiration_date'][:10] }}</strong> p Subscription expires on: <strong>{{ expiration_date }}</strong>
| {% else %} | {% else %}
h3.subscription-missing h3.subscription-missing
i.pi-info i.pi-info
a(href="{{renew_url}}") Your subscription can be renewed a(href="{{renew_url}}") Your subscription can be renewed
hr hr
p.text-danger Subscription expired on: <strong>{{ store_user['expiration_date'][:10] }}</strong> p.text-danger Subscription expired on: <strong>{{ expiration_date }}</strong>
p p
a.btn.btn-success(href="{{renew_url}}") Renew now a.btn.btn-success(href="{{renew_url}}") Renew now
| {% endif %} | {% endif %}