Skip to content

Added a line to make the test config more useful, without having to debug why my test config failed. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dragonx wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Added a line to make the test config more useful, without having to debug why my test config failed. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
28ab857
Fix the docs so the config file format is clear.
invalid-email-address Aug 2, 2012
2223c2f
Looks like there's a couple of bugs in completing preauths, and handl…
invalid-email-address Aug 2, 2012
309ef1f
Pass in optional order numbers instead of generating random ones.
invalid-email-address Sep 28, 2012
ba1a44b
Pass in orderid with payments using profiles.
Apr 9, 2013
e0e6852
Extend urlopen timeout.
Apr 23, 2013
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
1 change: 1 addition & 0 deletions README.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ credit cards given for sandbox use.
Example config file:

# these should match your beanstream account settings
[config]
hash_validation: true
require_billing_address: true
require_cvd: true
Expand Down
22 changes: 11 additions & 11 deletions beanstream/gateway.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ def configure(self, merchant_id, login_company, login_user, login_password, **pa
if self.HASH_VALIDATION and self.hash_algorithm not in ('MD5', 'SHA1'):
raise errors.ConfigurationException('hash algorithm must be one of MD5 or SHA1')

def purchase(self, amount, card, billing_address=None):
def purchase(self, amount, card, billing_address=None, order_number=None):
""" Returns a Purchase object with the specified options.
"""
txn = process_transaction.Purchase(self, amount)
txn = process_transaction.Purchase(self, amount, order_number)
txn.set_card(card)
if billing_address:
txn.set_billing_address(billing_address)
Expand All @@ -89,14 +89,14 @@ def void_purchase(self, transaction_id, amount):
""" Returns an Adjustment object configured for voiding the specified
transaction for the specified amount.
"""
txn = process_transaction.Adjustment(self, process_transaction.Adjustment.VOID, transaction_id, amount)
txn = process_transaction.Adjustment(self, process_transaction.Adjustment.VOID_PURCHASE, transaction_id, amount)
return txn

def return_purchase(self, transaction_id, amount):
def return_purchase(self, transaction_id, amount, order_number=None):
""" Returns an Adjustment object configured for returning the specified
transaction for the specified amount.
"""
txn = process_transaction.Adjustment(self, process_transaction.Adjustment.RETURN, transaction_id, amount)
txn = process_transaction.Adjustment(self, process_transaction.Adjustment.RETURN, transaction_id, amount, order_number)
return txn

def void_return(self, transaction_id, amount):
Expand All @@ -106,21 +106,21 @@ def void_return(self, transaction_id, amount):
txn = process_transaction.Adjustment(self, process_transaction.Adjustment.VOID_RETURN, transaction_id, amount)
return txn

def preauth(self, amount, card, billing_address=None):
def preauth(self, amount, card, billing_address=None, order_number=None):
""" Returns a PreAuthorization object with the specified options.
"""
txn = process_transaction.PreAuthorization(self, amount)
txn = process_transaction.PreAuthorization(self, amount, order_number)
txn.set_card(card)
if billing_address:
txn.set_billing_address(billing_address)

return txn

def preauth_completion(self, transaction_id, amount):
def preauth_completion(self, transaction_id, amount, order_number=None):
""" Returns an Adjustment object configured for completing the
preauthorized transaction for the specified amount.
"""
txn = process_transaction.Adjustment(self, process_transaction.Adjustment.PREAUTH_COMPLETION, transaction_id, amount)
txn = process_transaction.Adjustment(self, process_transaction.Adjustment.PREAUTH_COMPLETION, transaction_id, amount, order_number)
return txn

def cancel_preauth(self, transaction_id):
Expand Down Expand Up @@ -151,10 +151,10 @@ def get_payment_profile(self, customer_code):
txn = payment_profiles.GetPaymentProfile(self, customer_code)
return txn

def purchase_with_payment_profile(self, amount, customer_code):
def purchase_with_payment_profile(self, amount, customer_code, order_number=None):
""" Returns a Purchase object with the specified options.
"""
txn = process_transaction.Purchase(self, amount)
txn = process_transaction.Purchase(self, amount, order_number)
txn.set_customer_code(customer_code)
return txn

Expand Down
14 changes: 7 additions & 7 deletions beanstream/process_transaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

class Purchase(transaction.Transaction):

def __init__(self, beanstream_gateway, amount):
super(Purchase, self).__init__(beanstream_gateway)
def __init__(self, beanstream_gateway, amount, order_number=None):
super(Purchase, self).__init__(beanstream_gateway, order_number)
self.url = self.URLS['process_transaction']
self.response_class = PurchaseResponse

Expand Down Expand Up @@ -125,22 +125,22 @@ def auth_code(self):

class PreAuthorization(Purchase):

def __init__(self, beanstream_gateway, amount):
super(PreAuthorization, self).__init__(beanstream_gateway, amount)
def __init__(self, beanstream_gateway, amount, order_number=None):
super(PreAuthorization, self).__init__(beanstream_gateway, amount, order_number)

self.params['trnType'] = self.TRN_TYPES['preauth']


class Adjustment(transaction.Transaction):
class Adjustment(Purchase):

RETURN = 'R'
VOID = 'V'
PREAUTH_COMPLETION = 'PAC'
VOID_RETURN = 'VR'
VOID_PURCHASE = 'VP'

def __init__(self, beanstream_gateway, adjustment_type, transaction_id, amount):
super(PreAuthorizationCompletion, self).__init__(beanstream_gateway)
def __init__(self, beanstream_gateway, adjustment_type, transaction_id, amount, order_number=None):
super(Adjustment, self).__init__(beanstream_gateway, amount, order_number)

if not beanstream_gateway.HASH_VALIDATION and not beanstream_gateway.USERNAME_VALIDATION:
raise errors.ConfigurationException('adjustments must be performed with either hash or username/password validation')
Expand Down
1 change: 1 addition & 0 deletions beanstream/response_codes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,6 +782,7 @@
'787': {'type': 'TD Bank', 'approved': False, 'cardholder_message': 'Declined', 'merchant_message': 'Declined'},
'788': {'type': 'Beanstream', 'approved': False, 'cardholder_message': 'Duplicate Order Number - This order number has already been processed', 'merchant_message': 'Duplicate Order Number - This order number has already been processed'},
'789': {'type': 'Beanstream', 'approved': False, 'cardholder_message': 'Card Number Mismatch', 'merchant_message': 'Card Number Mismatch'},
'804': {'type': 'Beanstream', 'approved': False, 'cardholder_message': 'Entered information cannot be authenticated', 'merchant_message': 'Entered information cannot be authenticated'},
}


Expand Down
9 changes: 6 additions & 3 deletions beanstream/transaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class Transaction(object):
}


def __init__(self, beanstream):
def __init__(self, beanstream, order_number=None):
self.beanstream = beanstream
self.response_class = Response

Expand All @@ -60,7 +60,10 @@ def __init__(self, beanstream):
self.params['username'] = self.beanstream.username
self.params['password'] = self.beanstream.password

self._generate_order_number()
if order_number:
self.order_number = order_number
else:
self._generate_order_number()
self.params['trnOrderNumber'] = self.order_number
self.response_params = []

Expand Down Expand Up @@ -90,7 +93,7 @@ def commit(self):

log.debug('Sending to %s: %s', self.url, data)

res = urllib2.urlopen(self.url, data)
res = urllib2.urlopen(self.url, data, 10)

if res.code != 200:
log.error('response code not OK: %s', res.code)
Expand Down
3 changes: 1 addition & 2 deletions tests/simple_t.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,7 @@ def test_failed_cvd(self):
txn.set_comments('%s:test_failed_cvd' % __name__)
resp = txn.commit()
assert not resp.approved()
assert resp.cvd_status() == 'CVD Mismatch'

assert resp.cvd_status() == 'CVD Not Verified'

def test_over_limit_cc_purchase(self):
today = date.today()
Expand Down