v1.0.3

- Minor fixes
- Signals now use the value_coin
- Removed deprecated fields from the payment model

Author: arianoangelo

README.md

@@ -287,4 +287,9 @@ Contact us @ https://blockbee.io/contacts/
 * UI Improvements
 
 #### 1.0.2
-* Minor fixes
+* Minor fixes
+
+#### 1.0.3
+* Minor fixes
+* Signals now use the value_coin
+* Removed deprecated fields from the payment model

blockbee/dispatchers.py

@@ -1,5 +1,4 @@
 class CallbackDispatcher:
-
     def __init__(self, coin, request, payment, raw_data, result=None):
         self.coin = coin
         self._request = request
@@ -32,7 +31,7 @@ def callback(self):
                     sender=self.__class__,
                     order_id=request.order_id,
                     payment=payment,
-                    value=self.payment['value_paid']
+                    value=self.payment['value_paid_coin']
                 )
 
                 request.status = 'pending'
@@ -45,12 +44,12 @@ def callback(self):
                     sender=self.__class__,
                     order_id=request.order_id,
                     payment=payment,
-                    value=self.payment['value_paid']
+                    value=self.payment['value_paid_coin']
                 )
 
                 if request.status not in ['received', 'done']:
 
-                    total_received = self.payment['value_paid']
+                    total_received = self.payment['value_paid_coin']
 
                     if total_received < request.value_requested:
                         total_received = request.total_confirmed
@@ -105,6 +104,9 @@ def request(self, cb_params={}, params={}):
         from blockbee.utils import generate_nonce, build_callback_url
         from blockbee.forms import AddressCreatedForm
 
+        if self.apikey is None:
+            raise Exception('Please provide an API Key')
+
         try:
             provider = Provider.objects.get(coin=self.coin, active=True)
 
@@ -126,18 +128,10 @@ def request(self, cb_params={}, params={}):
                     'address': provider.cold_wallet,
                     'callback': cb_url,
                     'pending': 1,
+                    'apikey': self.apikey,
                     **params
                 }
 
-                if self.apikey is not None:
-                    _params = {
-                        'address': provider.cold_wallet,
-                        'callback': cb_url,
-                        'pending': 1,
-                        'apikey': self.apikey,
-                        **params
-                    }
-
                 response = get_address(self.coin, _params)
 
                 rl = RequestLog(

blockbee/forms.py

@@ -23,12 +23,12 @@ class CallbackForm(forms.Form):
     # Payment data
     txid_in = forms.CharField(max_length=256)
     confirmations = forms.IntegerField()
-    value = forms.DecimalField(max_digits=65, decimal_places=0)
     value_coin = forms.DecimalField(max_digits=65, decimal_places=18)
+    price = forms.DecimalField(max_digits=65, decimal_places=18)
+    fee_coin = forms.DecimalField(max_digits=65, decimal_places=18)
 
     # May be blank
     txid_out = forms.CharField(max_length=256, required=False)
-    value_forwarded = forms.DecimalField(max_digits=65, decimal_places=0, required=False)
     value_forwarded_coin = forms.DecimalField(max_digits=65, decimal_places=18, required=False)
 
 

blockbee/meta.py

@@ -1,3 +1,3 @@
 from distutils.version import StrictVersion
 
-VERSION = StrictVersion('1.0.2')
+VERSION = StrictVersion('1.0.3')

blockbee/migrations/0003_remove_payment_value_paid_and_more.py

@@ -0,0 +1,31 @@
+# Generated by Django 4.1.4 on 2023-01-19 09:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blockbee', '0002_alter_provider_cold_wallet'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='payment',
+            name='value_paid',
+        ),
+        migrations.RemoveField(
+            model_name='payment',
+            name='value_received',
+        ),
+        migrations.AddField(
+            model_name='payment',
+            name='value_fee_coin',
+            field=models.DecimalField(decimal_places=2, default=0, help_text='BlockBee Fee.', max_digits=65, verbose_name='Fee Coin'),
+        ),
+        migrations.AddField(
+            model_name='payment',
+            name='value_price',
+            field=models.DecimalField(decimal_places=18, default=0, help_text='Coin price in USD at the time of receiving.', max_digits=65, verbose_name='Price Coin in USD'),
+        ),
+    ]

blockbee/models.py

@@ -91,10 +91,10 @@ class Meta:
 class Payment(models.Model):
     id = models.AutoField(primary_key=True)
     request = models.ForeignKey(Request, on_delete=models.SET_NULL, null=True)
-    value_paid = models.DecimalField(_('Value Paid'), default=0, max_digits=65, decimal_places=0)
-    value_received = models.DecimalField(_('Value Received'), default=0, max_digits=65, decimal_places=0)
     value_paid_coin = models.DecimalField(_('Value Paid Coin'), default=0, max_digits=65, decimal_places=18)
     value_received_coin = models.DecimalField(_('Value Received Coin'), default=0, max_digits=65, decimal_places=18)
+    value_fee_coin = models.DecimalField(_('Fee Coin'), default=0, max_digits=65, decimal_places=18, help_text="BlockBee Fee.")
+    value_price = models.DecimalField(_('Price Coin in USD'), default=0, max_digits=65, decimal_places=18, help_text="Coin price in USD at the time of receiving.")
     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)
@@ -106,7 +106,7 @@ def coin(self):
         return self.request.provider.get_coin_display()
 
     def __str__(self):
-        return "#{}, {}, {} ({})".format(self.request.id, self.value_paid, self.request.provider.get_coin_display(), self.timestamp.strftime('%x %X'))
+        return "#{}, {}, {} ({})".format(self.request.id, self.value_paid_coin, self.request.provider.get_coin_display(), self.timestamp.strftime('%x %X'))
 
 
 class RequestLog(models.Model):

blockbee/views.py

@@ -26,12 +26,12 @@ def callback(_r):
         # Payment data
         payment = {
             'txid_in': form.cleaned_data.get('txid_in'),
-            'value_paid': form.cleaned_data.get('value'),
             'value_paid_coin': form.cleaned_data.get('value_coin'),
             'confirmations': form.cleaned_data.get('confirmations'),
             'txid_out': form.cleaned_data.get('txid_out'),
-            'value_received': form.cleaned_data.get('value_forwarded'),
-            'value_received_coin': form.cleaned_data.get('value_forwarded_coin')
+            'value_received_coin': form.cleaned_data.get('value_forwarded_coin'),
+            'value_price': form.cleaned_data.get('price'),
+            'value_fee_coin': form.cleaned_data.get('fee_coin')
         }
 
         raw_data = json.dumps(_r.GET)