Merge pull request #811 from xzzy/master

Fix store card error when card token already exists on user account and payment logging env

ledger/payments/bpoint/facade.py

@@ -189,6 +189,13 @@ def post_transaction(self, action,_type,sub_type,order_number=None,reference=Non
             raise
 
     def store_token(self, user,token,masked_card,expiry_date,card_type):
+
+        bt = BpointToken.objects.filter(user=user,masked_card=masked_card,expiry_date=datetime.datetime.strptime(expiry_date, '%m%y').date(),card_type=card_type)
+        if bt.count() > 0:
+            for b in bt:
+                b.delete()
+                print ("Existing store token exists for userid "+str(user.id)+".  Deleting Existing token to allow new token to be created")
+
         token,created = BpointToken.objects.get_or_create(
             user=user,
             DVToken=token,

ledger/settings_base.py

@@ -249,6 +249,16 @@
             'formatter': 'verbose',
             'maxBytes': 5242880
         },
+
+        'ledger_bpoint': {
+               'level': 'INFO',
+               'class': 'logging.handlers.RotatingFileHandler',
+               'filename': os.path.join(BASE_DIR, 'logs', 'ledger_bpoint.log'),
+               'formatter': 'verbose',
+               'maxBytes': 5242880
+         }
+
+
     },
     'loggers': {
         '': {
@@ -294,9 +304,14 @@
     }
 }
 PAYMENT_LOGGING=env('PAYMENT_LOGGING','False')
-if PAYMENT_LOGGING == 'True':
-   LOGGING = {'loggers': {'ledger_bpoint': { 'handlers': ['file'],'level': 'INFO', } }}
-   LOGGING = {'loggers': {'oscar.checkout': { 'handlers': ['file'],'level': 'INFO', } }}
+print ("LOGGING")
+print (PAYMENT_LOGGING)
+if PAYMENT_LOGGING == 'True' or PAYMENT_LOGGING is True:
+   LOGGING['loggers']['ledger_bpoint'] = { 'handlers': ['file'],'level': 'INFO', } 
+LOGGING['loggers']['oscar.checkout'] = { 'handlers': ['file'],'level': 'INFO', } 
+
+
+print (LOGGING)
 # django-dynamic-fields test generation settings
 DDF_FILL_NULLABLE_FIELDS = False