sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v16.7.7'

Browse Source
This commit is contained in:
Sander Roosendaal
2021-11-14 09:13:35 +01:00
parent 9df790672b 83d9e0540a
commit 335819b0cb
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/templates/instantplans.html
View File

@@ -19,7 +19,7 @@
</p> </p>
{% if rower.eurocredits %} {% if rower.eurocredits %}
<p> <p>
<em>Your have discount vouchers for an mount of {{ rower.eurocredits }}&euro;</em>. You <em>Your have discount vouchers for an amount of {{ rower.eurocredits }}&euro;</em>. You
will get discount for up to this amount on any paid plan. will get discount for up to this amount on any paid plan.
</p> </p>
{% endif %} {% endif %}

5
rowers/views/planviews.py
View File

@@ -2576,7 +2576,10 @@ def rower_view_instantplan(request,id='',userid=0):
raise Http404("Plan does not exist") raise Http404("Plan does not exist")
plan = InstantPlan.objects.get(uuid=id) plan = InstantPlan.objects.get(uuid=id)
discountedprice = credits.discounted(plan.price,r) try:
discountedprice = credits.discounted(plan.price,r)
except AttributeError:
discountedprice = plan.price
authorizationstring = 'Bearer '+settings.WORKOUTS_FIT_TOKEN authorizationstring = 'Bearer '+settings.WORKOUTS_FIT_TOKEN
url = settings.WORKOUTS_FIT_URL+"/trainingplan/"+id url = settings.WORKOUTS_FIT_URL+"/trainingplan/"+id