Added support for new features:

- Pending transactions (through the `payment_pending` signal)
- Monero

Author: CryptAPI

README.md

@@ -87,8 +87,8 @@ Where:
 
 ``request`` is Django's view HttpRequest object  
 ``order_id`` is just your order id  
-``coin`` is the coin you wish to use, can be one of: ``['btc', 'eth', 'bch', 'ltc', 'iota']`` and you need to have a ``Provider`` set up for that coin.  
-``value`` is an integer of the value of your order, either in satoshi, litoshi, wei or IOTA
+``coin`` is the coin you wish to use, can be one of: ``['btc', 'eth', 'bch', 'ltc', 'xmr', 'iota']`` and you need to have a ``Provider`` set up for that coin.  
+``value`` is an integer of the value of your order, either in satoshi, litoshi, wei, piconero or IOTA
 
 
 ### Getting notified when the user pays
@@ -122,7 +122,7 @@ This library has a couple of helpers to help you get started
 There's also some template tags which you can import to help you with conversions and the protocols.
 You just need to load ``cryptapi_helper`` on your template and use the following tags / filters:  
 
-``{% convert_value coin value %}`` where the coin is one of ``['btc', 'eth', 'bch', 'ltc', 'iota']`` and the value is the value in satoshi, litoshi, wei or IOTA, will convert to the main coin denomination.  
+``{% convert_value coin value %}`` where the coin is one of ``['btc', 'eth', 'bch', 'ltc', 'xmr', 'iota']`` and the value is the value in satoshi, litoshi, wei or IOTA, will convert to the main coin denomination.  
 
 
 ``{{ coin|coin_name }}`` will output the properly formatted cryptocurrency name  

cryptapi/choices.py

@@ -7,11 +7,13 @@
     ('bch', 'Bitcoin Cash'),
     ('ltc', 'Litecoin'),
     ('iota', 'IOTA'),
+    ('xmr', 'Monero'),
 )
 
 
 STATUS = (
     ('created', _('Created')),
+    ('pending', _('Pending')),
     ('insufficient', _('Payment Insufficient')),
     ('received', _('Received')),
     ('done', _('Done')),
@@ -24,4 +26,5 @@
     'ltc': 100000000,
     'eth': 1000000000000000000,
     'iota': 1000000,
+    'xmr': 1000000000000,
 }

cryptapi/dispatchers.py

@@ -1,16 +1,17 @@
 
 class CallbackDispatcher:
 
-    def __init__(self, coin, request, payment, raw_data):
+    def __init__(self, coin, request, payment, raw_data, pending=False):
         self.coin = coin
         self.request = request
         self.payment = payment
         self.raw_data = raw_data
+        self.pending = pending
 
     def callback(self):
 
         from cryptapi.models import Request, PaymentLog
-        from cryptapi.signals import payment_received, payment_complete
+        from cryptapi.signals import payment_received, payment_complete, payment_pending
 
         try:
             request = Request.objects.get(
@@ -21,10 +22,23 @@ def callback(self):
 
             payment, created = request.payment_set.get_or_create(txid_in__iexact=self.payment['txid_in'])
 
-            if created:
-                [setattr(payment, k, v) for k, v in self.payment.items()]
+            [setattr(payment, k, v) for k, v in self.payment.items()]
+
+            payment.pending = self.pending
+            payment.save()
 
-                payment.save()
+            if self.pending:
+                payment_pending.send_robust(
+                    sender=self.__class__,
+                    order_id=request.order_id,
+                    payment=payment,
+                    value=self.payment['value_paid']
+                )
+
+                request.status = 'pending'
+                request.save()
+
+            else:
 
                 # Notify payment received
                 payment_received.send_robust(
@@ -39,7 +53,7 @@ def callback(self):
                     total_received = self.payment['value_paid']
 
                     if total_received < request.value_requested:
-                        total_received_list = request.payment_set.all().values_list('value_paid', flat=True)
+                        total_received_list = request.payment_set.filter(pending=False).values_list('value_paid', flat=True)
                         total_received = sum(total_received_list)
 
                     if total_received < request.value_requested:
@@ -57,16 +71,16 @@ def callback(self):
 
                     request.save()
 
-                pl = PaymentLog(
-                    payment=payment,
-                    raw_data=self.raw_data
-                )
+            pl = PaymentLog(
+                payment=payment,
+                raw_data=self.raw_data
+            )
 
-                pl.save()
+            pl.save()
 
-                if request.status in ['received']:
-                    request.status = 'done'
-                    request.save()
+            if request.status in ['received']:
+                request.status = 'done'
+                request.save()
 
             return True
 
@@ -110,7 +124,8 @@ def address(self):
 
                 params = {
                     'callback': cb_url,
-                    'address': provider.cold_wallet
+                    'address': provider.cold_wallet,
+                    'pending': 1,
                 }
 
                 raw_response = process_request(self.coin, 'create', params)

cryptapi/forms.py

@@ -2,7 +2,7 @@
 from .choices import COINS
 
 
-class CallbackForm(forms.Form):
+class BaseCallbackForm(forms.Form):
 
     # Request data
     request_id = forms.IntegerField()
@@ -13,9 +13,13 @@ class CallbackForm(forms.Form):
 
     # Payment data
     txid_in = forms.CharField(max_length=256)
-    txid_out = forms.CharField(max_length=256)
     confirmations = forms.IntegerField()
     value = forms.DecimalField(max_digits=65, decimal_places=0)
+
+
+class CallbackForm(BaseCallbackForm):
+    # Payment data
+    txid_out = forms.CharField(max_length=256)
     value_forwarded = forms.DecimalField(max_digits=65, decimal_places=0)
 
 

cryptapi/meta.py

@@ -1,4 +1,4 @@
 from distutils.version import StrictVersion
 
 
-VERSION = StrictVersion('0.1.2')
+VERSION = StrictVersion('0.1.3')

cryptapi/models.py

@@ -37,6 +37,7 @@ class Payment(models.Model):
     value_received = models.DecimalField(_('Value Received'), default=0, max_digits=65, decimal_places=0)
     txid_in = models.CharField(_('TXID in'), max_length=256, default='')
     txid_out = models.CharField(_('TXID out'), max_length=256, default='')
+    pending = models.BooleanField(default=True)
     confirmations = models.IntegerField(default=0)
     timestamp = models.DateTimeField(auto_now_add=True)
 
@@ -59,4 +60,4 @@ class PaymentLog(models.Model):
     timestamp = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
-        return "#{} ({})".format(self.payment_id, self.timestamp.strftime('%x %X'))
+        return "#{} ({})".format(self.payment_id, self.timestamp.strftime('%x %X'))

cryptapi/signals.py

@@ -1,4 +1,5 @@
 from django.dispatch import Signal
 
+payment_pending = Signal(providing_args=['order_id', 'payment', 'value'])
 payment_received = Signal(providing_args=['order_id', 'payment', 'value'])
 payment_complete = Signal(providing_args=['order_id', 'payment', 'value'])

cryptapi/views.py

@@ -1,12 +1,17 @@
 import json
 from django.http import HttpResponse
-from cryptapi.forms import CallbackForm
+from cryptapi.forms import CallbackForm, BaseCallbackForm
 from cryptapi.dispatchers import CallbackDispatcher
 
 
 def callback(_r):
 
-    form = CallbackForm(data=_r.GET)
+    pending = _r.GET.get('pending', False)
+
+    if not pending:
+        form = CallbackForm(data=_r.GET)
+    else:
+        form = BaseCallbackForm(data=_r.GET)
 
     if form.is_valid():
 
@@ -23,15 +28,17 @@ def callback(_r):
         # Payment data
         payment = {
             'txid_in': form.cleaned_data.get('txid_in'),
-            'txid_out': form.cleaned_data.get('txid_out'),
             'value_paid': form.cleaned_data.get('value'),
-            'value_received': form.cleaned_data.get('value_forwarded'),
             'confirmations': form.cleaned_data.get('confirmations'),
         }
 
+        if not pending:
+            payment['txid_out'] = form.cleaned_data.get('txid_out')
+            payment['value_received'] = form.cleaned_data.get('value_forwarded')
+
         raw_data = json.dumps(_r.GET)
 
-        dispatcher = CallbackDispatcher(coin, request, payment, raw_data)
+        dispatcher = CallbackDispatcher(coin, request, payment, raw_data, pending=pending)
 
         if dispatcher.callback():
             return HttpResponse('*ok*')