From c83aa8615ac1047012eb18dde4f4bd5b28b6ecfb Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Thu, 3 May 2012 10:58:08 -0700 Subject: [PATCH 1/2] Removing django-merchant dependency --- payment/integrations/__init__.py | 0 payment/integrations/fps_integration.py | 108 ------------------------ payment/urls.py | 10 --- payment/views.py | 51 ----------- test/campaign_starter.sql | 12 +-- 5 files changed, 6 insertions(+), 175 deletions(-) delete mode 100644 payment/integrations/__init__.py delete mode 100644 payment/integrations/fps_integration.py diff --git a/payment/integrations/__init__.py b/payment/integrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/payment/integrations/fps_integration.py b/payment/integrations/fps_integration.py deleted file mode 100644 index c04d7d5d..00000000 --- a/payment/integrations/fps_integration.py +++ /dev/null @@ -1,108 +0,0 @@ -""" -https://github.com/agiliq/merchant/blob/master/example/app/integrations/fps_integration.py -""" - -import billing -from billing.integrations.amazon_fps_integration import AmazonFpsIntegration as Integration -from django.core.urlresolvers import reverse -from django.http import HttpResponseRedirect, HttpResponse -import urlparse - -import logging -logger = logging.getLogger(__name__) - - -class FpsIntegration(Integration): - def transaction(self, request): - """Ideally at this method, you will check the - caller reference against a user id or uniquely - identifiable attribute (if you are already not - using it as the caller reference) and the type - of transaction (either pay, reserve etc). For - the sake of the example, we assume all the users - get charged $100""" - request_url = request.build_absolute_uri() - parsed_url = urlparse.urlparse(request_url) - query = parsed_url.query - - dd = dict(map(lambda x: x.split("="), query.split("&"))) - - logger.info("dd: {0}".format(dd)) - logger.info("self.fps_connection.host: {0}".format(self.fps_connection.host)) - -# dd: {'status': 'SC', 'signatureVersion': '2', -# 'tokenID': 'CLDITXQAX2DM82CT184S5CDNKYDXEPXETZ5QJFKB8AX4V9ZD34BGGJ6IDNFZDSUU', -# 'certificateUrl': 'https%3A%2F%2Ffps.sandbox.amazonaws.com%2Fcerts%2F090911%2FPKICert.pem%3FrequestId%3Dbjzj0zgbg2uf2j46a1iq123b9rwzl694mvpstlw1p5il426x7ap', -# 'expiry': '10%2F2017', 'signatureMethod': 'RSA-SHA1', 'callerReference': '5e0f7b0d-5cc5-4a55-a646-c6e420dd0f11', -# 'signature': 'Cc64A8DP7VclFBrhFEDXr2yhP8LaJpaLC6n%2F5oXiAhhD%2BnjJH9jQRhwPgB%2BuRvdcObMmZTD9we9G%0AvmEAkd5NkVULESdipsW%2B4i62mtD0DseuAtotMzjqObEeekzkaz4Vo0X9xcdlytLR04aEb4xqsLtg%0AJU%2Fysy7KStRivTqKzug%3D'} - - # need to act based on status - # getting status=SC, which doesn't seem to be in the documentation -- the docs say "SR": - # http://docs.amazonwebservices.com/AmazonFPS/latest/FPSAdvancedGuide/CBUIapiMerchant.html - # status = SC/SR, A, CE, NP, NM - - if dd.get('status') in ['SC', 'SR']: - # check to see whether we recognize this transaction -- correlate by callerReference - callerReference = dd.get('callerReference') - if callerReference is not None: - try: - trans = billing.models.AmazonFPSResponse.objects.get(callerReference=callerReference) - except billing.models.AmazonFPSResponse.DoesNotExist: - return HttpResponse('callerReference not recognized') - except Exception, e: - logger.exception("Error: {0}".format(e)) - return HttpResponse('Error: {0}'.format(e)) - else: - logger.warning('no callerReference included') - return HttpResponse('no callerReference included') - - try: - transactionAmount = trans.transactionAmount - # should also have stored in the database that this is a purchase.... - logger.info('transactionAmount: {0}; dd:{1}'.format(transactionAmount, dd)) - resp = self.purchase(transactionAmount, dd) - except Exception, e: - logger.exception("Error: {0}".format(e)) - return HttpResponse('Error: {0}'.format(e)) - - # resp: status representing the status and response representing the response as described by boto.fps.response.FPSResponse. - # mystery stuff with https://github.com/boto/boto/blob/develop/boto/resultset.py and - # https://github.com/boto/boto/blob/develop/boto/fps/response.py - - #In [17]: resp['response'].RequestId - #Out[17]: u'1f7b74a5-977a-4ffe-9436-d3c0203a6a85:0' - # - #In [18]: resp['response'].TransactionId - #Out[18]: u'16QVZ98TK48G3AK2QR1N1JJN8TLPE41R3NU' - # - #In [19]: resp['response'].TransactionStatus - #Out[19]: u'Pending' - # - #In [20]: resp['status'] - #Out[20]: u'Pending' - # - #In [21]: resp['response'].PayResult - #Out[21]: '' - # - #In [22]: resp['response'].PayResponse - #Out[22]: '' - # - #In [23]: resp['response'].connection - #Out[23]: FPSConnection:fps.sandbox.amazonaws.com - - # Now process the response - - trans.transactionId = resp['response'].TransactionId - trans.transactionStatus = resp['response'].TransactionStatus - trans.save() - - logger.debug("transactionId: {0}, transactionStatus: {1}".format(trans.transactionId, trans.transactionStatus )) - - - return HttpResponseRedirect("%s?status=%s" %(reverse("testfps"), - resp["status"])) - elif dd.get('status') == 'A': - return HttpResponse('You cancelled the transaction') - else: - return HttpResponse('An unexpected status code: {0}'.format(dd.get('status'))) - \ No newline at end of file diff --git a/payment/urls.py b/payment/urls.py index e16f42ae..82d32ccc 100644 --- a/payment/urls.py +++ b/payment/urls.py @@ -1,11 +1,6 @@ from django.conf.urls.defaults import * from django.conf import settings -# django-merchant integration -from billing import get_integration - -amazon_fps_obj = get_integration("fps", options={'host':'fps.sandbox.amazonaws.com'}) -fps_recur_obj = get_integration("fps", options={'host':'fps.sandbox.amazonaws.com'}) urlpatterns = patterns( "regluit.payment.views", @@ -34,10 +29,5 @@ if not settings.IS_PREVIEW: url(r"^testrefund", "testRefund"), url(r"^testmodify", "testModify"), ) - urlpatterns += patterns('', - (r'^fps/', include(amazon_fps_obj.urls)), - url(r'^testfps/$', 'regluit.payment.views.testfps', name='testfps'), - ) - \ No newline at end of file diff --git a/payment/views.py b/payment/views.py index 476fddc0..5fe977cf 100644 --- a/payment/views.py +++ b/payment/views.py @@ -15,8 +15,6 @@ from django.template import RequestContext from unittest import TestResult from regluit.payment.tests import PledgeTest, AuthorizeTest -from regluit.payment.urls import amazon_fps_obj, fps_recur_obj -import billing import uuid from decimal import Decimal as D @@ -324,54 +322,5 @@ def checkStatus(request): def _render(request, template, template_vars={}): return render_to_response(template, template_vars, RequestContext(request)) -def testfps(request): - url_scheme = "http" - if request.is_secure(): - url_scheme = "https" - - # generate a callerReference to use in our call - callerReference = str(uuid.uuid4()) - # model stores TransactionAmount as string! We won't be doing this in our long-term model - transactionAmount = str(D(100.00)) - - fields = {"transactionAmount": transactionAmount, - "pipelineName": "SingleUse", - "paymentReason": "Merchant Test", - "paymentPage": request.build_absolute_uri(), - "callerReference": callerReference, - "returnURL": "%s://%s%s" % (url_scheme, - RequestSite(request).domain, - reverse("fps_return_url")) - } - # Save the fps.fields["callerReference"] in the db along with - # the amount to be charged or use the user's unique id as - # the callerReference so that the amount to be charged is known - # Or save the callerReference in the session and send the user - # to FPS and then use the session value when the user is back. - amazon_fps_obj.add_fields(fields) - - # let's save this object to the model that django-merchant has set up for amazon transactions - # billing.models.AmazonFPSResponse.objects.all() - fps_transaction = billing.models.AmazonFPSResponse() - fps_transaction.transactionDate = now() - fps_transaction.transactionAmount = 100.00 - fps_transaction.callerReference = callerReference - - # force a calculation of the link_url so that callerReference gets calculated - logger.info("amazon_fps_obj.link_url: {0}".format(amazon_fps_obj.link_url)) - - fps_transaction.save() - - fields.update({"transactionAmount": "100", - "pipelineName": "Recurring", - "recurringPeriod": "1 Hour", - }) - fps_recur_obj.add_fields(fields) - - - template_vars = {'title': 'Amazon Flexible Payment Service', - "fps_recur_obj": fps_recur_obj, - "fps_obj": amazon_fps_obj} - return _render(request, 'amazon_fps.html', template_vars) \ No newline at end of file diff --git a/test/campaign_starter.sql b/test/campaign_starter.sql index db207bf5..63bc9ba2 100644 --- a/test/campaign_starter.sql +++ b/test/campaign_starter.sql @@ -1,8 +1,8 @@ --- MySQL dump 10.13 Distrib 5.1.61, for debian-linux-gnu (x86_64) +-- MySQL dump 10.13 Distrib 5.1.45, for apple-darwin10.2.0 (i386) -- -- Host: 127.0.0.1 Database: unglueit -- ------------------------------------------------------ --- Server version 5.1.61-0ubuntu0.11.04.1 +-- Server version 5.1.45 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -553,8 +553,8 @@ CREATE TABLE `core_campaign` ( `edition_id` int(11), PRIMARY KEY (`id`), KEY `core_campaign_50cafa73` (`work_id`), - KEY `core_campaign_e954ecc1` (`edition_id`), - CONSTRAINT `edition_id_refs_id_23032dca9b286186` FOREIGN KEY (`edition_id`) REFERENCES `core_edition` (`id`), + KEY `core_campaign_16ab133f` (`edition_id`), + CONSTRAINT `edition_id_refs_id_64d79e7a` FOREIGN KEY (`edition_id`) REFERENCES `core_edition` (`id`), CONSTRAINT `work_id_refs_id_fe13496` FOREIGN KEY (`work_id`) REFERENCES `core_work` (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=52 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1880,7 +1880,7 @@ CREATE TABLE `south_migrationhistory` ( LOCK TABLES `south_migrationhistory` WRITE; /*!40000 ALTER TABLE `south_migrationhistory` DISABLE KEYS */; -INSERT INTO `south_migrationhistory` VALUES (1,'core','0001_initial','2012-03-02 17:50:54'),(2,'core','0002_add_goodreads_id','2012-03-02 17:50:55'),(3,'core','0003_add_librarything_ids','2012-03-02 17:50:55'),(4,'core','0004_auto__add_field_campaign_status','2012-03-02 17:50:56'),(5,'core','0005_set_status','2012-03-02 17:50:56'),(6,'core','0006_wishes','2012-03-02 17:50:56'),(7,'core','0007_auto__add_field_wishes_created__add_field_wishes_source','2012-03-02 17:50:57'),(8,'core','0008_add_work_language_col','2012-03-02 17:50:58'),(9,'core','0009_add_work_language_data','2012-03-02 17:50:58'),(10,'core','0010_remove_edition_language','2012-03-02 17:50:58'),(11,'core','0011_auto__add_campaignaction__del_field_campaign_suspended_reason__del_fie','2012-03-02 17:50:59'),(12,'core','0012_auto__add_field_campaign_left','2012-03-02 17:51:00'),(13,'core','0013_move_subject_to_work','2012-03-02 17:51:01'),(14,'core','0015_auto__chg_field_subject_name__add_unique_subject_name','2012-03-02 17:51:01'),(15,'core','0016_auto__add_field_work_openlibrary_lookup','2012-03-02 17:51:02'),(16,'core','0017_isbn_to_13','2012-03-02 17:51:02'),(17,'core','0018_auto__del_field_edition_isbn_10','2012-03-02 17:51:02'),(18,'core','0019_googlebooks_id_must_be_unique','2012-03-02 17:51:02'),(19,'core','0020_auto__add_identifier__add_unique_identifier_type_value','2012-03-02 17:51:03'),(20,'core','0021_auto__del_field_work_librarything_id__del_field_work_openlibrary_id__d','2012-03-02 17:51:04'),(21,'core','0022_auto__chg_field_edition_publisher__chg_field_edition_publication_date','2012-03-02 17:51:05'),(22,'core','0023_auto__add_waswork','2012-03-02 17:51:05'),(23,'core','0024_auto__add_field_work_num_wishes','2012-03-02 17:51:06'),(24,'core','0025_count_wishes','2012-03-02 17:51:06'),(25,'core','0026_auto__add_field_ebook_user__add_field_waswork_moved__add_field_waswork','2012-03-02 17:51:08'),(26,'payment','0001_initial','2012-03-02 17:51:10'),(27,'payment','0002_auto__add_paymentresponse__del_field_transaction_reference__add_field_','2012-03-02 17:51:13'),(28,'payment','0003_auto__add_field_transaction_max_amount','2012-03-02 17:51:13'),(29,'payment','0004_auto__add_field_transaction_approved','2012-03-02 17:51:14'),(30,'tastypie','0001_initial','2012-03-02 17:51:14'),(31,'djcelery','0001_initial','2012-03-02 17:51:18'),(32,'payment','0005_auto__add_field_transaction_premium','2012-03-21 22:17:45'),(33,'core','0027_auto__add_field_campaign_license__chg_field_ebook_url','2012-03-28 15:24:25'),(34,'core','0028_auto__add_field_premium_limit','2012-03-28 15:24:25'),(35,'core','0029_https_facebook_avatars','2012-04-21 23:17:19'),(36,'core','0030_twitter_rewrite','2012-04-21 23:17:19'),(37,'payment','0006_auto__add_field_transaction_local_status__add_field_paymentresponse_st','2012-04-21 23:17:21'),(38,'core','0031_auto__add_field_campaign_edition','2012-05-03 01:22:41'); +INSERT INTO `south_migrationhistory` VALUES (1,'core','0001_initial','2012-03-02 17:50:54'),(2,'core','0002_add_goodreads_id','2012-03-02 17:50:55'),(3,'core','0003_add_librarything_ids','2012-03-02 17:50:55'),(4,'core','0004_auto__add_field_campaign_status','2012-03-02 17:50:56'),(5,'core','0005_set_status','2012-03-02 17:50:56'),(6,'core','0006_wishes','2012-03-02 17:50:56'),(7,'core','0007_auto__add_field_wishes_created__add_field_wishes_source','2012-03-02 17:50:57'),(8,'core','0008_add_work_language_col','2012-03-02 17:50:58'),(9,'core','0009_add_work_language_data','2012-03-02 17:50:58'),(10,'core','0010_remove_edition_language','2012-03-02 17:50:58'),(11,'core','0011_auto__add_campaignaction__del_field_campaign_suspended_reason__del_fie','2012-03-02 17:50:59'),(12,'core','0012_auto__add_field_campaign_left','2012-03-02 17:51:00'),(13,'core','0013_move_subject_to_work','2012-03-02 17:51:01'),(14,'core','0015_auto__chg_field_subject_name__add_unique_subject_name','2012-03-02 17:51:01'),(15,'core','0016_auto__add_field_work_openlibrary_lookup','2012-03-02 17:51:02'),(16,'core','0017_isbn_to_13','2012-03-02 17:51:02'),(17,'core','0018_auto__del_field_edition_isbn_10','2012-03-02 17:51:02'),(18,'core','0019_googlebooks_id_must_be_unique','2012-03-02 17:51:02'),(19,'core','0020_auto__add_identifier__add_unique_identifier_type_value','2012-03-02 17:51:03'),(20,'core','0021_auto__del_field_work_librarything_id__del_field_work_openlibrary_id__d','2012-03-02 17:51:04'),(21,'core','0022_auto__chg_field_edition_publisher__chg_field_edition_publication_date','2012-03-02 17:51:05'),(22,'core','0023_auto__add_waswork','2012-03-02 17:51:05'),(23,'core','0024_auto__add_field_work_num_wishes','2012-03-02 17:51:06'),(24,'core','0025_count_wishes','2012-03-02 17:51:06'),(25,'core','0026_auto__add_field_ebook_user__add_field_waswork_moved__add_field_waswork','2012-03-02 17:51:08'),(26,'payment','0001_initial','2012-03-02 17:51:10'),(27,'payment','0002_auto__add_paymentresponse__del_field_transaction_reference__add_field_','2012-03-02 17:51:13'),(28,'payment','0003_auto__add_field_transaction_max_amount','2012-03-02 17:51:13'),(29,'payment','0004_auto__add_field_transaction_approved','2012-03-02 17:51:14'),(30,'tastypie','0001_initial','2012-03-02 17:51:14'),(31,'djcelery','0001_initial','2012-03-02 17:51:18'),(32,'payment','0005_auto__add_field_transaction_premium','2012-03-21 22:17:45'),(33,'core','0027_auto__add_field_campaign_license__chg_field_ebook_url','2012-03-28 15:24:25'),(34,'core','0028_auto__add_field_premium_limit','2012-03-28 15:24:25'),(35,'core','0029_https_facebook_avatars','2012-04-21 23:17:19'),(36,'core','0030_twitter_rewrite','2012-04-21 23:17:19'),(37,'payment','0006_auto__add_field_transaction_local_status__add_field_paymentresponse_st','2012-04-21 23:17:21'),(38,'core','0031_auto__add_field_campaign_edition','2012-05-03 17:51:22'); /*!40000 ALTER TABLE `south_migrationhistory` ENABLE KEYS */; UNLOCK TABLES; @@ -1947,4 +1947,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2012-05-03 1:23:06 +-- Dump completed on 2012-05-03 10:51:35 From 3725094aea9c359a983c53f513aea90e6283e731 Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Thu, 3 May 2012 11:17:27 -0700 Subject: [PATCH 2/2] A few more steps needed to get rid of billing (aka django-merchant) --- settings/common.py | 1 - test/campaign_starter.sql | 228 ++------------------------------------ 2 files changed, 12 insertions(+), 217 deletions(-) diff --git a/settings/common.py b/settings/common.py index 3e469956..92f1a146 100644 --- a/settings/common.py +++ b/settings/common.py @@ -120,7 +120,6 @@ INSTALLED_APPS = ( 'regluit.frontend.templatetags', 'regluit.payment.templatetags', 'notification', - 'billing', # this must appear *after* django.frontend or else it overrides the # registration templates in frontend/templates/registration diff --git a/test/campaign_starter.sql b/test/campaign_starter.sql index 63bc9ba2..4e76ca1b 100644 --- a/test/campaign_starter.sql +++ b/test/campaign_starter.sql @@ -110,7 +110,7 @@ CREATE TABLE `auth_permission` ( UNIQUE KEY `content_type_id` (`content_type_id`,`codename`), KEY `auth_permission_1bb8f392` (`content_type_id`), CONSTRAINT `content_type_id_refs_id_728de91f` FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=167 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=155 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -119,7 +119,7 @@ CREATE TABLE `auth_permission` ( LOCK TABLES `auth_permission` WRITE; /*!40000 ALTER TABLE `auth_permission` DISABLE KEYS */; -INSERT INTO `auth_permission` VALUES (1,'Can add permission',1,'add_permission'),(2,'Can change permission',1,'change_permission'),(3,'Can delete permission',1,'delete_permission'),(4,'Can add group',2,'add_group'),(5,'Can change group',2,'change_group'),(6,'Can delete group',2,'delete_group'),(7,'Can add user',3,'add_user'),(8,'Can change user',3,'change_user'),(9,'Can delete user',3,'delete_user'),(10,'Can add message',4,'add_message'),(11,'Can change message',4,'change_message'),(12,'Can delete message',4,'delete_message'),(13,'Can add content type',5,'add_contenttype'),(14,'Can change content type',5,'change_contenttype'),(15,'Can delete content type',5,'delete_contenttype'),(16,'Can add session',6,'add_session'),(17,'Can change session',6,'change_session'),(18,'Can delete session',6,'delete_session'),(19,'Can add site',7,'add_site'),(20,'Can change site',7,'change_site'),(21,'Can delete site',7,'delete_site'),(22,'Can add comment',8,'add_comment'),(23,'Can change comment',8,'change_comment'),(24,'Can delete comment',8,'delete_comment'),(25,'Can moderate comments',8,'can_moderate'),(26,'Can add comment flag',9,'add_commentflag'),(27,'Can change comment flag',9,'change_commentflag'),(28,'Can delete comment flag',9,'delete_commentflag'),(29,'Can add migration history',10,'add_migrationhistory'),(30,'Can change migration history',10,'change_migrationhistory'),(31,'Can delete migration history',10,'delete_migrationhistory'),(32,'Can add registration profile',11,'add_registrationprofile'),(33,'Can change registration profile',11,'change_registrationprofile'),(34,'Can delete registration profile',11,'delete_registrationprofile'),(35,'Can add user social auth',12,'add_usersocialauth'),(36,'Can change user social auth',12,'change_usersocialauth'),(37,'Can delete user social auth',12,'delete_usersocialauth'),(38,'Can add nonce',13,'add_nonce'),(39,'Can change nonce',13,'change_nonce'),(40,'Can delete nonce',13,'delete_nonce'),(41,'Can add association',14,'add_association'),(42,'Can change association',14,'change_association'),(43,'Can delete association',14,'delete_association'),(44,'Can add log entry',15,'add_logentry'),(45,'Can change log entry',15,'change_logentry'),(46,'Can delete log entry',15,'delete_logentry'),(47,'Can add queue',16,'add_queue'),(48,'Can change queue',16,'change_queue'),(49,'Can delete queue',16,'delete_queue'),(50,'Can add message',17,'add_message'),(51,'Can change message',17,'change_message'),(52,'Can delete message',17,'delete_message'),(53,'Can add celery task',18,'add_celerytask'),(54,'Can change celery task',18,'change_celerytask'),(55,'Can delete celery task',18,'delete_celerytask'),(56,'Can add claim',19,'add_claim'),(57,'Can change claim',19,'change_claim'),(58,'Can delete claim',19,'delete_claim'),(59,'Can add rights holder',20,'add_rightsholder'),(60,'Can change rights holder',20,'change_rightsholder'),(61,'Can delete rights holder',20,'delete_rightsholder'),(62,'Can add premium',21,'add_premium'),(63,'Can change premium',21,'change_premium'),(64,'Can delete premium',21,'delete_premium'),(65,'Can add campaign action',22,'add_campaignaction'),(66,'Can change campaign action',22,'change_campaignaction'),(67,'Can delete campaign action',22,'delete_campaignaction'),(68,'Can add campaign',23,'add_campaign'),(69,'Can change campaign',23,'change_campaign'),(70,'Can delete campaign',23,'delete_campaign'),(71,'Can add identifier',24,'add_identifier'),(72,'Can change identifier',24,'change_identifier'),(73,'Can delete identifier',24,'delete_identifier'),(74,'Can add work',25,'add_work'),(75,'Can change work',25,'change_work'),(76,'Can delete work',25,'delete_work'),(77,'Can add author',26,'add_author'),(78,'Can change author',26,'change_author'),(79,'Can delete author',26,'delete_author'),(80,'Can add subject',27,'add_subject'),(81,'Can change subject',27,'change_subject'),(82,'Can delete subject',27,'delete_subject'),(83,'Can add edition',28,'add_edition'),(84,'Can change edition',28,'change_edition'),(85,'Can delete edition',28,'delete_edition'),(86,'Can add was work',29,'add_waswork'),(87,'Can change was work',29,'change_waswork'),(88,'Can delete was work',29,'delete_waswork'),(89,'Can add ebook',30,'add_ebook'),(90,'Can change ebook',30,'change_ebook'),(91,'Can delete ebook',30,'delete_ebook'),(92,'Can add wishlist',31,'add_wishlist'),(93,'Can change wishlist',31,'change_wishlist'),(94,'Can delete wishlist',31,'delete_wishlist'),(95,'Can add wishes',32,'add_wishes'),(96,'Can change wishes',32,'change_wishes'),(97,'Can delete wishes',32,'delete_wishes'),(98,'Can add user profile',33,'add_userprofile'),(99,'Can change user profile',33,'change_userprofile'),(100,'Can delete user profile',33,'delete_userprofile'),(101,'Can add transaction',34,'add_transaction'),(102,'Can change transaction',34,'change_transaction'),(103,'Can delete transaction',34,'delete_transaction'),(104,'Can add payment response',35,'add_paymentresponse'),(105,'Can change payment response',35,'change_paymentresponse'),(106,'Can delete payment response',35,'delete_paymentresponse'),(107,'Can add receiver',36,'add_receiver'),(108,'Can change receiver',36,'change_receiver'),(109,'Can delete receiver',36,'delete_receiver'),(110,'Can add api access',37,'add_apiaccess'),(111,'Can change api access',37,'change_apiaccess'),(112,'Can delete api access',37,'delete_apiaccess'),(113,'Can add api key',38,'add_apikey'),(114,'Can change api key',38,'change_apikey'),(115,'Can delete api key',38,'delete_apikey'),(116,'Can add task meta',39,'add_taskmeta'),(117,'Can change task meta',39,'change_taskmeta'),(118,'Can delete task meta',39,'delete_taskmeta'),(119,'Can add taskset meta',40,'add_tasksetmeta'),(120,'Can change taskset meta',40,'change_tasksetmeta'),(121,'Can delete taskset meta',40,'delete_tasksetmeta'),(122,'Can add interval',41,'add_intervalschedule'),(123,'Can change interval',41,'change_intervalschedule'),(124,'Can delete interval',41,'delete_intervalschedule'),(125,'Can add crontab',42,'add_crontabschedule'),(126,'Can change crontab',42,'change_crontabschedule'),(127,'Can delete crontab',42,'delete_crontabschedule'),(128,'Can add periodic tasks',43,'add_periodictasks'),(129,'Can change periodic tasks',43,'change_periodictasks'),(130,'Can delete periodic tasks',43,'delete_periodictasks'),(131,'Can add periodic task',44,'add_periodictask'),(132,'Can change periodic task',44,'change_periodictask'),(133,'Can delete periodic task',44,'delete_periodictask'),(134,'Can add worker',45,'add_workerstate'),(135,'Can change worker',45,'change_workerstate'),(136,'Can delete worker',45,'delete_workerstate'),(137,'Can add task',46,'add_taskstate'),(138,'Can change task',46,'change_taskstate'),(139,'Can delete task',46,'delete_taskstate'),(140,'Can add notice type',47,'add_noticetype'),(141,'Can change notice type',47,'change_noticetype'),(142,'Can delete notice type',47,'delete_noticetype'),(143,'Can add notice setting',48,'add_noticesetting'),(144,'Can change notice setting',48,'change_noticesetting'),(145,'Can delete notice setting',48,'delete_noticesetting'),(146,'Can add notice',49,'add_notice'),(147,'Can change notice',49,'change_notice'),(148,'Can delete notice',49,'delete_notice'),(149,'Can add notice queue batch',50,'add_noticequeuebatch'),(150,'Can change notice queue batch',50,'change_noticequeuebatch'),(151,'Can delete notice queue batch',50,'delete_noticequeuebatch'),(152,'Can add observed item',51,'add_observeditem'),(153,'Can change observed item',51,'change_observeditem'),(154,'Can delete observed item',51,'delete_observeditem'),(155,'Can add authorize aim response',52,'add_authorizeaimresponse'),(156,'Can change authorize aim response',52,'change_authorizeaimresponse'),(157,'Can delete authorize aim response',52,'delete_authorizeaimresponse'),(158,'Can add gc new order notification',53,'add_gcnewordernotification'),(159,'Can change gc new order notification',53,'change_gcnewordernotification'),(160,'Can delete gc new order notification',53,'delete_gcnewordernotification'),(161,'Can add world pay response',54,'add_worldpayresponse'),(162,'Can change world pay response',54,'change_worldpayresponse'),(163,'Can delete world pay response',54,'delete_worldpayresponse'),(164,'Can add amazon fps response',55,'add_amazonfpsresponse'),(165,'Can change amazon fps response',55,'change_amazonfpsresponse'),(166,'Can delete amazon fps response',55,'delete_amazonfpsresponse'); +INSERT INTO `auth_permission` VALUES (1,'Can add permission',1,'add_permission'),(2,'Can change permission',1,'change_permission'),(3,'Can delete permission',1,'delete_permission'),(4,'Can add group',2,'add_group'),(5,'Can change group',2,'change_group'),(6,'Can delete group',2,'delete_group'),(7,'Can add user',3,'add_user'),(8,'Can change user',3,'change_user'),(9,'Can delete user',3,'delete_user'),(10,'Can add message',4,'add_message'),(11,'Can change message',4,'change_message'),(12,'Can delete message',4,'delete_message'),(13,'Can add content type',5,'add_contenttype'),(14,'Can change content type',5,'change_contenttype'),(15,'Can delete content type',5,'delete_contenttype'),(16,'Can add session',6,'add_session'),(17,'Can change session',6,'change_session'),(18,'Can delete session',6,'delete_session'),(19,'Can add site',7,'add_site'),(20,'Can change site',7,'change_site'),(21,'Can delete site',7,'delete_site'),(22,'Can add comment',8,'add_comment'),(23,'Can change comment',8,'change_comment'),(24,'Can delete comment',8,'delete_comment'),(25,'Can moderate comments',8,'can_moderate'),(26,'Can add comment flag',9,'add_commentflag'),(27,'Can change comment flag',9,'change_commentflag'),(28,'Can delete comment flag',9,'delete_commentflag'),(29,'Can add migration history',10,'add_migrationhistory'),(30,'Can change migration history',10,'change_migrationhistory'),(31,'Can delete migration history',10,'delete_migrationhistory'),(32,'Can add registration profile',11,'add_registrationprofile'),(33,'Can change registration profile',11,'change_registrationprofile'),(34,'Can delete registration profile',11,'delete_registrationprofile'),(35,'Can add user social auth',12,'add_usersocialauth'),(36,'Can change user social auth',12,'change_usersocialauth'),(37,'Can delete user social auth',12,'delete_usersocialauth'),(38,'Can add nonce',13,'add_nonce'),(39,'Can change nonce',13,'change_nonce'),(40,'Can delete nonce',13,'delete_nonce'),(41,'Can add association',14,'add_association'),(42,'Can change association',14,'change_association'),(43,'Can delete association',14,'delete_association'),(44,'Can add log entry',15,'add_logentry'),(45,'Can change log entry',15,'change_logentry'),(46,'Can delete log entry',15,'delete_logentry'),(47,'Can add queue',16,'add_queue'),(48,'Can change queue',16,'change_queue'),(49,'Can delete queue',16,'delete_queue'),(50,'Can add message',17,'add_message'),(51,'Can change message',17,'change_message'),(52,'Can delete message',17,'delete_message'),(53,'Can add celery task',18,'add_celerytask'),(54,'Can change celery task',18,'change_celerytask'),(55,'Can delete celery task',18,'delete_celerytask'),(56,'Can add claim',19,'add_claim'),(57,'Can change claim',19,'change_claim'),(58,'Can delete claim',19,'delete_claim'),(59,'Can add rights holder',20,'add_rightsholder'),(60,'Can change rights holder',20,'change_rightsholder'),(61,'Can delete rights holder',20,'delete_rightsholder'),(62,'Can add premium',21,'add_premium'),(63,'Can change premium',21,'change_premium'),(64,'Can delete premium',21,'delete_premium'),(65,'Can add campaign action',22,'add_campaignaction'),(66,'Can change campaign action',22,'change_campaignaction'),(67,'Can delete campaign action',22,'delete_campaignaction'),(68,'Can add campaign',23,'add_campaign'),(69,'Can change campaign',23,'change_campaign'),(70,'Can delete campaign',23,'delete_campaign'),(71,'Can add identifier',24,'add_identifier'),(72,'Can change identifier',24,'change_identifier'),(73,'Can delete identifier',24,'delete_identifier'),(74,'Can add work',25,'add_work'),(75,'Can change work',25,'change_work'),(76,'Can delete work',25,'delete_work'),(77,'Can add author',26,'add_author'),(78,'Can change author',26,'change_author'),(79,'Can delete author',26,'delete_author'),(80,'Can add subject',27,'add_subject'),(81,'Can change subject',27,'change_subject'),(82,'Can delete subject',27,'delete_subject'),(83,'Can add edition',28,'add_edition'),(84,'Can change edition',28,'change_edition'),(85,'Can delete edition',28,'delete_edition'),(86,'Can add was work',29,'add_waswork'),(87,'Can change was work',29,'change_waswork'),(88,'Can delete was work',29,'delete_waswork'),(89,'Can add ebook',30,'add_ebook'),(90,'Can change ebook',30,'change_ebook'),(91,'Can delete ebook',30,'delete_ebook'),(92,'Can add wishlist',31,'add_wishlist'),(93,'Can change wishlist',31,'change_wishlist'),(94,'Can delete wishlist',31,'delete_wishlist'),(95,'Can add wishes',32,'add_wishes'),(96,'Can change wishes',32,'change_wishes'),(97,'Can delete wishes',32,'delete_wishes'),(98,'Can add user profile',33,'add_userprofile'),(99,'Can change user profile',33,'change_userprofile'),(100,'Can delete user profile',33,'delete_userprofile'),(101,'Can add transaction',34,'add_transaction'),(102,'Can change transaction',34,'change_transaction'),(103,'Can delete transaction',34,'delete_transaction'),(104,'Can add payment response',35,'add_paymentresponse'),(105,'Can change payment response',35,'change_paymentresponse'),(106,'Can delete payment response',35,'delete_paymentresponse'),(107,'Can add receiver',36,'add_receiver'),(108,'Can change receiver',36,'change_receiver'),(109,'Can delete receiver',36,'delete_receiver'),(110,'Can add api access',37,'add_apiaccess'),(111,'Can change api access',37,'change_apiaccess'),(112,'Can delete api access',37,'delete_apiaccess'),(113,'Can add api key',38,'add_apikey'),(114,'Can change api key',38,'change_apikey'),(115,'Can delete api key',38,'delete_apikey'),(116,'Can add task meta',39,'add_taskmeta'),(117,'Can change task meta',39,'change_taskmeta'),(118,'Can delete task meta',39,'delete_taskmeta'),(119,'Can add taskset meta',40,'add_tasksetmeta'),(120,'Can change taskset meta',40,'change_tasksetmeta'),(121,'Can delete taskset meta',40,'delete_tasksetmeta'),(122,'Can add interval',41,'add_intervalschedule'),(123,'Can change interval',41,'change_intervalschedule'),(124,'Can delete interval',41,'delete_intervalschedule'),(125,'Can add crontab',42,'add_crontabschedule'),(126,'Can change crontab',42,'change_crontabschedule'),(127,'Can delete crontab',42,'delete_crontabschedule'),(128,'Can add periodic tasks',43,'add_periodictasks'),(129,'Can change periodic tasks',43,'change_periodictasks'),(130,'Can delete periodic tasks',43,'delete_periodictasks'),(131,'Can add periodic task',44,'add_periodictask'),(132,'Can change periodic task',44,'change_periodictask'),(133,'Can delete periodic task',44,'delete_periodictask'),(134,'Can add worker',45,'add_workerstate'),(135,'Can change worker',45,'change_workerstate'),(136,'Can delete worker',45,'delete_workerstate'),(137,'Can add task',46,'add_taskstate'),(138,'Can change task',46,'change_taskstate'),(139,'Can delete task',46,'delete_taskstate'),(140,'Can add notice type',47,'add_noticetype'),(141,'Can change notice type',47,'change_noticetype'),(142,'Can delete notice type',47,'delete_noticetype'),(143,'Can add notice setting',48,'add_noticesetting'),(144,'Can change notice setting',48,'change_noticesetting'),(145,'Can delete notice setting',48,'delete_noticesetting'),(146,'Can add notice',49,'add_notice'),(147,'Can change notice',49,'change_notice'),(148,'Can delete notice',49,'delete_notice'),(149,'Can add notice queue batch',50,'add_noticequeuebatch'),(150,'Can change notice queue batch',50,'change_noticequeuebatch'),(151,'Can delete notice queue batch',50,'delete_noticequeuebatch'),(152,'Can add observed item',51,'add_observeditem'),(153,'Can change observed item',51,'change_observeditem'),(154,'Can delete observed item',51,'delete_observeditem'); /*!40000 ALTER TABLE `auth_permission` ENABLE KEYS */; UNLOCK TABLES; @@ -215,210 +215,6 @@ LOCK TABLES `auth_user_user_permissions` WRITE; /*!40000 ALTER TABLE `auth_user_user_permissions` ENABLE KEYS */; UNLOCK TABLES; --- --- Table structure for table `billing_amazonfpsresponse` --- - -DROP TABLE IF EXISTS `billing_amazonfpsresponse`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `billing_amazonfpsresponse` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `buyerEmail` varchar(75) NOT NULL, - `buyerName` varchar(75) NOT NULL, - `callerReference` varchar(100) NOT NULL, - `notificationType` varchar(50) NOT NULL, - `operation` varchar(20) NOT NULL, - `paymentMethod` varchar(5) NOT NULL, - `recipientEmail` varchar(75) NOT NULL, - `recipientName` varchar(75) NOT NULL, - `statusCode` varchar(50) NOT NULL, - `statusMessage` longtext NOT NULL, - `transactionAmount` varchar(20) NOT NULL, - `transactionDate` datetime NOT NULL, - `transactionId` varchar(50) NOT NULL, - `transactionStatus` varchar(50) NOT NULL, - PRIMARY KEY (`id`), - KEY `billing_amazonfpsresponse_513f581` (`transactionId`) -) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `billing_amazonfpsresponse` --- - -LOCK TABLES `billing_amazonfpsresponse` WRITE; -/*!40000 ALTER TABLE `billing_amazonfpsresponse` DISABLE KEYS */; -INSERT INTO `billing_amazonfpsresponse` VALUES (16,'','','f711058c-1f92-4087-9318-a00474fed2b1','','','','','','','','100.0','2012-04-16 22:20:06','16QV1KFOT5S9P8GS6MELDCDDKML41UIJ5AE','Pending'),(17,'','','34ebbf40-b192-4fae-9b27-ee41ba2b138a','','','','','','','','100.0','2012-04-16 22:20:53','',''),(18,'','','847e0b48-67eb-42b1-a6fe-d88e69a393fd','','','','','','','','100.0','2012-04-19 20:28:36','',''); -/*!40000 ALTER TABLE `billing_amazonfpsresponse` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `billing_authorizeaimresponse` --- - -DROP TABLE IF EXISTS `billing_authorizeaimresponse`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `billing_authorizeaimresponse` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `response_code` int(11) NOT NULL, - `response_reason_code` int(11) NOT NULL, - `response_reason_text` longtext NOT NULL, - `authorization_code` varchar(8) NOT NULL, - `address_verification_response` varchar(8) NOT NULL, - `transaction_id` varchar(64) NOT NULL, - `invoice_number` varchar(64) NOT NULL, - `description` varchar(255) NOT NULL, - `amount` decimal(16,2) NOT NULL, - `method` varchar(255) NOT NULL, - `transaction_type` varchar(255) NOT NULL, - `customer_id` varchar(64) NOT NULL, - `first_name` varchar(64) NOT NULL, - `last_name` varchar(64) NOT NULL, - `company` varchar(64) NOT NULL, - `address` varchar(64) NOT NULL, - `city` varchar(64) NOT NULL, - `state` varchar(64) NOT NULL, - `zip_code` varchar(64) NOT NULL, - `country` varchar(64) NOT NULL, - `phone` varchar(64) NOT NULL, - `fax` varchar(64) NOT NULL, - `email` varchar(75) NOT NULL, - `shipping_first_name` varchar(64) NOT NULL, - `shipping_last_name` varchar(64) NOT NULL, - `shipping_company` varchar(64) NOT NULL, - `shipping_address` varchar(64) NOT NULL, - `shipping_city` varchar(64) NOT NULL, - `shipping_state` varchar(64) NOT NULL, - `shipping_zip_code` varchar(64) NOT NULL, - `shipping_country` varchar(64) NOT NULL, - `card_code_response` varchar(8) NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `billing_authorizeaimresponse` --- - -LOCK TABLES `billing_authorizeaimresponse` WRITE; -/*!40000 ALTER TABLE `billing_authorizeaimresponse` DISABLE KEYS */; -/*!40000 ALTER TABLE `billing_authorizeaimresponse` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `billing_gcnewordernotification` --- - -DROP TABLE IF EXISTS `billing_gcnewordernotification`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `billing_gcnewordernotification` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `notify_type` varchar(255) NOT NULL, - `serial_number` varchar(255) NOT NULL, - `google_order_number` varchar(255) NOT NULL, - `buyer_id` varchar(255) NOT NULL, - `shipping_contact_name` varchar(255) NOT NULL, - `shipping_address1` varchar(255) NOT NULL, - `shipping_address2` varchar(255) NOT NULL, - `shipping_city` varchar(255) NOT NULL, - `shipping_postal_code` varchar(255) NOT NULL, - `shipping_region` varchar(255) NOT NULL, - `shipping_country_code` varchar(255) NOT NULL, - `shipping_email` varchar(75) NOT NULL, - `shipping_company_name` varchar(255) NOT NULL, - `shipping_fax` varchar(255) NOT NULL, - `shipping_phone` varchar(255) NOT NULL, - `billing_contact_name` varchar(255) NOT NULL, - `billing_address1` varchar(255) NOT NULL, - `billing_address2` varchar(255) NOT NULL, - `billing_city` varchar(255) NOT NULL, - `billing_postal_code` varchar(255) NOT NULL, - `billing_region` varchar(255) NOT NULL, - `billing_country_code` varchar(255) NOT NULL, - `billing_email` varchar(75) NOT NULL, - `billing_company_name` varchar(255) NOT NULL, - `billing_fax` varchar(255) NOT NULL, - `billing_phone` varchar(255) NOT NULL, - `marketing_email_allowed` tinyint(1) NOT NULL, - `num_cart_items` int(11) NOT NULL, - `cart_items` longtext NOT NULL, - `total_tax` decimal(16,2) DEFAULT NULL, - `total_tax_currency` varchar(255) NOT NULL, - `adjustment_total` decimal(16,2) DEFAULT NULL, - `adjustment_total_currency` varchar(255) NOT NULL, - `order_total` decimal(16,2) DEFAULT NULL, - `order_total_currency` varchar(255) NOT NULL, - `financial_order_state` varchar(255) NOT NULL, - `fulfillment_order_state` varchar(255) NOT NULL, - `timestamp` varchar(64) DEFAULT NULL, - `created_at` datetime NOT NULL, - `updated_at` datetime NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `billing_gcnewordernotification` --- - -LOCK TABLES `billing_gcnewordernotification` WRITE; -/*!40000 ALTER TABLE `billing_gcnewordernotification` DISABLE KEYS */; -/*!40000 ALTER TABLE `billing_gcnewordernotification` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `billing_worldpayresponse` --- - -DROP TABLE IF EXISTS `billing_worldpayresponse`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `billing_worldpayresponse` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `installation_id` varchar(64) NOT NULL, - `company_name` varchar(255) DEFAULT NULL, - `cart_id` varchar(255) NOT NULL, - `description` longtext NOT NULL, - `amount` decimal(16,2) NOT NULL, - `currency` varchar(64) NOT NULL, - `amount_string` varchar(64) NOT NULL, - `auth_mode` varchar(64) NOT NULL, - `test_mode` varchar(64) NOT NULL, - `transaction_id` varchar(64) NOT NULL, - `transaction_status` varchar(64) NOT NULL, - `transaction_time` varchar(64) NOT NULL, - `auth_amount` decimal(16,2) NOT NULL, - `auth_currency` varchar(64) NOT NULL, - `auth_amount_string` varchar(64) NOT NULL, - `raw_auth_message` varchar(255) NOT NULL, - `raw_auth_code` varchar(64) NOT NULL, - `name` varchar(255) NOT NULL, - `address` longtext NOT NULL, - `post_code` varchar(64) NOT NULL, - `country_code` varchar(64) NOT NULL, - `country` varchar(64) NOT NULL, - `phone` varchar(64) NOT NULL, - `fax` varchar(64) NOT NULL, - `email` varchar(75) NOT NULL, - `future_pay_id` varchar(64) NOT NULL, - `card_type` varchar(64) NOT NULL, - `ip_address` char(15) DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `billing_worldpayresponse` --- - -LOCK TABLES `billing_worldpayresponse` WRITE; -/*!40000 ALTER TABLE `billing_worldpayresponse` DISABLE KEYS */; -/*!40000 ALTER TABLE `billing_worldpayresponse` ENABLE KEYS */; -UNLOCK TABLES; - -- -- Table structure for table `celery_taskmeta` -- @@ -1174,7 +970,7 @@ CREATE TABLE `django_content_type` ( `model` varchar(100) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `app_label` (`app_label`,`model`) -) ENGINE=InnoDB AUTO_INCREMENT=56 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=52 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1183,7 +979,7 @@ CREATE TABLE `django_content_type` ( LOCK TABLES `django_content_type` WRITE; /*!40000 ALTER TABLE `django_content_type` DISABLE KEYS */; -INSERT INTO `django_content_type` VALUES (1,'permission','auth','permission'),(2,'group','auth','group'),(3,'user','auth','user'),(4,'message','auth','message'),(5,'content type','contenttypes','contenttype'),(6,'session','sessions','session'),(7,'site','sites','site'),(8,'comment','comments','comment'),(9,'comment flag','comments','commentflag'),(10,'migration history','south','migrationhistory'),(11,'registration profile','registration','registrationprofile'),(12,'user social auth','social_auth','usersocialauth'),(13,'nonce','social_auth','nonce'),(14,'association','social_auth','association'),(15,'log entry','admin','logentry'),(16,'queue','djkombu','queue'),(17,'message','djkombu','message'),(18,'celery task','core','celerytask'),(19,'claim','core','claim'),(20,'rights holder','core','rightsholder'),(21,'premium','core','premium'),(22,'campaign action','core','campaignaction'),(23,'campaign','core','campaign'),(24,'identifier','core','identifier'),(25,'work','core','work'),(26,'author','core','author'),(27,'subject','core','subject'),(28,'edition','core','edition'),(29,'was work','core','waswork'),(30,'ebook','core','ebook'),(31,'wishlist','core','wishlist'),(32,'wishes','core','wishes'),(33,'user profile','core','userprofile'),(34,'transaction','payment','transaction'),(35,'payment response','payment','paymentresponse'),(36,'receiver','payment','receiver'),(37,'api access','tastypie','apiaccess'),(38,'api key','tastypie','apikey'),(39,'task meta','djcelery','taskmeta'),(40,'taskset meta','djcelery','tasksetmeta'),(41,'interval','djcelery','intervalschedule'),(42,'crontab','djcelery','crontabschedule'),(43,'periodic tasks','djcelery','periodictasks'),(44,'periodic task','djcelery','periodictask'),(45,'worker','djcelery','workerstate'),(46,'task','djcelery','taskstate'),(47,'notice type','notification','noticetype'),(48,'notice setting','notification','noticesetting'),(49,'notice','notification','notice'),(50,'notice queue batch','notification','noticequeuebatch'),(51,'observed item','notification','observeditem'),(52,'authorize aim response','billing','authorizeaimresponse'),(53,'gc new order notification','billing','gcnewordernotification'),(54,'world pay response','billing','worldpayresponse'),(55,'amazon fps response','billing','amazonfpsresponse'); +INSERT INTO `django_content_type` VALUES (1,'permission','auth','permission'),(2,'group','auth','group'),(3,'user','auth','user'),(4,'message','auth','message'),(5,'content type','contenttypes','contenttype'),(6,'session','sessions','session'),(7,'site','sites','site'),(8,'comment','comments','comment'),(9,'comment flag','comments','commentflag'),(10,'migration history','south','migrationhistory'),(11,'registration profile','registration','registrationprofile'),(12,'user social auth','social_auth','usersocialauth'),(13,'nonce','social_auth','nonce'),(14,'association','social_auth','association'),(15,'log entry','admin','logentry'),(16,'queue','djkombu','queue'),(17,'message','djkombu','message'),(18,'celery task','core','celerytask'),(19,'claim','core','claim'),(20,'rights holder','core','rightsholder'),(21,'premium','core','premium'),(22,'campaign action','core','campaignaction'),(23,'campaign','core','campaign'),(24,'identifier','core','identifier'),(25,'work','core','work'),(26,'author','core','author'),(27,'subject','core','subject'),(28,'edition','core','edition'),(29,'was work','core','waswork'),(30,'ebook','core','ebook'),(31,'wishlist','core','wishlist'),(32,'wishes','core','wishes'),(33,'user profile','core','userprofile'),(34,'transaction','payment','transaction'),(35,'payment response','payment','paymentresponse'),(36,'receiver','payment','receiver'),(37,'api access','tastypie','apiaccess'),(38,'api key','tastypie','apikey'),(39,'task meta','djcelery','taskmeta'),(40,'taskset meta','djcelery','tasksetmeta'),(41,'interval','djcelery','intervalschedule'),(42,'crontab','djcelery','crontabschedule'),(43,'periodic tasks','djcelery','periodictasks'),(44,'periodic task','djcelery','periodictask'),(45,'worker','djcelery','workerstate'),(46,'task','djcelery','taskstate'),(47,'notice type','notification','noticetype'),(48,'notice setting','notification','noticesetting'),(49,'notice','notification','notice'),(50,'notice queue batch','notification','noticequeuebatch'),(51,'observed item','notification','observeditem'); /*!40000 ALTER TABLE `django_content_type` ENABLE KEYS */; UNLOCK TABLES; @@ -1209,7 +1005,7 @@ CREATE TABLE `django_session` ( LOCK TABLES `django_session` WRITE; /*!40000 ALTER TABLE `django_session` DISABLE KEYS */; -INSERT INTO `django_session` VALUES ('18fbcae31f97186e23df72668c871697','OTU5N2MyYWZlMGEyZjQwMDlhNzhlZjQ2NzQ4ODY0YzM1MTFhN2VjNzqAAn1xAShVBm9wZW5pZH1V\nDV9hdXRoX3VzZXJfaWRxAooBAlUec29jaWFsX2F1dGhfbGFzdF9sb2dpbl9iYWNrZW5kcQNVBmdv\nb2dsZXEEVQp0ZXN0Y29va2llVQZ3b3JrZWRVEl9hdXRoX3VzZXJfYmFja2VuZHEFVSlzb2NpYWxf\nYXV0aC5iYWNrZW5kcy5nb29nbGUuR29vZ2xlQmFja2VuZHEGdS4=\n','2012-03-16 13:22:05'),('2a5014c0ae1d8df35a7ba7894737898c','OTIyOTliMjkxYjQ2NDE3ZGZiNmFhNThhZDUxN2U0NmZiNWY1YjJjMzqAAn1xAShVBm9wZW5pZH1V\nDV9hdXRoX3VzZXJfaWRxAooBAVUec29jaWFsX2F1dGhfbGFzdF9sb2dpbl9iYWNrZW5kcQNVBmdv\nb2dsZXEEVQp0ZXN0Y29va2llVQZ3b3JrZWRVEl9hdXRoX3VzZXJfYmFja2VuZHEFVSlzb2NpYWxf\nYXV0aC5iYWNrZW5kcy5nb29nbGUuR29vZ2xlQmFja2VuZHEGdS4=\n','2012-03-16 13:17:24'),('d588298920bbe41b16ba73a0dd2d6f2a','OGIzMmE3NTU0NTViODBhYWEwZGNhZTlkMDkyZWE2MDAwN2FhYTgwNTqAAn1xAShVEl9hdXRoX3Vz\nZXJfYmFja2VuZHECVSlkamFuZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZHED\nVQ1fYXV0aF91c2VyX2lkcQSKAQN1Lg==\n','2012-03-27 19:14:27'); +INSERT INTO `django_session` VALUES ('18fbcae31f97186e23df72668c871697','OTU5N2MyYWZlMGEyZjQwMDlhNzhlZjQ2NzQ4ODY0YzM1MTFhN2VjNzqAAn1xAShVBm9wZW5pZH1V\nDV9hdXRoX3VzZXJfaWRxAooBAlUec29jaWFsX2F1dGhfbGFzdF9sb2dpbl9iYWNrZW5kcQNVBmdv\nb2dsZXEEVQp0ZXN0Y29va2llVQZ3b3JrZWRVEl9hdXRoX3VzZXJfYmFja2VuZHEFVSlzb2NpYWxf\nYXV0aC5iYWNrZW5kcy5nb29nbGUuR29vZ2xlQmFja2VuZHEGdS4=\n','2012-03-16 13:22:05'),('2a5014c0ae1d8df35a7ba7894737898c','OTIyOTliMjkxYjQ2NDE3ZGZiNmFhNThhZDUxN2U0NmZiNWY1YjJjMzqAAn1xAShVBm9wZW5pZH1V\nDV9hdXRoX3VzZXJfaWRxAooBAVUec29jaWFsX2F1dGhfbGFzdF9sb2dpbl9iYWNrZW5kcQNVBmdv\nb2dsZXEEVQp0ZXN0Y29va2llVQZ3b3JrZWRVEl9hdXRoX3VzZXJfYmFja2VuZHEFVSlzb2NpYWxf\nYXV0aC5iYWNrZW5kcy5nb29nbGUuR29vZ2xlQmFja2VuZHEGdS4=\n','2012-03-16 13:17:24'),('b5529b6ff89dd2e5662a34eb3b134085','MTEyNjAwNGQxNjY0YTY3ODI5N2UxODk0M2M2NmY4Y2Q2ODJiNDJkNDqAAn1xAS4=\n','2012-05-17 14:12:51'),('d588298920bbe41b16ba73a0dd2d6f2a','OGIzMmE3NTU0NTViODBhYWEwZGNhZTlkMDkyZWE2MDAwN2FhYTgwNTqAAn1xAShVEl9hdXRoX3Vz\nZXJfYmFja2VuZHECVSlkamFuZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZHED\nVQ1fYXV0aF91c2VyX2lkcQSKAQN1Lg==\n','2012-03-27 19:14:27'); /*!40000 ALTER TABLE `django_session` ENABLE KEYS */; UNLOCK TABLES; @@ -1580,7 +1376,7 @@ CREATE TABLE `notification_noticetype` ( `description` varchar(100) NOT NULL, `default` int(11) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1589,7 +1385,7 @@ CREATE TABLE `notification_noticetype` ( LOCK TABLES `notification_noticetype` WRITE; /*!40000 ALTER TABLE `notification_noticetype` DISABLE KEYS */; -INSERT INTO `notification_noticetype` VALUES (1,'wishlist_comment','Wishlist Comment','A comment has been received on one of your wishlist books.',1),(2,'comment_on_commented','Comment on Commented Work','A comment has been received on a book that you\'ve commented on.',2),(3,'successful_campaign','Successful Campaign','a campaign that you have supported or followed has succeeded',2),(4,'active_campaign','New Campaign','a book you\'ve wishlisted has a newly launched campaign',2),(5,'wishlist_work_claimed','Rights Holder is Active','A rights holder has shown up for a book that you want unglued.',1),(6,'wishlist_active','New Campaign','A book you\'ve wishlisted has a newly launched campaign.',2),(7,'wishlist_near_target','Campaign Near Target','A book you want is near its ungluing target.',2),(8,'wishlist_near_deadline','Campaign Near Deadline','A book you want is almost out of time.',2),(9,'wishlist_premium_limited_supply','Only a Few Premiums Left','A limited edition premium is running out on a book you like.',2),(10,'wishlist_successful','Successful Campaign','An ungluing campaign that you have supported or followed has succeeded.',2),(11,'wishlist_unsuccessful','Unsuccessful Campaign','An ungluing campaign that you supported didn\'t succeed this time.',2),(12,'wishlist_updated','Campaign Updated','An ungluing campaign you support has been updated.',1),(13,'wishlist_message','Campaign Communication','There\'s a message about an ungluing campaign you\'re interested in.',2),(14,'wishlist_price_drop','Campaign Price Drop','An ungluing campaign you\'re interested in has a reduced target.',1),(15,'wishlist_unglued_book_released','Unglued Book!','A book you wanted is now available to be downloaded.\'',2),(16,'pledge_you_have_pledged','Thanks For Your Pledge!','Your ungluing pledge has been entered.',2),(17,'pledge_status_change','Your Pledge Has Been Modified','Your ungluing plegde has been modified.',2),(18,'pledge_charged','Your Pledge has been Executed','You have contributed to a successful ungluing campaign.',2),(19,'rights_holder_created','Agreement Accepted','You become a verified Unglue.it rights holder.',2),(20,'rights_holder_claim_approved','Claim Accepted','A claim you\'ve entered has been accepted.',2); +INSERT INTO `notification_noticetype` VALUES (1,'wishlist_comment','Wishlist Comment','A comment has been received on one of your wishlist books.',1),(2,'comment_on_commented','Comment on Commented Work','A comment has been received on a book that you\'ve commented on.',2),(3,'wishlist_work_claimed','Rights Holder is Active','A rights holder has shown up for a book that you want unglued.',1),(4,'wishlist_active','New Campaign','A book you\'ve wishlisted has a newly launched campaign.',2),(5,'wishlist_near_target','Campaign Near Target','A book you want is near its ungluing target.',2),(6,'wishlist_near_deadline','Campaign Near Deadline','A book you want is almost out of time.',2),(7,'wishlist_premium_limited_supply','Only a Few Premiums Left','A limited edition premium is running out on a book you like.',2),(8,'wishlist_successful','Successful Campaign','An ungluing campaign that you have supported or followed has succeeded.',2),(9,'wishlist_unsuccessful','Unsuccessful Campaign','An ungluing campaign that you supported didn\'t succeed this time.',2),(10,'wishlist_updated','Campaign Updated','An ungluing campaign you support has been updated.',1),(11,'wishlist_message','Campaign Communication','There\'s a message about an ungluing campaign you\'re interested in.',2),(12,'wishlist_price_drop','Campaign Price Drop','An ungluing campaign you\'re interested in has a reduced target.',1),(13,'wishlist_unglued_book_released','Unglued Book!','A book you wanted is now available to be downloaded.\'',2),(14,'pledge_you_have_pledged','Thanks For Your Pledge!','Your ungluing pledge has been entered.',2),(15,'pledge_status_change','Your Pledge Has Been Modified','Your ungluing plegde has been modified.',2),(16,'pledge_charged','Your Pledge has been Executed','You have contributed to a successful ungluing campaign.',2),(17,'rights_holder_created','Agreement Accepted','You become a verified Unglue.it rights holder.',2),(18,'rights_holder_claim_approved','Claim Accepted','A claim you\'ve entered has been accepted.',2); /*!40000 ALTER TABLE `notification_noticetype` ENABLE KEYS */; UNLOCK TABLES; @@ -1641,7 +1437,7 @@ CREATE TABLE `payment_paymentresponse` ( `timestamp` varchar(128) DEFAULT NULL, `info` varchar(1024) DEFAULT NULL, `transaction_id` int(11) NOT NULL, - `status` varchar(32) DEFAULT NULL, + `status` varchar(32), PRIMARY KEY (`id`), KEY `payment_paymentresponse_45d19ab3` (`transaction_id`), CONSTRAINT `transaction_id_refs_id_1f406d1c` FOREIGN KEY (`transaction_id`) REFERENCES `payment_transaction` (`id`) @@ -1674,7 +1470,7 @@ CREATE TABLE `payment_receiver` ( `primary` tinyint(1) NOT NULL DEFAULT '0', `txn_id` varchar(64) NOT NULL, `transaction_id` int(11) NOT NULL, - `local_status` varchar(64) DEFAULT NULL, + `local_status` varchar(64), PRIMARY KEY (`id`), KEY `payment_receiver_45d19ab3` (`transaction_id`), CONSTRAINT `transaction_id_refs_id_5b0405ed` FOREIGN KEY (`transaction_id`) REFERENCES `payment_transaction` (`id`) @@ -1724,7 +1520,7 @@ CREATE TABLE `payment_transaction` ( `max_amount` decimal(14,2) NOT NULL, `approved` tinyint(1) DEFAULT NULL, `premium_id` int(11) DEFAULT NULL, - `local_status` varchar(32) DEFAULT NULL, + `local_status` varchar(32), PRIMARY KEY (`id`), KEY `payment_transaction_403f60f` (`user_id`), KEY `payment_transaction_702b94e6` (`campaign_id`), @@ -1880,7 +1676,7 @@ CREATE TABLE `south_migrationhistory` ( LOCK TABLES `south_migrationhistory` WRITE; /*!40000 ALTER TABLE `south_migrationhistory` DISABLE KEYS */; -INSERT INTO `south_migrationhistory` VALUES (1,'core','0001_initial','2012-03-02 17:50:54'),(2,'core','0002_add_goodreads_id','2012-03-02 17:50:55'),(3,'core','0003_add_librarything_ids','2012-03-02 17:50:55'),(4,'core','0004_auto__add_field_campaign_status','2012-03-02 17:50:56'),(5,'core','0005_set_status','2012-03-02 17:50:56'),(6,'core','0006_wishes','2012-03-02 17:50:56'),(7,'core','0007_auto__add_field_wishes_created__add_field_wishes_source','2012-03-02 17:50:57'),(8,'core','0008_add_work_language_col','2012-03-02 17:50:58'),(9,'core','0009_add_work_language_data','2012-03-02 17:50:58'),(10,'core','0010_remove_edition_language','2012-03-02 17:50:58'),(11,'core','0011_auto__add_campaignaction__del_field_campaign_suspended_reason__del_fie','2012-03-02 17:50:59'),(12,'core','0012_auto__add_field_campaign_left','2012-03-02 17:51:00'),(13,'core','0013_move_subject_to_work','2012-03-02 17:51:01'),(14,'core','0015_auto__chg_field_subject_name__add_unique_subject_name','2012-03-02 17:51:01'),(15,'core','0016_auto__add_field_work_openlibrary_lookup','2012-03-02 17:51:02'),(16,'core','0017_isbn_to_13','2012-03-02 17:51:02'),(17,'core','0018_auto__del_field_edition_isbn_10','2012-03-02 17:51:02'),(18,'core','0019_googlebooks_id_must_be_unique','2012-03-02 17:51:02'),(19,'core','0020_auto__add_identifier__add_unique_identifier_type_value','2012-03-02 17:51:03'),(20,'core','0021_auto__del_field_work_librarything_id__del_field_work_openlibrary_id__d','2012-03-02 17:51:04'),(21,'core','0022_auto__chg_field_edition_publisher__chg_field_edition_publication_date','2012-03-02 17:51:05'),(22,'core','0023_auto__add_waswork','2012-03-02 17:51:05'),(23,'core','0024_auto__add_field_work_num_wishes','2012-03-02 17:51:06'),(24,'core','0025_count_wishes','2012-03-02 17:51:06'),(25,'core','0026_auto__add_field_ebook_user__add_field_waswork_moved__add_field_waswork','2012-03-02 17:51:08'),(26,'payment','0001_initial','2012-03-02 17:51:10'),(27,'payment','0002_auto__add_paymentresponse__del_field_transaction_reference__add_field_','2012-03-02 17:51:13'),(28,'payment','0003_auto__add_field_transaction_max_amount','2012-03-02 17:51:13'),(29,'payment','0004_auto__add_field_transaction_approved','2012-03-02 17:51:14'),(30,'tastypie','0001_initial','2012-03-02 17:51:14'),(31,'djcelery','0001_initial','2012-03-02 17:51:18'),(32,'payment','0005_auto__add_field_transaction_premium','2012-03-21 22:17:45'),(33,'core','0027_auto__add_field_campaign_license__chg_field_ebook_url','2012-03-28 15:24:25'),(34,'core','0028_auto__add_field_premium_limit','2012-03-28 15:24:25'),(35,'core','0029_https_facebook_avatars','2012-04-21 23:17:19'),(36,'core','0030_twitter_rewrite','2012-04-21 23:17:19'),(37,'payment','0006_auto__add_field_transaction_local_status__add_field_paymentresponse_st','2012-04-21 23:17:21'),(38,'core','0031_auto__add_field_campaign_edition','2012-05-03 17:51:22'); +INSERT INTO `south_migrationhistory` VALUES (1,'core','0001_initial','2012-03-02 17:50:54'),(2,'core','0002_add_goodreads_id','2012-03-02 17:50:55'),(3,'core','0003_add_librarything_ids','2012-03-02 17:50:55'),(4,'core','0004_auto__add_field_campaign_status','2012-03-02 17:50:56'),(5,'core','0005_set_status','2012-03-02 17:50:56'),(6,'core','0006_wishes','2012-03-02 17:50:56'),(7,'core','0007_auto__add_field_wishes_created__add_field_wishes_source','2012-03-02 17:50:57'),(8,'core','0008_add_work_language_col','2012-03-02 17:50:58'),(9,'core','0009_add_work_language_data','2012-03-02 17:50:58'),(10,'core','0010_remove_edition_language','2012-03-02 17:50:58'),(11,'core','0011_auto__add_campaignaction__del_field_campaign_suspended_reason__del_fie','2012-03-02 17:50:59'),(12,'core','0012_auto__add_field_campaign_left','2012-03-02 17:51:00'),(13,'core','0013_move_subject_to_work','2012-03-02 17:51:01'),(14,'core','0015_auto__chg_field_subject_name__add_unique_subject_name','2012-03-02 17:51:01'),(15,'core','0016_auto__add_field_work_openlibrary_lookup','2012-03-02 17:51:02'),(16,'core','0017_isbn_to_13','2012-03-02 17:51:02'),(17,'core','0018_auto__del_field_edition_isbn_10','2012-03-02 17:51:02'),(18,'core','0019_googlebooks_id_must_be_unique','2012-03-02 17:51:02'),(19,'core','0020_auto__add_identifier__add_unique_identifier_type_value','2012-03-02 17:51:03'),(20,'core','0021_auto__del_field_work_librarything_id__del_field_work_openlibrary_id__d','2012-03-02 17:51:04'),(21,'core','0022_auto__chg_field_edition_publisher__chg_field_edition_publication_date','2012-03-02 17:51:05'),(22,'core','0023_auto__add_waswork','2012-03-02 17:51:05'),(23,'core','0024_auto__add_field_work_num_wishes','2012-03-02 17:51:06'),(24,'core','0025_count_wishes','2012-03-02 17:51:06'),(25,'core','0026_auto__add_field_ebook_user__add_field_waswork_moved__add_field_waswork','2012-03-02 17:51:08'),(26,'payment','0001_initial','2012-03-02 17:51:10'),(27,'payment','0002_auto__add_paymentresponse__del_field_transaction_reference__add_field_','2012-03-02 17:51:13'),(28,'payment','0003_auto__add_field_transaction_max_amount','2012-03-02 17:51:13'),(29,'payment','0004_auto__add_field_transaction_approved','2012-03-02 17:51:14'),(30,'tastypie','0001_initial','2012-03-02 17:51:14'),(31,'djcelery','0001_initial','2012-03-02 17:51:18'),(32,'payment','0005_auto__add_field_transaction_premium','2012-03-21 22:17:45'),(33,'core','0027_auto__add_field_campaign_license__chg_field_ebook_url','2012-03-28 15:24:25'),(34,'core','0028_auto__add_field_premium_limit','2012-03-28 15:24:25'),(35,'core','0029_https_facebook_avatars','2012-05-03 18:11:34'),(36,'core','0030_twitter_rewrite','2012-05-03 18:11:34'),(37,'core','0031_auto__add_field_campaign_edition','2012-05-03 18:11:35'),(38,'payment','0006_auto__add_field_transaction_local_status__add_field_paymentresponse_st','2012-05-03 18:11:36'); /*!40000 ALTER TABLE `south_migrationhistory` ENABLE KEYS */; UNLOCK TABLES; @@ -1947,4 +1743,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2012-05-03 10:51:35 +-- Dump completed on 2012-05-03 11:13:35