From 10519ca558e08996ab283dbf595a9265da969244 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Fri, 8 Feb 2019 11:39:25 +0100
Subject: [PATCH 1/3] refund policy updated
---
rowers/forms.py | 1 +
rowers/templates/billing.html | 3 +-
rowers/templates/legal.html | 82 ++++++++++++++++++++++++++--
rowers/templates/paidplans.html | 6 +-
rowers/templates/paymentconfirm.html | 6 +-
rowers/templates/privacypolicy.html | 5 +-
rowers/templates/refunds.html | 33 ++++++++---
rowers/views/paymentviews.py | 12 +++-
8 files changed, 129 insertions(+), 19 deletions(-)
diff --git a/rowers/forms.py b/rowers/forms.py
index ffef4328..88ce4888 100644
--- a/rowers/forms.py
+++ b/rowers/forms.py
@@ -44,6 +44,7 @@ class BillingForm(forms.Form):
max_digits=8)
plan = forms.IntegerField(widget=forms.HiddenInput())
payment_method_nonce = forms.CharField(max_length=255,required=True)
+ tac= forms.BooleanField(required=True,initial=False)
# login form
diff --git a/rowers/templates/billing.html b/rowers/templates/billing.html
index d6035180..ef442cb3 100644
--- a/rowers/templates/billing.html
+++ b/rowers/templates/billing.html
@@ -22,7 +22,8 @@
as a price per year. You can downgrade or cancel your
plan at any time, through the settings page.
Please refer to our terms and conditions for our
- payments and refunds policy. Accepted payment methods are the payment methods offered
+ payments and refunds policy.
+ Accepted payment methods are the payment methods offered
by
Braintree
through us. If you have any questions about our payments and refunds policy, please contact
diff --git a/rowers/templates/legal.html b/rowers/templates/legal.html
index 037e3253..66bc90fa 100644
--- a/rowers/templates/legal.html
+++ b/rowers/templates/legal.html
@@ -3,6 +3,52 @@
{% block title %}Legal{% endblock title %}
{% block main %}
+
Welcome to Rowsandall
+
+
Welcome to Rowsandall. We want you to know and understand your rights and our rights relating
+ to the provision o fthe Services (as defined below). Please review them carefully.
+ Here are a few highlights:
+
+
+
+
+
+ Your privacy is critically important to us. See how we collect and use your personal
+ information in our Privacy Policy
+
You must not use this website to copy, store, host, transmit, sned, use, publish or
+ distribute any material which is illegal, obscene, defamatory, threatening, harassing, abusive,
+ or hateful or that advocates violence.
+
You must not use this website in any way that causes, or may cause, damage to the website or impairment of the availability or accessibility of the website; or in any way which is unlawful, illegal, fraudulent or harmful, or in connection with any unlawful, illegal, fraudulent or harmful purpose or activity.
@@ -51,7 +102,7 @@
rowsandall.com may disable your user ID and password in rowsandall.com’s sole discretion without notice or explanation.
-
User content
+
User content
In these terms and conditions, your user content means material (including without limitation text, images, audio material, video material and audio-visual material) that you submit to this website, for whatever purpose.
@@ -78,7 +129,7 @@
Nothing on this website constitutes, or is meant to constitute, advice of any kind. If you require advice in relation to any legal, financial or medica] matter you should consult an appropriate professional.
-
Limitations of liability
+
Limitations of liability
rowsandall.com will not be liable to you (whether under the law of contact, the law of torts or otherwise) in relation to the contents of, or use of, or otherwise in connection with, this website:
@@ -136,6 +187,27 @@
If a provision of these terms and conditions is determined by any court or other competent authority to be unlawful and/or unenforceable, the other provisions will continue in effect. If any unlawful and/or unenforceable provision would be lawful or enforceable if part of it were deleted, that part will be deemed to be deleted, and the rest of the provision will continue in effect.
+
Termination
+
+
+ You agree that Rowsandall may, under certain circumstances and without prior notice,
+ immediately terminate your accountand/or access to the site. Cause for such termination
+ shall include, but not be limited to, (a) breaches or violations of the Terms or
+ other incorporated agreements, policies, or guidelines, (b) requests by law enforcement
+ or other government agencies, (c) a request by you (self-initiated account deletions),
+ (d) discontinuance or material modification to the services (or any portion thereof), (e)
+ unexpected technical or security issues or problems, f) extended periods of inactivity,
+ and/or (g) nonpayment of any fees owed by you in connection with the Services.
+ Termination of your account may include (x) removal of access to all offerings within the
+ Services, (y) deletion of your information, files and Content associated with your account,
+ and (z) barring of further use of the Services. Further, you agree that all terminations
+ for cause shall be made in Rowsandall’s sole discretion and that Strava shall not be liable
+ to you or any third party for any termination of your account or access to the Services.
+ The following Sections shall survive termination of your account
+ and/or the Terms: Member Content Submitted to the Services, Proprietary Rights,
+ Your Feedback, Disclaimer of Warranties and Liability, Indemnity, Applicable Laws and General.
+
+
Entire agreement
These terms and conditions constitute the entire agreement between you and rowsandall.com in relation to your use of this website, and supersede all previous agreements in respect of your use of this website.
@@ -145,7 +217,7 @@
These terms and conditions will be governed by and construed in accordance with Czech Law and any disputes relating to these terms and conditions will be subject to the exclusive jurisdiction of the courts of The Czech Republic.
-
rowsandall.com’s details
+
rowsandall.com’s details
The rowsandall.com site is owned by Rowsandall s.r.o., Nové sady 988/2, Staré Brno, 602 00 Brno, Czech Republic (company identification number 070 48 572)
@@ -156,7 +228,7 @@
{% include "refunds.html" %}
-
Privacy Policy
+
Privacy Policy
{% include "privacypolicy.html" %}
diff --git a/rowers/templates/paidplans.html b/rowers/templates/paidplans.html
index cd174ccd..0b2f55cb 100644
--- a/rowers/templates/paidplans.html
+++ b/rowers/templates/paidplans.html
@@ -302,7 +302,11 @@
If you have previously consented to allow rowsandall.com to store and process your personal
data in accordance with this privacy policy, and you wish to withdraw your conent,
@@ -237,7 +237,7 @@
edit your heart rate and power settings, as well as functional threshold information and the account information accessible on your
settings page under the header "Account Information". The team manager is not able to access or change your passwords, team memberships,
favorite charts, export settings, workflow layout, or secret tokens. Also, the team manager is not able to download all your data,
- not can he deactivate or delete your account.
+ nor can he deactivate or delete your account.
@@ -274,6 +274,7 @@
has suitable GDPR compliant measures in place.
+
Inactive Users - accounts are deleted after 18 months
@@ -9,19 +9,36 @@
of the plan, you can cancel the recurring payment. We do not issue refunds for payments
regarding the current plan period.
-
We do not issue refunds for digital products once the order is
- confirmed and the product is sent.
+
If you are not 100% satisfied with your purchase, you can get a refund or
+ exhchange the product for another one.
+
+
+
You can return a product for up to 30 days from the date you purchased it.
+ To be eligible for a refund, you need to contact us using the contact information
+ below. To improve our service, we ask you to explain how the product did not meet
+ your expectations. If your refund is approved, we will initiate a refund to your
+ credit card (or original method of payment). You will receive the credit within
+ a certain amount of days, depending on your card issuer's policies.
+
We recommend contacting us for assistance if you experience any issues receiving
our products.
-
Upgrades and Downgrades
+
Upgrades and Downgrades, Cancellations
-Upgrades and downgrades between paid plans are effective immediately, but the billing cycle
-is not changed. Upgrades are charged a pro-rated amount for the current billing cycle. Downgrades
-will result in a credit on our accounts, leading to a lower charge at the beginning of the
-subsequent billing cycle.
+
+ Upgrades and downgrades between paid plans are effective immediately, but the billing cycle
+ is not changed. Upgrades are charged a pro-rated amount for the current billing cycle. Downgrades
+ will result in a credit on our accounts, leading to a lower charge at the beginning of the
+ subsequent billing cycle.
+
+
+
+ With the exception of an approved refund within 30 days of purchase (see above), we do not
+ issue refunds upon cancellation of the plan. If you are eligible for a refund, contact
+ us within 30 days of your purchase.
+
Contact us
diff --git a/rowers/views/paymentviews.py b/rowers/views/paymentviews.py
index 0e7b88f9..5183ca27 100644
--- a/rowers/views/paymentviews.py
+++ b/rowers/views/paymentviews.py
@@ -316,6 +316,7 @@ def checkouts_view(request):
return HttpResponseRedirect(url)
form = BillingForm(request.POST)
+ print request.POST
if form.is_valid():
data = form.cleaned_data
success,amount = braintreestuff.create_subscription(r,data)
@@ -329,7 +330,16 @@ def checkouts_view(request):
messages.error(request,"There was a problem with your payment")
url = reverse(billing_view)
return HttpResponseRedirect(url)
-
+ elif 'tac' not in request.POST:
+ try:
+ planid = int(request.POST['plan'])
+ url = reverse('payment_confirm_view',kwargs={'planid':planid})
+ messages.error(request,"You must review and acknowledge the terms and conditions")
+ return HttpResponseRedirect(url)
+ except IndexError:
+ messages.error(request,"There was an error in the payment form")
+ url = reverse('billing_view')
+ return HttpResponseRedirect(url)
else:
messages.error(request,"There was an error in the payment form")
url = reverse(billing_view)
From 319ce56e07bd2cd48a510cfd1a20d60831689270 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Fri, 8 Feb 2019 12:39:31 +0100
Subject: [PATCH 2/3] added downgrades & upgrades
---
rowers/templates/downgradeconfirm.html | 5 +
rowers/templates/upgradeconfirm.html | 5 +
rowers/tests/test_payments.py | 136 +++++++++++++++++++++++++
rowers/views/paymentviews.py | 23 ++++-
4 files changed, 167 insertions(+), 2 deletions(-)
diff --git a/rowers/templates/downgradeconfirm.html b/rowers/templates/downgradeconfirm.html
index 1e027c34..4b76a6d9 100644
--- a/rowers/templates/downgradeconfirm.html
+++ b/rowers/templates/downgradeconfirm.html
@@ -72,6 +72,11 @@
+