github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-27 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

auth_transaction: Remove rotted test logic.

Browse Source
This commit is contained in:
Brian Simpson
2014-04-25 11:06:50 -04:00
parent beed1bc8fd
commit 499e4ac499
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
r2/r2/lib/authorize/interaction.py
View File

@@ -135,7 +135,7 @@ def _make_transaction(trans_cls, amount, user, pay_id,
@export
def auth_transaction(amount, user, payid, thing, campaign, test=None):
def auth_transaction(amount, user, payid, thing, campaign):
# use negative pay_ids to identify freebies, coupons, or anything
# that doesn't require a CC.
if payid < 0:
@@ -155,26 +155,22 @@ def auth_transaction(amount, user, payid, thing, campaign, test=None):
order = Order(invoiceNumber="T%dC%d" % (thing._id, campaign))
success, res = _make_transaction(ProfileTransAuthOnly,
amount, user, payid,
order=order, test=test)
order=order)
if success:
if test:
return auth_transaction(amount, user, -1, thing, campaign,
test = test)
else:
Bid._new(res.trans_id, user, payid, thing._id, amount, campaign)
return res.trans_id, ""
elif res is None:
# we are in test mode!
return auth_transaction(amount, user, -1, thing, test=test)
# duplicate transaction, which is bad, but not horrible. Log
# the transaction id, creating a new bid if necessary.
elif res.trans_id and (res.response_code, res.response_reason_code) == (3,11):
Bid._new(res.trans_id, user, payid, thing._id, amount, campaign)
return res.trans_id, ""
elif (res.trans_id and
(res.response_code, res.response_reason_code) == (3, 11)):
# duplicate transaction, which is bad, but not horrible. Log
# the transaction id, creating a new bid if necessary.
g.log.error("Authorize.net duplicate trans %d on campaign %d" %
(res.trans_id, campaign))
try:
Bid.one(res.trans_id, campaign=campaign)
except NotFound:
Bid._new(res.trans_id, user, payid, thing._id, amount, campaign)
return res.trans_id, res.response_reason_text

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

@@ -346,9 +346,8 @@ def auth_campaign(link, campaign, user, pay_id):
Returns: (True, "") if successful or (False, error_msg) if not.
"""
void_campaign(link, campaign, reason='changed_payment')
test = 1 if g.debug else None
trans_id, reason = authorize.auth_transaction(campaign.bid, user, pay_id,
link, campaign._id, test=test)
link, campaign._id)
if trans_id and not reason:
text = ('updated payment and/or bid for campaign %s: '
@@ -373,7 +372,6 @@ def auth_campaign(link, campaign, user, pay_id):
emailer.promo_bid(link, campaign.bid, campaign.start_date)
else:
# something bad happend.
text = ("updated payment and/or bid for campaign %s: FAILED ('%s')"
% (campaign._id, reason))
PromotionLog.add(link, text)