Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Remove/Replace Balanced from Credit card page #3565

Merged
merged 21 commits into from
Oct 21, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scss/components/payments-by.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.payments-by {
background-image: url("payments-by.png");
background-size: cover;
width: 200px;
width: 153px;
height: 24px;
float: right;
margin-bottom: 5px;
Expand Down
9 changes: 8 additions & 1 deletion tests/py/test_pages.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from aspen import Response

import mock
import pytest
from gratipay.security.user import SESSION
from gratipay.testing import Harness
Expand Down Expand Up @@ -195,7 +196,6 @@ def test_team_slug__not__redirected_from_tilde(self):
assert self.client.GET("/TheEnterprise/").code == 200
assert self.client.GxT("/~TheEnterprise/").code == 404


def test_security_headers_sets_x_frame_options(self):
headers = self.client.GET('/about/').headers
assert headers['X-Frame-Options'] == 'SAMEORIGIN'
Expand All @@ -207,3 +207,10 @@ def test_security_headers_sets_x_content_type_options(self):
def test_security_headers_sets_x_xss_protection(self):
headers = self.client.GET('/about/').headers
assert headers['X-XSS-Protection'] == '1; mode=block'

@mock.patch('gratipay.models.participant.Participant.get_braintree_account')
@mock.patch('gratipay.models.participant.Participant.get_braintree_token')
def test_braintree_linked_from_credit_card_page(self, foo, bar):
self.make_participant('alice', claimed_time='now')
body = self.client.GET("/~alice/routes/credit-card.html", auth_as="alice").body
assert "Braintree" in body
2 changes: 1 addition & 1 deletion www/about/policies/privacy.spt
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ who work on our behalf:</p>

<ul>

<li><a href="https://www.balancedpayments.com/">Balanced Payments</a>
<li><a href="https://www.braintreepayments.com/">Braintree Payments</a>
provides payment processing.</li>

<li><a href="http://piwik.pro/">Piwiki Pro</a> provides website traffic
Expand Down
23 changes: 9 additions & 14 deletions www/about/policies/terms-of-service.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Gratipay, LLC
716 Park Road
Ambridge, PA 15003
USA
[email protected]
[email protected]

1. Registration, Security, and Privacy

Expand Down Expand Up @@ -160,7 +160,7 @@ endorse those sites.
non-exclusive, worldwide, royalty-free, perpetual, license (including the right
to sublicense) to use, host, store, cache, reproduce, publish, display,
perform, distribute, transmit, adapt, and modify the content, in all media now
known or later developed.
known or later developed.

1. This license permits Gratipay to operate, promote, and improve the
Service, and to develop new Service. It also permits Gratipay to provide,
Expand Down Expand Up @@ -220,17 +220,12 @@ responsible for the activity.

1. Gratipay's Service Providers

1. Gratipay uses Pound Payments Inc., DBA Balanced ("Balanced") as a third
party service provider for payment services (e.g. card acceptance,
merchant settlement, and related services). By making use of some or all of
these payment services on Gratipay you agree to be bound by Balanced's [terms
and conditions](https://www.balancedpayments.com/terms) and [privacy
policy](https://www.balancedpayments.com/privacy), and hereby consent and
authorize us to delegate the authorizations and share the information you
provide to us with Balanced to the extent required to provide the payment
services to you. Balanced may also be contacted directly for payments support
either by email at [email protected] or by phone at +1 (888)
744-2622.
1. Gratipay uses Braintree, a division of PayPal, Inc. ("Braintree") for
payment processing services. By using the Braintree payment processing
services you agree to the [Braintree Payment Services
Agreement](https://www.braintreepayments.com/legal/payment-services-agreement),
and the applicable [bank
agreement](https://www.braintreepayments.com/legal/bank-agreement-us).

1. Nonprofits and Charities using Gratipay

Expand All @@ -252,7 +247,7 @@ Act ("DMCA"). You can contact our designated agent for copyright infringement
notifications and counter-notifications at: Copyright Agent, Gratipay, LLC, 716
Park Road, Ambridge, PA 15003, USA, [email protected].

1. Reporting Instances of Copyright Infringement
1. Reporting Instances of Copyright Infringement

1. If you believe that any content on the Service infringes your copyright,
please send us a notice containing the following information: a)
Expand Down
20 changes: 9 additions & 11 deletions www/about/policies/terms-of-service.spt
Original file line number Diff line number Diff line change
Expand Up @@ -238,17 +238,15 @@ responsible for the activity.</li>
<li><p>Gratipay&#39;s Service Providers</p>

<ol>
<li>Gratipay uses Pound Payments Inc., DBA Balanced (&ldquo;Balanced&rdquo;) as a third
party service provider for payment services (e.g. card acceptance,
merchant settlement, and related services). By making use of some or all of
these payment services on Gratipay you agree to be bound by Balanced&#39;s <a href="https://www.balancedpayments.com/terms">terms
and conditions</a> and <a href="https://www.balancedpayments.com/privacy">privacy
policy</a>, and hereby consent and
authorize us to delegate the authorizations and share the information you
provide to us with Balanced to the extent required to provide the payment
services to you. Balanced may also be contacted directly for payments support
either by email at <a href="mailto:[email protected]">[email protected]</a> or by phone at +1 (888)
744-2622.</li>

<li>Gratipay uses Braintree, a division of PayPal, Inc.
(&ldquo;Braintree&rdquo;) for payment processing services. By using the
Braintree payment processing services you agree to the <a
href="https://www.braintreepayments.com/legal/payment-services-agreement">Braintree
Payment Services Agreement</a>, and the applicable <a
href="https://www.braintreepayments.com/legal/bank-agreement-us">bank
agreement</a>.</li>

</ol></li>
<li><p>Nonprofits and Charities using Gratipay</p>

Expand Down
Binary file modified www/assets/payments-by.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 5 additions & 6 deletions www/~/%username/routes/credit-card.spt
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,12 @@ else:
{% endif %}

<p class="info">Credit card information is stored and processed by
<a href="https://www.balancedpayments.com/">Balanced Payments</a>. Here
are their <a href="https://www.balancedpayments.com/terms">Terms of Service</a>
and <a href="https://www.balancedpayments.com/privacy">Privacy Policy</a>.
</p>
<a href="https://www.braintreepayments.com/">Braintree</a>. Here
are their <a href="https://www.braintreepayments.com/legal">legal agreements</a>.</p>

<a href="https://www.balancedpayments.com/"><img
src="{{ website.asset('balanced-with-cards.png') }}" /></a>
<a href="https://www.braintreegateway.com/merchants/msjyyvtsvvnc4ny6/verified" target="_blank">
<img src="https://s3.amazonaws.com/braintree-badges/braintree-badge-dark.png" width="164px" height ="44px" border="0"/>
</a>
</div>
{% endif %}
{% endblock %}