github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-26 23:39:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove Google Checkout from gold payment options.

Browse Source
This commit is contained in:
Brian Simpson
2013-11-03 16:54:17 -05:00
parent 817f8d66c2
commit 2a41ff7e3a
2 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
r2/r2/lib/pages/pages.py
View File

@@ -2166,7 +2166,6 @@ class GoldPayment(Templated):
paypal_buttonid = g.PAYPAL_BUTTONID_AUTORENEW_BYYEAR
quantity = None
google_id = None
stripe_key = None
coinbase_button_id = None
@@ -2186,7 +2185,6 @@ class GoldPayment(Templated):
summary = strings.gold_summary_onetime % dict(user=c.user.name,
amount=Score.somethings(months, "month"))
google_id = g.GOOGLE_ID
stripe_key = g.STRIPE_PUBLIC_KEY
else:
@@ -2233,7 +2231,6 @@ class GoldPayment(Templated):
else:
raise ValueError("wtf is %r" % goldtype)
google_id = g.GOOGLE_ID
stripe_key = g.STRIPE_PUBLIC_KEY
Templated.__init__(self, goldtype=goldtype, period=period,
@@ -2242,7 +2239,6 @@ class GoldPayment(Templated):
summary=summary, giftmessage=giftmessage,
pay_from_creddits=pay_from_creddits,
passthrough=passthrough,
google_id=google_id,
comment=comment, clone_template=clone_template,
paypal_buttonid=paypal_buttonid,
stripe_key=stripe_key,

37
r2/r2/templates/goldpayment.html
View File

@@ -53,11 +53,6 @@
%else:
<p>${_("Please select a payment method.")}</p>
%if thing.google_id and not thing.clone_template:
## disable google wallet for gilding
${self.google_button()}
%endif
%if thing.paypal_buttonid:
${self.paypal_button()}
%endif
@@ -75,10 +70,6 @@
%endif
<div class="throbber"></div>
%if not thing.google_id:
<div class="note">${_("Note: Google Checkout does not support ongoing subscriptions at this time.")}</div>
%endif
%endif
</div>
</div>
@@ -96,34 +87,6 @@
</form>
</%def>
<%def name="google_button()">
<form action="https://checkout.google.com/api/checkout/v2/checkoutForm/Merchant/${thing.google_id}"
id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm"
class="gold-checkout google-checkout"
data-vendor="google-checkout"
target="${'_blank' if thing.clone_template else '_top'}">
<input name="item_name_1" type="hidden" value="creddits">
<input name="item_description_1" type="hidden"
%if thing.months != thing.quantity:
value="${thing.quantity} year(s) of reddit gold"
%else:
value="${thing.quantity} month(s) of reddit gold"
%endif
>
<input name="item_quantity_1" type="hidden"
value="${thing.quantity}">
<input name="item_price_1" type="hidden"
value="${thing.unit_price.decimal}">
<input type="hidden"
name="shopping-cart.items.item-1.merchant-private-item-data"
value="${thing.passthrough}" class="passthrough">
<input name="item_currency_1" type="hidden" value="USD">
<input name="_charset_" type="hidden" value="utf-8">
<input type="hidden" name="analyticsdata" value="">
<button class="btn gold-button">${_("Google Checkout")}</button>
</form>
</%def>
<%def name="paypal_button()">
<form action="https://www.paypal.com/cgi-bin/webscr" method="post"
class="gold-checkout"