datacash url pattern adjusted

README.rst

@@ -1,3 +1,6 @@
+Changes made to the to url Now compatible with django 1.11
+
+
 =================================
 Datacash package for django-oscar
 =================================
@@ -43,7 +46,7 @@ From PyPi::
 
 or from Github::
 
-    pip install git+git://github.com/tangentlabs/django-oscar-datacash.git#egg=django-oscar-datacash
+    pip install git+git://github.com/ldonjibson/django-oscar-datacash.git#egg=django-oscar-datacash
 
 Add ``'datacash'`` to ``INSTALLED_APPS`` and run::
 

datacash/dashboard/app.py

@@ -1,4 +1,4 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from django.contrib.admin.views.decorators import staff_member_required
 
 from oscar.core.application import Application
@@ -13,14 +13,14 @@ class DatacashDashboardApplication(Application):
     fraud_list_view = views.FraudResponseListView
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urlpatterns = [
             url(r'^transactions/$', self.list_view.as_view(),
                 name='datacash-transaction-list'),
             url(r'^transactions/(?P<pk>\d+)/$', self.detail_view.as_view(),
                 name='datacash-transaction-detail'),
             url(r'^fraud-responses/$', self.fraud_list_view.as_view(),
                 name='datacash-fraud-response-list'),
-        )
+        ]
         return self.post_process_urls(urlpatterns)
 
     def get_url_decorator(self, url_name):

datacash/migrations/0001_initial.py

@@ -1,53 +1,55 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.12 on 2018-04-07 10:30
+from __future__ import unicode_literals
 
-class Migration(SchemaMigration):
+from django.db import migrations, models
 
-    def forwards(self, orm):
-
-        # Adding model 'OrderTransaction'
-        db.create_table('datacash_ordertransaction', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('order_number', self.gf('django.db.models.fields.CharField')(max_length=128, db_index=True)),
-            ('method', self.gf('django.db.models.fields.CharField')(max_length=12)),
-            ('amount', self.gf('django.db.models.fields.DecimalField')(null=True, max_digits=12, decimal_places=2, blank=True)),
-            ('merchant_reference', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
-            ('datacash_reference', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
-            ('auth_code', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
-            ('status', self.gf('django.db.models.fields.PositiveIntegerField')()),
-            ('reason', self.gf('django.db.models.fields.CharField')(max_length=255)),
-            ('request_xml', self.gf('django.db.models.fields.TextField')()),
-            ('response_xml', self.gf('django.db.models.fields.TextField')()),
-            ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-        ))
-        db.send_create_signal('datacash', ['OrderTransaction'])
 
+class Migration(migrations.Migration):
 
-    def backwards(self, orm):
-
-        # Deleting model 'OrderTransaction'
-        db.delete_table('datacash_ordertransaction')
+    initial = True
 
+    dependencies = [
+    ]
 
-    models = {
-        'datacash.ordertransaction': {
-            'Meta': {'object_name': 'OrderTransaction'},
-            'amount': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '12', 'decimal_places': '2', 'blank': 'True'}),
-            'auth_code': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'datacash_reference': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'merchant_reference': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'method': ('django.db.models.fields.CharField', [], {'max_length': '12'}),
-            'order_number': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'}),
-            'reason': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'request_xml': ('django.db.models.fields.TextField', [], {}),
-            'response_xml': ('django.db.models.fields.TextField', [], {}),
-            'status': ('django.db.models.fields.PositiveIntegerField', [], {})
-        }
-    }
-
-    complete_apps = ['datacash']
+    operations = [
+        migrations.CreateModel(
+            name='FraudResponse',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('aggregator_identifier', models.CharField(blank=True, max_length=15)),
+                ('merchant_identifier', models.CharField(max_length=15)),
+                ('merchant_order_ref', models.CharField(db_index=True, max_length=250)),
+                ('t3m_id', models.CharField(db_index=True, max_length=128)),
+                ('score', models.IntegerField()),
+                ('recommendation', models.IntegerField()),
+                ('message_digest', models.CharField(blank=True, max_length=128)),
+                ('raw_response', models.TextField()),
+                ('date_created', models.DateTimeField(auto_now_add=True)),
+            ],
+            options={
+                'ordering': ('-date_created',),
+            },
+        ),
+        migrations.CreateModel(
+            name='OrderTransaction',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('order_number', models.CharField(db_index=True, max_length=128)),
+                ('method', models.CharField(max_length=12)),
+                ('amount', models.DecimalField(blank=True, decimal_places=2, max_digits=12, null=True)),
+                ('currency', models.CharField(default='GBP', max_length=12)),
+                ('merchant_reference', models.CharField(blank=True, max_length=128, null=True)),
+                ('datacash_reference', models.CharField(blank=True, max_length=128, null=True)),
+                ('auth_code', models.CharField(blank=True, max_length=128, null=True)),
+                ('status', models.PositiveIntegerField()),
+                ('reason', models.CharField(max_length=255)),
+                ('request_xml', models.TextField()),
+                ('response_xml', models.TextField()),
+                ('date_created', models.DateTimeField(auto_now_add=True)),
+            ],
+            options={
+                'ordering': ('-date_created',),
+            },
+        ),
+    ]

datacash/migrations/__init__.py

@@ -0,0 +1 @@
+

datacash/urls.py

@@ -5,7 +5,7 @@
 
 
 # Responses from the3rdman are posted back
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^the3rdman/', csrf_exempt(views.CallbackView.as_view()),
         name='datacash-3rdman-callback'),
-)
+]