- Please correct the error{{ form.errors|pluralize }} below. -
- {% endif %} - - - ++ Please correct the error{{ form.errors|pluralize }} below. +
+ {% endif %} + + +- Bug reports and feature requests can be done through our BitBucket page. Please check on the following link if your bug or issue is a known one. Feel free to file any feature request. -
- ++ Bug reports and feature requests can be done through our BitBucket page. Please check on the following link if your bug or issue is a known one. Feel free to file any feature request. +
+We run a facebook group where you can post questions and report problems, - especially if you think the wider user community benefits from the answers.
- -You can also check me on Twitter: -
- When the site is down, this is the appropriate channel to look for apologies, updates, and offer help. - -We run a facebook group where you can post questions and report problems, + especially if you think the wider user community benefits from the answers.
+ + -Rowsandall s.r.o.
- Nové sady 988/2
- 602 00 Brno
- Czech Republic
- IČ: 070 48 572
- DIČ: CZ 070 48 572 (Nejsme plátce DPH)
- Datová schránka: 7897syr
- Email: info@rowsandall.com
- The company is registered in the business register at the
- Regional Court in Brno (Společnost je zapsána v obchodním rejstříku vedeném u Krajského soudu v Brně, oddíl C, vložka 105845)
-
You can also check me on Twitter: +
+ When the site is down, this is the appropriate channel to look for apologies, updates, and offer help. + + -{% block sidebar %} -{% include 'menu_help.html' %} -{% endblock %} +Rowsandall s.r.o.
+ Nové sady 988/2
+ 602 00 Brno
+ Czech Republic
+ IČ: 070 48 572
+ DIČ: CZ 070 48 572 (Nejsme plátce DPH)
+ Datová schránka: 7897syr
+ Email: info@rowsandall.com
+ The company is registered in the business register at the
+ Regional Court in Brno (Společnost je zapsána v obchodním rejstříku vedeném u Krajského soudu v Brně, oddíl C, vložka 105845)
+
+ With your contribution, you are helping to keep this service to the rowing community + running. As the founder and developer of the Rowsandall.com site I am very interested + to know what you think of Rowsandall.com, as well as suggestions for improvements. +
+ ++ So don't hesitate to respond to this email and let me know. I will read and respond to each + email. +
+Please contact our customer service by replying to this email if you have any further questions regarding the payment. @@ -16,4 +27,3 @@ Best Regards, the Rowsandall Team
{% endblock %} - diff --git a/rowers/templates/plantrialwelcome.html b/rowers/templates/plantrialwelcome.html new file mode 100644 index 00000000..5f588c43 --- /dev/null +++ b/rowers/templates/plantrialwelcome.html @@ -0,0 +1,31 @@ +{% extends "emailbase.html" %} + +{% block body %} +Dear {{ first_name }},
+ ++ Welcome on the trial for the Self-Coach plan. +
++As the developer of the Rowsandall.com site I am very interested to know what you think of Rowsandall.com. Especially, I'd like to understand how you started using the site, what you are looking for, and what you think could be improved. +
++The Self-Coach functionality allows you to create training plans and sessions for you and your training group. Feel free to contact me any time you need help. +
++I'd also love to hear a bit about your rowing background. +
+ ++ So don't hesitate to respond to this email and let me know. I will read and respond to each + email. +
++Thank you very much for your help and for supporting rowsandall.com. +
+ + ++ Best Regards, the Rowsandall Team +
+{% endblock %} diff --git a/rowers/templates/protrialewelcome.html b/rowers/templates/protrialewelcome.html new file mode 100644 index 00000000..a7bf7892 --- /dev/null +++ b/rowers/templates/protrialewelcome.html @@ -0,0 +1,33 @@ +{% extends "emailbase.html" %} + +{% block body %} +Dear {{ first_name }},
+ ++ Welcome on the trial for the Pro plan. +
++As the developer of the Rowsandall.com site I am very interested to know +what you think of Rowsandall.com. +Especially, I'd like to understand how you started using the site, +what you are looking for, and what you think could be improved. +
+ ++I'd also love to hear a bit about your rowing background. +
+ ++ So don't hesitate to respond to this email and let me know. I will read and respond to each + email. +
+ ++Thank you very much for your help and for supporting rowsandall.com. +
+ + ++ Best Regards, the Rowsandall Team +
+{% endblock %} diff --git a/rowers/templates/subscription_update_email.html b/rowers/templates/subscription_update_email.html index d805d0d5..6f0cee59 100644 --- a/rowers/templates/subscription_update_email.html +++ b/rowers/templates/subscription_update_email.html @@ -5,22 +5,34 @@Thank you. We have received the payment of € {{ amount }} for - your updated Rowsandall subscription. - You are now on the Rowsandall paid plan "{{ planname }}". + your updated Rowsandall subscription. + You are now on the Rowsandall paid plan "{{ planname }}".
++ With your contribution, you are helping to keep this service to the rowing community + running. As the founder and developer of the Rowsandall.com site I am very interested + to know what you think of Rowsandall.com, as well as suggestions for improvements. +
+ ++ So don't hesitate to respond to this email and let me know. I will read and respond to each + email. +
+ {% if recurring=='recurring' %}+ Some more information about the subscription. The subscription cost is €{{ price }} per year. Your next charge is due on {{ end_of_billing_period }}. We will charge you automatically - on that date. + on that date.
The subscription will keep running until you change or stop it. At any point in time you can change the automatically renewing subscription to a "one year only" subscription through the upgrade page. On this page, you can also - upgrade your subscription. + upgrade your subscription.
{% else %} @@ -28,7 +40,7 @@ The price of the subscription is €{{ price }}. You have paid €{{ amount }} as a prorated cost of your upgrade. This one year subscription will automatically end on {{ end_of_billing_period }}. You can - renew your subscription after that. + renew your subscription after that.@@ -60,4 +72,3 @@ Best Regards, the Rowsandall Team
{% endblock %} - diff --git a/rowers/views/statements.py b/rowers/views/statements.py index 1f1e700d..9f09bccc 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -158,7 +158,8 @@ from rowsandall_app.settings import ( RUNKEEPER_CLIENT_ID,RUNKEEPER_REDIRECT_URI,RUNKEEPER_CLIENT_SECRET, TP_CLIENT_ID,TP_REDIRECT_URI,TP_CLIENT_KEY,TP_CLIENT_SECRET, BRAINTREE_MERCHANT_ID,BRAINTREE_PUBLIC_KEY,BRAINTREE_PRIVATE_KEY, - PAYMENT_PROCESSING_ON + PAYMENT_PROCESSING_ON, + RECAPTCHA_SITE_KEY, RECAPTCHA_SITE_SECRET ) #from rowers.tasks_standalone import addcomment2 @@ -1073,28 +1074,39 @@ def add_defaultfavorites(r): f.save() return 1 + # Shows email form and sends it if submitted def sendmail(request): if request.method == 'POST': + # test recaptcha + response_string = request.POST.get('g-recaptcha-response') + # replace below with settings + recaptcha_secret = RECAPTCHA_SITE_SECRET + url = 'https://www.google.com/recaptcha/api/siteverify' + data = { + 'secret':recaptcha_secret, + 'response': response_string, + } + response = requests.post(url,data=data,verify=True) + success = False + if response.status_code == 200: + success = response.json().get('success') + form = EmailForm(request.POST) - if form.is_valid(): + if form.is_valid() and success: firstname = form.cleaned_data['firstname'] lastname = form.cleaned_data['lastname'] email = form.cleaned_data['email'] - subject = form.cleaned_data['subject'] - botcheck = form.cleaned_data['botcheck'].lower() + subject = 'Rowsandall Contact Form:'+form.cleaned_data['subject'] message = form.cleaned_data['message'] - if botcheck == 'yes': - try: - fullemail = firstname + " " + lastname + " " + "<" + email + ">" - send_mail(subject, message, fullemail, ['info@rowsandall.com']) - return HttpResponseRedirect('/rowers/email/thankyou/') - except: - return HttpResponseRedirect('/rowers/email/') - else: - messages.error(request,'You have to answer YES to the question') - return HttpResponseRedirect('/rowers/email/') + fullemail = firstname + " " + lastname + " " + "<" + email + ">" + send_mail(subject, message, fullemail, ['info@rowsandall.com']) + return HttpResponseRedirect('/rowers/email/thankyou/') else: + if not success: + messages.error(request,'Bots are not welcome') + else: + messages.error(request,'Something went wrong. Please try again') return HttpResponseRedirect('/rowers/email/') else: return HttpResponseRedirect('/rowers/email/') diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py index a8aea814..710fd771 100644 --- a/rowers/views/userviews.py +++ b/rowers/views/userviews.py @@ -13,23 +13,30 @@ def start_trial_view(request): messages.error(request,'You do not qualify for a trial') url = '/rowers/paidplans' return HttpResponseRedirect(url) - + r.protrialexpires = datetime.date.today()+datetime.timedelta(13) r.save() url = reverse('workouts_view') messages.info(request,'We have started your 14 day trial period') - + subject2 = "User started Pro Trial" message2 = "User Started Pro Trial.\n" message2 += request.user.email + "\n" message2 += "User name: "+request.user.username - + send_mail(subject2, message2, 'Rowsandall Server