Got end-to-end Datacash transactions working

examples/demo/import.py

@@ -1,72 +0,0 @@
-import MySQLdb
-from decimal import Decimal as D
-
-from django.core.management import setup_environ
-import settings as app_settings
-setup_environ(app_settings)
-
-from oscar.product.models import ItemClass, Item, AttributeType, ItemAttributeValue, Option
-from oscar.stock.models import Partner, StockRecord
-from django.db import connection as django_connection
-
-connection = MySQLdb.connect(host='localhost', user='root', passwd='gsiwmm', db='CWDM_app_production_copy')
-cursor = connection.cursor(MySQLdb.cursors.DictCursor)
-
-
-def create_stock_record(product, partner_type, product_id, partner_ref):
-    cursor.execute("SELECT * FROM Brd_ProductStock WHERE ProductId = %s", product_id)
-    stock_row = cursor.fetchone()
-    if stock_row:
-        partner,_ = Partner.objects.get_or_create(name="%s (%s)" % (stock_row['Partner'], partner_type))
-        price = D(stock_row['Price']) - D(stock_row['PriceSalesTax'])
-        print "  - Creating stock record"
-        stock_record = StockRecord.objects.create(product=product, partner=partner, partner_reference=partner_ref,
-                                                  price_currency='GBP', price_excl_tax=price, 
-                                                  num_in_stock=stock_row['NumInStock'])
-
-# Truncate tables
-print "Truncating tables"
-django_cursor = django_connection.cursor()
-django_cursor.execute("set foreign_key_checks=0")
-django_cursor.execute("TRUNCATE TABLE product_item")
-django_cursor.execute("TRUNCATE TABLE product_attributetype")
-django_cursor.execute("TRUNCATE TABLE product_attributevalueoption")
-django_cursor.execute("TRUNCATE TABLE product_itemattributevalue")
-django_cursor.execute("TRUNCATE TABLE stock_partner")
-django_cursor.execute("TRUNCATE TABLE stock_stockrecord")
-
-cursor.execute("SELECT * FROM Brd_ProductsCanonical WHERE Partner = 'Prolog' LIMIT 20")
-for row in cursor.fetchall():
-    print "Creating canonical product %s" % (row['ProductCode'],)
-    pclass,_ = ItemClass.objects.get_or_create(name=row['MediaType'])
-    p,_ = Item.objects.get_or_create(title=row['Title'], item_class=pclass, upc=row['ProductCode'])
-    
-    cursor.execute("SELECT * FROM Brd_Products WHERE CanonicalProductId = %s", row['CanonicalProductId'])
-    product_rows = cursor.fetchall()
-    if len(product_rows) > 1:
-        # Create variant products
-        for product_row in product_rows:
-            print " - Creating child product %s" % product_row['SourceProductId']
-            child_p,_ = Item.objects.get_or_create(parent=p, upc=product_row['SourceProductId'])
-            
-            # Fetch attributes
-            cursor.execute("SELECT VariantType, VariantValue FROM Brd_ProductVariations WHERE ProductId = %s", product_row['ProductId'])
-            variant_rows = cursor.fetchall()
-            for variant_row in variant_rows:
-                print "   - Create attribute %s = %s" % (variant_row['VariantType'], variant_row['VariantValue'])
-                attr_type,_ = AttributeType.objects.get_or_create(name=variant_row['VariantType'])
-                item_attr_value = ItemAttributeValue.objects.create(product=child_p, type=attr_type, 
-                                                                    value=variant_row['VariantValue'])
-                if variant_row['VariantType'] == 'CanBePersonalised' and variant_row['VariantValue'] == 'Y':
-                    option,_ = Option.objects.get_or_create(name="Personal message")
-                    child_p.options.add(option)
-                    child_p.save()
-            # Stock record for child
-            create_stock_record(child_p, row['FulfillmentType'], product_row['ProductId'], product_row['SourceProductId'])
-    else:
-        # Stand-alone product
-        product_row = product_rows[0]
-        create_stock_record(p, row['FulfillmentType'], product_row['ProductId'], product_row['SourceProductId'])
-    
-cursor.close()
-print "Finished"

examples/demo/shop/checkout/views.py

@@ -12,6 +12,7 @@ import_module('payment.utils', ['Bankcard'], locals())
 import_module('payment.datacash.utils', ['Gateway', 'Facade'], locals())
 import_module('order.models', ['PaymentEvent', 'PaymentEventType', 'PaymentEventQuantity'], locals())
     
+    
 class PaymentMethodView(CorePaymentMethodView):
     template_file = 'checkout/payment_method.html'
     

oscar/apps/payment/datacash/abstract_models.py

@@ -1,7 +1,6 @@
-from decimal import Decimal
+import re
 
 from django.db import models
-from django.utils.translation import ugettext as _
 
 
 class AbstractOrderTransaction(models.Model):
@@ -29,3 +28,9 @@ class AbstractOrderTransaction(models.Model):
     
     class Meta:
         abstract = True
+        
+    def save(self, *args, **kwargs):
+        if not self.pk:
+            reg_ex = re.compile(r'\d{12}')
+            self.request_xml = reg_ex.sub('XXXXXXXXXXXX', self.request_xml)
+        super(AbstractOrderTransaction, self).save(*args, **kwargs)

oscar/apps/payment/datacash/tests.py

@@ -0,0 +1,91 @@
+from decimal import Decimal as D
+from xml.dom.minidom import parseString
+import datetime
+
+from django.test import TestCase
+from django.conf import settings
+
+from oscar.apps.payment.datacash.models import OrderTransaction
+from oscar.apps.payment.datacash.utils import Gateway, Facade
+from oscar.apps.payment.utils import Bankcard
+
+
+class OrderTransactionTests(TestCase):
+    
+    def test_cc_numbers_are_not_saved(self):
+        
+        request_xml = """<?xml version="1.0" encoding="UTF-8" ?>
+<Request>
+    <Authentication>
+        <client>99000001</client>
+        <password>boomboom</password>
+    </Authentication>
+    <Transaction>
+    <CardTxn>
+        <Card>
+            <pan>1000011100000004</pan>
+            <expirydate>04/06</expirydate>
+            <startdate>01/04</startdate>
+        </Card>
+        <method>auth</method>
+    </CardTxn>
+    <TxnDetails>
+        <merchantreference>1000001</merchantreference>
+        <amount currency="GBP">95.99</amount>
+    </TxnDetails>
+    </Transaction>
+</Request>"""
+
+        response_xml = """<?xml version="1.0" encoding="UTF-8" ?>
+<Response>
+    <CardTxn>
+        <authcode>060642</authcode>
+        <card_scheme>Switch</card_scheme>
+        <country>United Kingdom</country>
+        <issuer>HSBC</issuer>
+    </CardTxn>
+    <datacash_reference>3000000088888888</datacash_reference>
+    <merchantreference>1000001</merchantreference>
+    <mode>LIVE</mode>
+    <reason>ACCEPTED</reason>
+    <status>1</status>
+    <time>1071567305</time>
+</Response>"""
+        
+        txn = OrderTransaction.objects.create(order_number='1000',
+                                              method='auth',
+                                              datacash_ref='3000000088888888',
+                                              merchant_ref='1000001',
+                                              amount=D('95.99'),
+                                              status=1,
+                                              reason='ACCEPTED',
+                                              request_xml=request_xml,
+                                              response_xml=response_xml)
+        doc = parseString(txn.request_xml)
+        element = doc.getElementsByTagName('pan')[0]
+        self.assertEqual('XXXXXXXXXXXX0004', element.firstChild.data)
+        
+        
+class IntegrationTests(TestCase):
+    
+    def _test_for_smoke(self):
+        gateway = Gateway(settings.DATACASH_CLIENT, 
+                          settings.DATACASH_PASSWORD,
+                          host=settings.DATACASH_HOST)
+        response = gateway.auth(card_number='1000011000000005',
+                                expiry_date='01/13',
+                                amount=D('50.00'),
+                                currency='GBP',
+                                merchant_reference='123456_%s' % datetime.datetime.now().microsecond)
+        print response
+        
+    def _test_adapter(self):
+        bankcard = Bankcard(card_number='1000011000000005', expiry_date='01/13')
+    
+        dc_facade = Facade()
+        reference = dc_facade.debit('102910', D('23.00'), bankcard)
+        print reference
+        
+        OrderTransaction.objects.get(order_number='102910')
+        
+    

oscar/apps/payment/datacash/utils.py

@@ -1,5 +1,6 @@
 import datetime
 from xml.dom.minidom import Document, parseString
+import httplib, urllib
 
 from django.conf import settings
 from django.db import transaction
@@ -7,40 +8,34 @@ from django.utils.translation import ugettext_lazy as _
 
 from oscar.core.loading import import_module
 import_module('payment.datacash.models', ['OrderTransaction'], locals())
-import_module('payment.exceptions', ['TransactionDeclinedException'], locals())
+import_module('payment.exceptions', ['TransactionDeclinedException', 'GatewayException'], locals())
 
 # Status codes
 ACCEPTED, DECLINED = '1', '7'
 
+
 class Gateway(object):
 
-    def __init__(self, client, password, cv2avs=False):
+    def __init__(self, client, password, host, cv2avs=False):
         self._client = client
         self._password = password
+        self._host = host
         
         # Fraud settings
         self._cv2avs = cv2avs
 
     def do_request(self, request_xml):
         # Need to fill in HTTP request here
-        response_xml = """<?xml version="1.0" encoding="UTF-8" ?>
-<Response>
-<CardTxn>
-<authcode>060642</authcode>
-<card_scheme>Switch</card_scheme>
-<country>United Kingdom</country>
-<issuer>HSBC</issuer>
-</CardTxn>
-<datacash_reference>3000000088888888</datacash_reference>
-<merchantreference>1000001</merchantreference>
-<mode>LIVE</mode>
-<reason>ACCEPTED</reason>
-<status>1</status>
-<time>1071567305</time>
-</Response>
-
-"""
-
+        conn = httplib.HTTPSConnection(self._host, 443, timeout=30)
+        headers = {"Content-type": "application/xml",
+                   "Accept": ""}
+        conn.request("POST", "/Transaction", request_xml, headers)
+        response = conn.getresponse()
+        response_xml = response.read()
+        if response.status != httplib.OK:
+            raise GatewayException("Unable to communicate with payment gateway (code: %s, response: %s)" % (response.status, response_xml))
+        conn.close()
+        
         # Save response XML
         self._last_response_xml = response_xml
         return response_xml
@@ -120,12 +115,15 @@ class Gateway(object):
         return ele
     
     def _get_element_text(self, doc, tag):
-        ele = doc.getElementsByTagName(tag)[0]
+        try:
+            ele = doc.getElementsByTagName(tag)[0]
+        except IndexError:
+            return None
         return ele.firstChild.data
 
     def _build_response_dict(self, response_xml, extra_elements=None):
         doc = parseString(response_xml)
-        response = {'status': self._get_element_text(doc, 'status'),
+        response = {'status': int(self._get_element_text(doc, 'status')),
                     'datacash_reference': self._get_element_text(doc, 'datacash_reference'),
                     'merchant_reference': self._get_element_text(doc, 'merchantreference'),
                     'reason': self._get_element_text(doc, 'reason')}
@@ -200,7 +198,7 @@ class Facade(object):
     """
     
     def __init__(self):
-        self.gateway = Gateway(settings.DATACASH_CLIENT, settings.DATACASH_PASSWORD)
+        self.gateway = Gateway(settings.DATACASH_CLIENT, settings.DATACASH_PASSWORD, settings.DATACASH_HOST)
     
     def debit(self, order_number, amount, bankcard, billing_address=None):
         with transaction.commit_on_success():

oscar/apps/payment/exceptions.py

@@ -1,2 +1,6 @@
 class TransactionDeclinedException(Exception):
+    pass
+
+
+class GatewayException(Exception):
     pass

oscar/apps/payment/tests/datacash_requests.py

@@ -54,7 +54,7 @@ class TransactionMixin(object):
             tag = doc.getElementsByTagName(tag_name)[0]
             self.assertEquals(value, tag.attributes[attribute].value)
         except IndexError:
-            self.fail("Tag '%s' not found\n%s" % (tagName, request_xml))
+            self.fail("Tag '%s' not found\n%s" % (tag_name, request_xml))
     
     def test_request_includes_credentials(self):
         self.make_request()
@@ -87,10 +87,6 @@ class InitialTransactionMixin(TransactionMixin):
     def test_request_can_include_issue_number(self):
         self.make_request(issue_number='03')    
         self.assertXmlTagValue('issuenumber', '03')    
-        
-    def test_request_can_include_authcode(self):
-        self.make_request(auth_code='334455')    
-        self.assertXmlTagValue('authcode', '334455')
 
 
 class AuthTransactionTests(TestCase, InitialTransactionMixin):

oscar/apps/payment/tests/datacash_responses.py

@@ -55,19 +55,6 @@ class AuthResponseHandlingTests(TestCase):
         self.assertEquals('060642', response['auth_code'])
         self.assertEquals('ACCEPTED', response['reason'])
         
-    def test_success_pre_response(self):
-        self.gateway.do_request.return_value = self.success_response_xml
-        response = self.gateway.refund(card_number='1000010000000007', 
-                                     expiry_date='01/12',
-                                     merchant_reference='1000001',
-                                     currency='GBP',
-                                     amount=D('12.99'))
-        self.assertEquals('1', response['status'])
-        self.assertEquals('3000000088888888', response['datacash_reference'])
-        self.assertEquals('1000001', response['merchant_reference'])
-        self.assertEquals('060642', response['auth_code'])
-        self.assertEquals('ACCEPTED', response['reason'])
-        
     def test_declined_auth_response(self):
         response_xml = """<?xml version="1.0" encoding="UTF-8" ?>
 <Response>

oscar/apps/payment/utils.py

@@ -2,9 +2,10 @@
 
 class Bankcard(object):
     
-    def __init__(self, card_number, expiry_date, name=None, start_date=None, issue_number=None):
+    def __init__(self, card_number, expiry_date, name=None, ccv=None, start_date=None, issue_number=None):
         self.card_number = card_number
         self.card_holder_name = name
         self.expiry_date = expiry_date
         self.start_date = start_date
-        self.issue_number = issue_number
+        self.issue_number = issue_number
+        self.ccv = ccv

settings_local.py

@@ -15,6 +15,6 @@ GOOGLE_CHECKOUT_MERCHANT_KEY = 'ba3VMi0dFHqKKSDEfoAuLA'
 GOOGLE_CHECKOUT_URL = 'https://sandbox.google.com/checkout/api/checkout/v2/merchantCheckout/Merchant/%s' % GOOGLE_CHECKOUT_MERCHANT_ID
 
 # Datacash
-DATACASH_URL = 'https://testserver.datacash.com/Transaction'         
+DATACASH_HOST = 'testserver.datacash.com'         
 DATACASH_CLIENT = '99002051'
 DATACASH_PASSWORD = 'Ys4ePPgDHQmn'