Merge pull request #25 from Ekirapapaul/transactions

Transactions

Author: muneneevans

mpesa/LipaNaMpesaOnline.py

@@ -15,6 +15,7 @@
 PASS_KEY = api_settings.PASS_KEY
 SHORT_CODE = api_settings.SHORT_CODE
 SAFARICOM_API = api_settings.SAFARICOM_API
+TRANSACTION_TYPE = api_settings.TRANSACTION_TYPE
 
 
 # Applies for LipaNaMpesaOnline Payment method
@@ -26,7 +27,6 @@ def generate_pass_key():
 
 def get_token():
     api_url = "{}/oauth/v1/generate?grant_type=client_credentials".format(SAFARICOM_API)
-    print(api_url)
 
     r = requests.get(api_url, auth=HTTPBasicAuth(consumer_key, consumer_secret))
     if r.status_code == 200:
@@ -38,7 +38,7 @@ def get_token():
         return False
 
 
-def sendSTK(phone_number, amount, orderId=0, transaction_id=None, shortcode=None):
+def sendSTK(phone_number, amount, orderId=0, transaction_id=None, shortcode=None, account_number=None):
     code = shortcode or SHORT_CODE
     access_token = get_token()
     if access_token is False:
@@ -54,18 +54,26 @@ def sendSTK(phone_number, amount, orderId=0, transaction_id=None, shortcode=None
         "Authorization": "Bearer %s" % access_token,
         "Content-Type": "application/json",
     }
+
+    transaction_type = TRANSACTION_TYPE or "CustomerBuyGoodsOnline"
+    # If account number is set, change transaction type to paybill
+    if account_number:
+        transaction_type = "CustomerPayBillOnline"
+    elif transaction_type == "CustomerPayBillOnline" and account_number == None:
+        account_number = phone_number
+
     request = {
         "BusinessShortCode": code,
         "Password": encoded,
         "Timestamp": time_now,
-        "TransactionType": "CustomerPayBillOnline",
+        "TransactionType": transaction_type,
         "Amount": str(int(amount)),
         "PartyA": phone_number,
         "PartyB": code,
         "PhoneNumber": phone_number,
         "CallBackURL": "{}/mpesa/confirm/".format(HOST_NAME),
-        "AccountReference": code,
-        "TransactionDesc": "Payment for {}".format(phone_number)
+        "AccountReference": account_number or code,
+        "TransactionDesc": "{}".format(phone_number)
     }
 
     print(request)

mpesa/migrations/0006_auto_20220108_1033.py

@@ -0,0 +1,30 @@
+# Generated by Django 2.2.20 on 2022-01-08 10:33
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('mpesa', '0005_auto_20200822_1645'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='paymenttransaction',
+            name='content_type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='contenttypes.ContentType'),
+        ),
+        migrations.AddField(
+            model_name='paymenttransaction',
+            name='object_id',
+            field=models.PositiveIntegerField(default=0),
+        ),
+        migrations.AlterField(
+            model_name='paymenttransaction',
+            name='amount',
+            field=models.DecimalField(decimal_places=2, default=0, max_digits=14),
+        ),
+    ]

mpesa/models.py

@@ -4,6 +4,8 @@
 from django.db import models
 from django.conf import settings
 import uuid
+from django.contrib.contenttypes.models import ContentType
+from django.contrib.contenttypes.fields import GenericForeignKey
 
 
 # Create your models here.
@@ -21,7 +23,7 @@ class Meta:
 
 class PaymentTransaction(models.Model):
     phone_number = models.CharField(max_length=30)
-    amount = models.DecimalField(('amount'), max_digits=6, decimal_places=2, default=0)
+    amount = models.DecimalField(max_digits=14, decimal_places=2, default=0)
     isFinished = models.BooleanField(default=False)
     isSuccessFull = models.BooleanField(default=False)
     trans_id = models.CharField(max_length=30)
@@ -30,6 +32,10 @@ class PaymentTransaction(models.Model):
     date_modified = models.DateTimeField(auto_now=True)
     date_created = models.DateTimeField(auto_now=False, auto_now_add=True)
 
+    content_type = models.ForeignKey(ContentType, null=True, blank=True, on_delete=models.SET_NULL)
+    object_id = models.PositiveIntegerField(default=0)
+    order_object = GenericForeignKey('content_type', 'object_id')
+
     def __str__(self):
         return "{} {}".format(self.phone_number, self.amount)
 

mpesa/settings.py

@@ -11,6 +11,7 @@
     'PASS_KEY': None,
     'SAFARICOM_API': 'https://sandbox.safaricom.co.ke',
     'SHORT_CODE': None,
+    'TRANSACTION_TYPE': 'CustomerBuyGoodsOnline',
 }
 
 api_settings = APISettings(USER_SETTINGS, DEFAULTS, None)

mpesa/views.py

@@ -35,9 +35,13 @@ def post(self, request):
         if data.get('entity_id'):
             entity_id = data.get('entity_id')
 
-        transactionId = sendSTK(phone_number, amount, entity_id)
+        paybill_account_number = None
+        if data.get('paybill_account_number'):
+            paybill_account_number = data.get('paybill_account_number')
+
+        transaction_id = sendSTK(phone_number, amount, entity_id, account_number=paybill_account_number)
         # b2c()
-        message = {"status": "ok", "transaction_id": transactionId}
+        message = {"status": "ok", "transaction_id": transaction_id}
         return Response(message, status=HTTP_200_OK)
 
 

setup.py

@@ -22,7 +22,7 @@
 
 setup(
     name='django-mpesa',
-    version='2.0.6',
+    version='2.0.9',
     description='A python library that interfaces safaricoms mpesa apis',
     long_description=open('README.rst', 'r', encoding='utf-8').read(),
     url='https://www.vorane.com/',

tests/settings.py

@@ -59,6 +59,7 @@
     'PASS_KEY': '',
     'SAFARICOM_API': 'https://sandbox.safaricom.co.ke',
     'SHORT_CODE': '174379',
+    'TRANSACTION_TYPE': 'CustomerBuyGoodsOnline',
 }
 
 ROOT_URLCONF = 'tests.urls'