django-chelseru 1.1.6__tar.gz → 1.1.8__tar.gz

{django_chelseru-1.1.6/django_chelseru.egg-info → django_chelseru-1.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-chelseru
-Version: 1.1.6
+Version: 1.1.8
 Summary: Authentication system, online and real-time chat, SMS system for Iranian SMS services.
 Home-page: https://pipdjango.chelseru.com
 Author: Sobhan Bahman Rashnu

{django_chelseru-1.1.6 → django_chelseru-1.1.8/django_chelseru.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-chelseru
-Version: 1.1.6
+Version: 1.1.8
 Summary: Authentication system, online and real-time chat, SMS system for Iranian SMS services.
 Home-page: https://pipdjango.chelseru.com
 Author: Sobhan Bahman Rashnu

{django_chelseru-1.1.6 → django_chelseru-1.1.8}/django_chelseru.egg-info/SOURCES.txt

@@ -41,4 +41,9 @@ drfchelseru/migrations/0014_payment_gateway_title_payment_gateway_url.py
 drfchelseru/migrations/0015_payment_message.py
 drfchelseru/migrations/0016_payment_card_hash_payment_card_pan_and_more.py
 drfchelseru/migrations/0017_alter_payment_callback_url_alter_payment_gateway_url.py
+drfchelseru/migrations/0018_alter_payment_ref_id.py
+drfchelseru/migrations/0019_payment_created_at_payment_status_payment_updated_at.py
+drfchelseru/migrations/0020_payment_paid_at.py
+drfchelseru/migrations/0021_alter_payment_message.py
+drfchelseru/migrations/0022_payment_pay_mode_wallet.py
 drfchelseru/migrations/__init__.py

{django_chelseru-1.1.6 → django_chelseru-1.1.8}/drfchelseru/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from .models import User, OTPCode, Session, MessageSMS, ChatRoom, MessageChat, ChatRoomPermissions, Organization, Payment
+from .models import User, OTPCode, Session, MessageSMS, ChatRoom, MessageChat, ChatRoomPermissions, Organization, Payment, Wallet
 
 
 @admin.register(User)
@@ -32,3 +32,4 @@ admin.site.register(MessageChat)
 admin.site.register(ChatRoomPermissions)
 admin.site.register(Organization)
 admin.site.register(Payment)
+admin.site.register(Wallet)

django_chelseru-1.1.8/drfchelseru/migrations/0018_alter_payment_ref_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-08-28 09:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("drfchelseru", "0017_alter_payment_callback_url_alter_payment_gateway_url"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="payment",
+            name="ref_id",
+            field=models.BigIntegerField(blank=True, null=True),
+        ),
+    ]

django_chelseru-1.1.8/drfchelseru/migrations/0019_payment_created_at_payment_status_payment_updated_at.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.1.6 on 2025-08-28 20:03
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('drfchelseru', '0018_alter_payment_ref_id'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='payment',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='payment',
+            name='status',
+            field=models.CharField(choices=[('paid', 'paid'), ('unpaid', 'unpaid'), ('canceled', 'canceled'), ('refounded', 'refounded')], default='unpaid', max_length=15),
+        ),
+        migrations.AddField(
+            model_name='payment',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]

django_chelseru-1.1.8/drfchelseru/migrations/0020_payment_paid_at.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-09-01 15:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('drfchelseru', '0019_payment_created_at_payment_status_payment_updated_at'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='payment',
+            name='paid_at',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

django_chelseru-1.1.8/drfchelseru/migrations/0021_alter_payment_message.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-09-01 16:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('drfchelseru', '0020_payment_paid_at'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='payment',
+            name='message',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

django_chelseru-1.1.8/drfchelseru/migrations/0022_payment_pay_mode_wallet.py

@@ -0,0 +1,48 @@
+# Generated by Django 5.1.6 on 2025-09-04 09:15
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("drfchelseru", "0021_alter_payment_message"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="payment",
+            name="pay_mode",
+            field=models.IntegerField(
+                choices=[(1, "Charge wallet"), (2, "Only pay")], default=1
+            ),
+        ),
+        migrations.CreateModel(
+            name="Wallet",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("amount", models.FloatField(default=0.0)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "user",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="wallet_drf_chelseru",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
+    ]

{django_chelseru-1.1.6 → django_chelseru-1.1.8}/drfchelseru/models.py

@@ -167,8 +167,36 @@ class MessageChat(models.Model):
         return f"iD: {self.id} | Message from {self.sender.username} at {self.timestamp} | Chatroom ID: {self.chat_room.id}"
     
 
+class Wallet(models.Model):
+    user = models.OneToOneField(default_user, on_delete=models.CASCADE, related_name='wallet_drf_chelseru')
+    amount = models.FloatField(default=0.0)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    def __str__(self) -> str:
+        return f'{self.user} - {self.amount}'
+
+
+class PayMode(models.IntegerChoices):
+    CHARGE_WALLET = 1, 'Charge wallet'
+    ONLY_PAY = 2, 'Only pay'
+    
+
 class Payment(models.Model):
+    PAID = 'paid'
+    UNPAID = 'unpaid'
+    CANCELED = 'canceled'
+    REFOUNDED = 'refounded'
+    STATUS_CHOICES = [
+        (PAID, 'paid'),
+        (UNPAID, 'unpaid'),
+        (CANCELED, 'canceled'),
+        (REFOUNDED, 'refounded')
+    ]
+
+    status = models.CharField(max_length=15, choices=STATUS_CHOICES, default=UNPAID)
     user = models.ForeignKey(default_user, models.DO_NOTHING)
+    pay_mode = models.IntegerField(choices=PayMode.choices, default=PayMode.CHARGE_WALLET)
     order_id = models.CharField(max_length=20)
     amount = models.FloatField()
     description = models.TextField()
@@ -181,14 +209,19 @@ class Payment(models.Model):
     gateway_url = models.URLField(blank=True, null=True)
     authority = models.TextField(blank=True, null=True)
     status_code = models.IntegerField(blank=True, null=True)
-    message = models.CharField(max_length=25, blank=True, null=True)
+    message = models.TextField(blank=True, null=True)
     card_hash = models.TextField(blank=True, null=True)
     card_pan = models.TextField(blank=True, null=True)
-    ref_id = models.IntegerField(blank=True, null=True)
+    ref_id = models.BigIntegerField(blank=True, null=True)
 
     data = models.TextField(blank=True, null=True)
     data_verify = models.TextField(blank=True, null=True)
 
+    paid_at = models.TextField(blank=True, null=True)
+
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
     def __str__(self):
         return f'payment id: {self.id} - order id: {self.order_id} amount: {self.amount}'
 
@@ -204,6 +237,7 @@ class Payment(models.Model):
             message
             data
         '''
+
         currency = kwargs.get('currency')
         gateway_title = kwargs.get('gateway_title')
         gateway_url = kwargs.get('gateway_url')
@@ -237,13 +271,14 @@ class Payment(models.Model):
             self.message = message
 
         if data is not None:
-            self.data = data
+            self.data = f'{self.data} | {data}'
         
         self.save()
     
     def set_verify_data(self, **kwargs: dict):
         '''
         inputs:
+            is_pay  0=False, 1=True
             status_code
             message
             card_hash
@@ -251,14 +286,21 @@ class Payment(models.Model):
             ref_id
             data_verify
         '''
+        is_pay = kwargs.get('is_pay')
         status_code = kwargs.get('status_code')
         message = kwargs.get('message')
         card_hash = kwargs.get('card_hash')
         card_pan = kwargs.get('card_pan')
         ref_id = kwargs.get('ref_id')
         data_verify = kwargs.get('data_verify')
+        
 
-        print(status_code, message, card_hash, card_pan, ref_id, data_verify, sep='\n')
+        if is_pay == 1:
+            if self.status != self.PAID:
+                self.status = self.PAID
+                if hasattr(self.user, 'wallet_drf_chelseru'):
+                    self.user.wallet_drf_chelseru.amount += self.amount
+                    self.user.wallet_drf_chelseru.save()
 
         if status_code is not None:
             self.status_code = status_code
@@ -276,7 +318,8 @@ class Payment(models.Model):
             self.ref_id = ref_id
 
         if data_verify is not None:
-            self.data_verify = data_verify
+            self.data = f'{self.data} | {data_verify}'
+            # self.data_verify = data_verify
         
         self.save()
     pass

{django_chelseru-1.1.6 → django_chelseru-1.1.8}/drfchelseru/services.py

@@ -5,7 +5,7 @@ from zeep import Client
 from rest_framework.status import HTTP_200_OK, HTTP_204_NO_CONTENT, HTTP_500_INTERNAL_SERVER_ERROR, HTTP_502_BAD_GATEWAY, HTTP_401_UNAUTHORIZED, HTTP_400_BAD_REQUEST
 
 
-from .settings import sms_init_check, bank_init_check, GATEWAY_ZARINPAL
+from .settings import sms_init_check, bank_init_check, GATEWAY_ZARINPAL, GATEWAY_PAYPING
 from .models import Payment
 
 
@@ -241,6 +241,137 @@ def send_message(mobile_number, message_text, data=None, template_id=None):
 
 
 
+class PaypingIR:
+    """
+        https://api.payping.ir/v3/pay
+        "amount": 1000,
+        "returnUrl": "https://viriakala.ir/skh-charge-wallet-successfully.php",
+        "payerIdentity": "09167332792",
+        "payerName": "bahman rashnu",
+        "description": "text descriptioni",
+        "clientRefId": "self.id"
+    """
+    def __init__(self, merchant_id):
+        self.merchant_id = merchant_id
+        self.headers = {'Content-type': 'application/json', 'Authorization': f'Bearer {merchant_id}'}
+
+    def create_payment(self, amount, callback_url, description, order_id=None, mobile=None, email=None, currency=None, client_refid=None, **metadata):
+        url = 'https://api.payping.ir/v3/pay'
+        try:
+            data = {}
+            # data['merchant_id'] = self.merchant_id
+            data['amount'] = amount
+            data['returnUrl'] = callback_url
+            data['description'] = description
+            if order_id:
+                data['order_id'] = order_id
+            
+            if mobile:
+                data['payerIdentity'] = mobile
+            
+            if email:
+                data['payerName'] = email
+
+            if client_refid:
+                data['clientRefId'] = str(client_refid)
+            
+            
+            response = requests.post(url, data=json.dumps(data), headers=self.headers)
+            status_code = response.status_code
+            response = response.json()
+            error_data = {}
+            match status_code:
+                case 200:
+                    return response
+                    
+                case 400:
+                    if 'metaData' in response:
+                        meta_data = response['metaData']
+                    else:
+                        meta_data = response
+                        
+                    error_data['message'] = meta_data.get('errors') # ' | '.join(list(map(lambda x:x['message'], meta_data.get('errors'))))
+                    error_data['code'] = meta_data.get('code')
+                    error_data['payping_trace_id'] = response['paypingTraceId']
+                case 500:
+                    error_data['message'] = 'There was a problem with the server. Check the error code with your payment service support.'
+                    error_data['code'] = 500
+                case 503:
+                    error_data['message'] = 'The server is currently unable to respond. Check the error code with your payment service support.'
+                    error_data['code'] = 503
+                case 401:
+                    error_data['message'] = 'Check the API code, payment service cannot be accessed. Check the error code with your payment service support.'
+                    error_data['code'] = 401
+                case 403:
+                    error_data['message'] = 'Unauthorized access. Check the error code with your payment service support.'
+                    error_data['code'] = 403
+                case 404:
+                    error_data['message'] = 'The requested item is not available. Check the error code with your payment service support.'
+                    error_data['code'] = 404
+        except:
+            pass
+        return {'errors' : error_data}
+
+
+    def verify_payment(self, authority, amount, payment_refid, card_number, card_hash_pan):
+        '''
+            authority = payment_code
+            amount
+            payment_refid: int
+        '''
+        url = 'https://api.payping.ir/v3/pay/verify'
+        try:
+            data = {
+                "paymentRefId": payment_refid,
+                "paymentCode": authority,
+                "amount": amount
+            }
+
+            response = requests.post(url=url, data=json.dumps(data), headers=self.headers)
+            status_code = response.status_code
+            response = response.json()
+            error_data = {
+                'card_number': card_number,
+                'card_hash_pan': card_hash_pan,
+                'ref_id': payment_refid,
+            }
+            match status_code:
+                case 200:
+                    print(f'200: {response}')
+                    return response
+                    
+                case 400 | 409:
+                    if 'metaData' in response:
+                        meta_data = response.get('metaData')
+                    else:
+                        meta_data = response
+                    
+                    error_data['message'] = meta_data.get('errors')
+                    error_data['payping_trace_id'] = response.get('traceId')
+
+                    if meta_data.get('code') == 110:
+                        error_data['code'] = 110
+                        error_data['message'] = meta_data.get('message') 
+
+                case 500:
+                    error_data['message'] = 'There was a problem with the server. Check the error code with your payment service support.'
+                    error_data['code'] = 500
+                case 503:
+                    error_data['message'] = 'The server is currently unable to respond. Check the error code with your payment service support.'
+                    error_data['code'] = 503
+                case 401:
+                    error_data['message'] = 'Check the API code, payment service cannot be accessed. Check the error code with your payment service support.'
+                    error_data['code'] = 401
+                case 403:
+                    error_data['message'] = 'Unauthorized access. Check the error code with your payment service support.'
+                    error_data['code'] = 403
+                case 404:
+                    error_data['message'] = 'The requested item is not available. Check the error code with your payment service support.'
+                    error_data['code'] = 404
+        except:
+            pass
+        return {'errors' : error_data}
+
 
 class ZarinpalCom:
     """
@@ -311,6 +442,10 @@ class ZarinpalCom:
                 data['currency'] = currency
             
             response = requests.post(url=url, data=data)
+
+            if 'errors' in response.json() and 'code' in response.json()['errors']:
+                return {'errors': response.json()['errors']}
+
             return response.json()
             
         except:
@@ -362,17 +497,19 @@ class ZarinpalCom:
             'authority': authority
         }
 
-        print(data)
-
         try:
-            response = requests.post(url=url, data=data).json()
+            response = requests.post(url=url, data=data)
+            response = response.json()
+            if 'errors' in response and 'code' in response['errors']:
+                return {'errors': response['errors']}
+            
             return response
         except:
             return False
 
         
 
-def create_payment(amount, description, merchant_id=None, callback_url=None, order_id=None, mobile=None, email=None, currency=None, **kwargs):
+def create_payment(amount, description, merchant_id=None, callback_url=None, order_id=None, mobile=None, email=None, currency=None, client_refid=None, **kwargs):
     try:
         ickeck = bank_init_check()
         gateway = ickeck['gateway']
@@ -383,23 +520,51 @@ def create_payment(amount, description, merchant_id=None, callback_url=None, ord
         if not currency:
             currency = ickeck['settings'].get('currency')
 
-        callback_url = callback_url + '/payment/callback/' if callback_url[-1] != '/' else callback_url + 'payment/callback/'
+        # callback_url = callback_url + '/payment/callback/' if callback_url[-1] != '/' else callback_url + 'payment/callback/'
 
         response = None
         match gateway:
-            case GATEWAY_ZARINPAL:
+            case gw if gw == GATEWAY_ZARINPAL:
                 gw = ZarinpalCom(merchant_id=merchant_id)
                 _response = gw.create_payment(amount, callback_url, description, order_id, mobile, email, currency)
-                response = {
-                    'currency': currency,
-                    'gateway_title': GATEWAY_ZARINPAL,
-                    'gateway_url': f"https://payment.zarinpal.com/pg/StartPay/{_response['data'].get('authority')}",
-                    'callback_url': callback_url,
-                    'authority': _response['data'].get('authority'),
-                    'status_code': _response['data'].get('code'),
-                    'message': _response['data'].get('message'),
-                    'data': _response['data']
-                }
+                if 'data' not in _response:
+                    response = {
+                        'callback_url': callback_url, 
+                        'message': _response['errors'].get('message'), 
+                        'status_code': _response['errors'].get('code'), 
+                        'data': _response['errors']
+                        }
+                else:
+                    response = {
+                        'currency': currency,
+                        'gateway_title': GATEWAY_ZARINPAL,
+                        'gateway_url': f"https://payment.zarinpal.com/pg/StartPay/{_response['data'].get('authority')}",
+                        'callback_url': callback_url,
+                        'authority': _response['data'].get('authority'),
+                        'status_code': _response['data'].get('code'),
+                        'message': _response['data'].get('message'),
+                        'data': _response['data']
+                    }
+            
+            case gw if gw == GATEWAY_PAYPING:
+                gw = PaypingIR(merchant_id=merchant_id)
+                _response = gw.create_payment(amount, callback_url, description, order_id, mobile, email, client_refid)
+                if 'errors' in _response:
+                    response = {
+                        'callback_url': callback_url, 
+                        'message': _response['errors'].get('message'), 
+                        'status_code': _response['errors'].get('code'), 
+                        'data': _response['errors']
+                        }
+                else:
+                    response = {
+                        'gateway_title': GATEWAY_PAYPING,
+                        'gateway_url': _response['url'],
+                        'callback_url': callback_url,
+                        'authority': _response['paymentCode'],
+                        'status_code': 100,
+                        'data': _response
+                    }
 
         if response is not None:
             return response
@@ -409,7 +574,7 @@ def create_payment(amount, description, merchant_id=None, callback_url=None, ord
         pass
 
 
-def verify_payment(authority, amount, merchant_id=None):
+def verify_payment(authority, amount, merchant_id=None, payment_refid:int=None, card_number:str=None, card_hash_pan:str=None):
     try:
         ickeck = bank_init_check()
         gateway = ickeck['gateway']
@@ -417,17 +582,51 @@ def verify_payment(authority, amount, merchant_id=None):
             merchant_id = ickeck['settings'].get('merchant_id')
         response = None
         match gateway:
-            case GATEWAY_ZARINPAL:
+            case gw if gw == GATEWAY_ZARINPAL:
                 gw = ZarinpalCom(merchant_id=merchant_id)
                 _response = gw.verify_payment(authority, amount)
-                response = {
-                    'status_code': _response['data'].get('status_code'),
-                    'message': _response['data'].get('message'),
-                    'card_hash': _response['data'].get('card_hash'),
-                    'card_pan': _response['data'].get('card_pan'),
-                    'ref_id': _response['data'].get('ref_id'),
-                    'data_verify': _response['data'],
-                }
+                if 'data' not in _response:
+                    response = {
+                        'is_pay': 1 if _response['errors'].get('code') in [101, 100] else 0,
+                        'status_code': _response['errors'].get('code'),
+                        'message': _response['errors'].get('message'),
+                        'data_verify': _response['errors'],
+                    }
+                else:
+                    response = {
+                        'is_pay': 1 if _response['data'].get('code') in [101, 100] else 0,
+                        'status_code': _response['data'].get('code'),
+                        'message': _response['data'].get('message'),
+                        'card_hash': _response['data'].get('card_hash'),
+                        'card_pan': _response['data'].get('card_pan'),
+                        'ref_id': _response['data'].get('ref_id'),
+                        'data_verify': _response['data'],
+                    }
+            
+            case gw if gw == GATEWAY_PAYPING:
+                gw = PaypingIR(merchant_id=merchant_id)
+                _response = gw.verify_payment(authority, int(amount), payment_refid, card_number, card_hash_pan)
+                if 'errors' in _response:
+                    response = {
+                        'is_pay': 1 if _response['errors'].get('code') == 110 else 0,
+                        'message': _response['errors'].get('message'), 
+                        'status_code': _response['errors'].get('code'),
+                        'ref_id': _response['errors'].get('ref_id'),
+                        'card_pan': _response['errors'].get('card_number'),
+                        'card_hash': _response['errors'].get('card_hash_pan'),
+                        'data_verify': _response['errors']
+                    }
+                else:
+                    response = {
+                        'is_pay': 1 if 'code' in _response and _response.get('code') not in [500, 503, 401, 403, 404, 200, 400] else 0,
+                        'message': _response['code'],
+                        'status_code': 100,
+                        'ref_id': _response['paymentRefId'],
+                        'card_pan': _response['cardNumber'],
+                        'card_hash': _response['cardHashPan'],
+                        'paid_at': _response['payedDate'],
+                        'data_verify': _response
+                    }
                 
         if response is not None:
             return response

{django_chelseru-1.1.6 → django_chelseru-1.1.8}/drfchelseru/settings.py

@@ -55,7 +55,8 @@ AUTH_SERVICES = [(0, AUTH_SERVICE_JWT)]
 SMS_SERVICES = [(0, 'PARSIAN_WEBCO_IR'),(1, 'MELI_PAYAMAK_COM') ,(2, 'KAVENEGAR_COM')]
 
 GATEWAY_ZARINPAL = 'ZARINPAL_COM'
-GATEWAYS = ((0, GATEWAY_ZARINPAL),)
+GATEWAY_PAYPING = 'PAYPING_IR'
+GATEWAYS = ((0, GATEWAY_ZARINPAL),(1, GATEWAY_PAYPING))
 CURRENCIES = ((0, 'IRT'), (1, 'IRR'))
 
 

{django_chelseru-1.1.6 → django_chelseru-1.1.8}/drfchelseru/signals.py

@@ -1,5 +1,5 @@
 from django.contrib.auth.models import User as DefaultUser
-from .models import User
+from .models import User, Payment, Wallet
 from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver
 import requests
@@ -14,15 +14,6 @@ from asgiref.sync import sync_to_async
 UserGet = get_user_model()
 
 
-# @receiver(post_save, sender=User)
-# def create_user_profile(sender, instance, created, **kwargs):
-#     if created:
-#         mobile.objects.create(user=instance)
-
-# @receiver(post_save, sender=User)
-# def save_user_profile(sender, instance, **kwargs):
-#     instance.mobile.save()
-
 @receiver(pre_save, sender=User)
 def create_user_if_not_exists(sender, instance, **kwargs):
     if not instance.user_id:
@@ -30,6 +21,8 @@ def create_user_if_not_exists(sender, instance, **kwargs):
                                                                   defaults={'username': f'G{instance.group}-{instance.mobile}'})
         if created:
             instance.user = default_user
+            Wallet.objects.create(user=default_user)
+
 
 @receiver(post_save, sender=DefaultUser)
 def send_email_after_create(sender, instance, **kwargs):
@@ -48,8 +41,6 @@ def send_email_after_create(sender, instance, **kwargs):
     
 
 
-
-
 @sync_to_async
 def get_user(validated_token):
     try:
@@ -73,4 +64,16 @@ class JWTAuthMiddleware(BaseMiddleware):
         else:
             scope["user"] = AnonymousUser()
 
-        return await super().__call__(scope, receive, send)
+        return await super().__call__(scope, receive, send)
+
+
+
+# @receiver(post_save, sender=Payment)
+# def charge_wallet_after_pay(sender, instance, **kwargs):
+#     if instance.status == Payment.PAID:
+#         if hasattr(instance.user, 'wallet_drf_chelseru'):
+#             print('ok')
+#             instance.user.wallet_drf_chelseru.amount += instance.amount
+#             instance.save()
+#         else:
+#             print('nok')

{django_chelseru-1.1.6 → django_chelseru-1.1.8}/drfchelseru/urls.py

@@ -10,10 +10,13 @@ router.register(r'messages', MessageViewSet, basename='messages')
 
 urlpatterns = [
     path('message/send/', MessageSend.as_view(), name='message-send'),
+    
     path('otp/send/', OTPCodeSend.as_view(), name='otp-send'),
     path('authenticate/', Authentication.as_view(), name='auth'),
+
     path('sessions/', SessionList.as_view(), name='sessions'),
 
     path('payment/create/', PaymentCreate.as_view(), name='payment-create'),
-    path('payment/callback/', PaymentCallback.as_view(), name='payment-callback'),
+    path('payment/verify/', PaymentCallback.as_view(), name='payment-verify'),
+
 ] + [path('chat/', include(router.urls)),]

{django_chelseru-1.1.6 → django_chelseru-1.1.8}/drfchelseru/views.py

@@ -301,7 +301,8 @@ class PaymentCreate(APIView):
                 data['email'] = self.request.user.email
             
             obj = self.model.objects.create(user=request.user, amount=data['amount'], description=data['description'], mobile=data['mobile'], email=data['email'])
-
+            data['client_refid'] = obj.user.id
+            
             if 'callback_url' in request.data:
                 data['callback_url'] = request.data['callback_url']
                 obj.callback_url = data['callback_url']
@@ -349,14 +350,56 @@ class PaymentCallback(APIView):
         authority = request.GET.get('Authority')
         status = request.GET.get('Status')
 
-        if status and status == 'OK' and authority:
+        if status  and authority:
+            # and status == 'OK'
             try:
                 obj = self.model.objects.get(authority=authority)
                 response = verify_payment(authority=authority, amount=obj.amount)
-                print('response in views: ', response)
+                if response is None:
+                    return Response({'error': 'callback data is none, please check your gateway settings.'}, status=HTTP_400_BAD_REQUEST)
+                
                 obj.set_verify_data(**response)
                 return Response({'details': response}, status=HTTP_200_OK)
             except self.model.DoesNotExist:
                 return Response({'error': 'payment not found.'}, status=HTTP_404_NOT_FOUND)
 
-        return Response({'error': 'The transaction was unsuccessful or canceled.'}, status=HTTP_400_BAD_REQUEST)
+        return Response({'error': 'The transaction was unsuccessful or canceled.'}, status=HTTP_400_BAD_REQUEST)
+    
+    def post(self, request):
+        # print(request.data)
+        if 'paymentCode' in request.data:
+            authority = request.POST.get('paymentCode')
+        else:
+            authority = request.POST.get('authority')
+
+        if 'paymentRefId' in request.data:
+            payment_refid = request.POST.get('paymentRefId')
+        else:
+            payment_refid = None
+        
+        if 'gatewayAmount' in request.data:
+            gateway_amount = request.POST.get('gatewayAmount')
+
+        if 'cardNumber' in request.data:
+            card_number = request.POST.get('cardNumber')
+        else:
+            card_number = None
+        
+        if 'cardHashPan' in request.data:
+            card_hash_pan = request.POST.get('cardHashPan')
+        else:
+            card_hash_pan = None
+
+        try:
+            obj = self.model.objects.get(authority=authority)
+            response = verify_payment(authority=authority, amount=obj.amount, payment_refid=payment_refid, card_number=card_number, card_hash_pan=card_hash_pan)
+            
+            if response is None:
+                return Response({'error': 'callback data is none, please check your gateway settings.'}, status=HTTP_400_BAD_REQUEST)
+            
+            obj.set_verify_data(**response)
+            return Response({'details': response}, status=HTTP_200_OK)
+        
+        except self.model.DoesNotExist:
+            return Response({'error': 'payment not found.'}, status=HTTP_404_NOT_FOUND)
+        return Response({})

{django_chelseru-1.1.6 → django_chelseru-1.1.8}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='django-chelseru',
-    version='1.1.6',
+    version='1.1.8',
     packages=find_packages(),
     include_package_data=True,
     install_requires=[