.gitignore

@@ -1,6 +1,8 @@
 .idea
 .env
 media
+__pycache__/
+*.pyc
 /clients/
 /delme.py
 /log/accounts.log

Dockerfile

@@ -1,10 +1,12 @@
-FROM debian:12
+FROM base:debian13
 ENV PYTHONUNBUFFERED 1
 WORKDIR /app
 #RUN date
-RUN apt update
-RUN apt install gnupg2 netcat-traditional libssl-dev libcrypto++-dev lsb-release python3-pip -y
-RUN apt install binutils libproj-dev gdal-bin -y
-COPY requirements.txt /app/requirements.txt
-RUN pip3 install --break-system-packages -r requirements.txt
+#RUN apt update
+#RUN apt install gnupg2 netcat-traditional libssl-dev libcrypto++-dev lsb-release python3-pip -y
+#RUN apt install binutils libproj-dev gdal-bin -y
+#COPY requirements.txt /app/requirements.txt
+#RUN pip3 install --break-system-packages -r requirements.txt
+#RUN pip3 install --break-system-packages django-admin-rangefilter==0.13.5
+#RUN pip3 install --break-system-packages setuptools
 #ENTRYPOINT ["./run.sh"]

apps/pg/admin.py

@@ -14,6 +14,7 @@ from django.urls import path
 from .constans import StateChoices
 from .forms import ApplicationGatewayPolicyForm
 from .models import PaymentRequest, PNA, Fake, ApplicationGatewayPolicy, SEP
+from rangefilter.filters import DateTimeRangeFilter
 
 logger = logging.getLogger(__name__)
 
@@ -74,7 +75,7 @@ class PaymentRequestAdmin(admin.ModelAdmin):
     list_display = ['state', 'check_success_again', 'uuid', 'splited_amount', 'user_id', 'jajali_datetime',
                     'is_registered', 'created_at', 'application', 'gateway']
     search_fields = ['application__uuid', 'application__client_id', 'amount', 'user__uuid']
-    list_filter = ['application', 'state', 'gateway']
+    list_filter = ['application', 'state', 'gateway', ('created_at', DateTimeRangeFilter), ('updated_at', DateTimeRangeFilter)]
     actions = [export_exel, mark_as_registered]
 
     def changelist_view(self, request, extra_context=None):

apps/pg/models.py

@@ -11,7 +11,7 @@ from django.urls import reverse
 from oauth2_provider.settings import oauth2_settings
 
 from apps.core.models import BaseModel, BasePGModel
-from apps.pg.constans import StateChoices
+from apps.pg.constans import StateChoices, TypeChoices
 import uuid
 
 from utils.clients.wallet_client import deposit_to_user_wallet_submit, deposit_to_user_wallet_verify
@@ -83,6 +83,10 @@ class PaymentRequest(models.Model):
 
         return to_jalali(self.created_at)
 
+    @property
+    def income_uuid(self):
+        return uuid.uuid5(self.uuid, 'income')
+
     def save_commission(self):
         self.commission = calculate_pna_commission(self.amount)
         self.save(update_fields=['commission'])
@@ -145,7 +149,7 @@ class PaymentRequest(models.Model):
             "uuid": str(self.uuid),
             "payee": str(self.user.uuid),
             "payee_type": 1,
-            "payee_wallet": settings.WALLET_RIAL,
+            "payee_wallet": settings.WALLET_RIAL_DEPOSIT,
             "amount": self.amount,
             "details": {
                 'description': str(_("charge via ipg")),
@@ -153,7 +157,7 @@ class PaymentRequest(models.Model):
                 'application_details_url': ''
             },
         }
-        submit_response = deposit_to_user_wallet_submit(settings.WALLET_RIAL, data)
+        submit_response = deposit_to_user_wallet_submit(settings.WALLET_RIAL_DEPOSIT, data)
 
         if not submit_response or not submit_response.uuid:
             logger.error(f"[Deposit Submit] Wallet submission failed | payment_id={self.pk}")
@@ -171,7 +175,7 @@ class PaymentRequest(models.Model):
         return to_success
 
     def deposit_verify(self):
-        verify_response = deposit_to_user_wallet_verify(settings.WALLET_RIAL, self.uuid)
+        verify_response = deposit_to_user_wallet_verify(settings.WALLET_RIAL_DEPOSIT, self.uuid)
 
         if not verify_response:
             logger.error(f"[Deposit Verify] Failed to get response from wallet service | payment_id={self.pk}")
@@ -205,6 +209,47 @@ class PaymentRequest(models.Model):
 
         return to_pay_success
 
+    def deposit_income_submit(self):
+        data = {
+            "uuid": str(self.income_uuid),
+            "payee": str(self.application_id),
+            "payee_type": TypeChoices.APPLICATION.value,
+            "payee_wallet": settings.WALLET_INCOME_FROM_IPG,
+            "amount": self.commission,
+            "details": {
+                'description': str(_("ipg commission income")),
+                'reference_id': str(self.uuid),
+                'application_details_url': ''
+            },
+        }
+        submit_response = deposit_to_user_wallet_submit(settings.WALLET_INCOME_FROM_IPG, data)
+
+        if not submit_response or not submit_response.uuid:
+            raise Exception('Failed to submit income in wallet')
+
+        return submit_response
+
+    def deposit_income_verify(self):
+        verify_response = deposit_to_user_wallet_verify(settings.WALLET_INCOME_FROM_IPG, self.income_uuid)
+
+        if not verify_response or not verify_response.uuid:
+            raise Exception('Failed to verify income in wallet')
+
+        if verify_response.state != 5:
+            raise Exception('Failed to verify income in wallet')
+
+        return True
+
+    def charge_wallet_income(self):
+        if not self.application_id or not self.commission:
+            return
+        try:
+            self.deposit_income_submit()
+            self.deposit_income_verify()
+            logger.info(f"[Charge Wallet] Income charged successfully | payment_id={self.pk}")
+        except Exception:
+            logger.exception(f"[Charge Wallet] Failed to charge income | payment_id={self.pk}")
+
     def charge_wallet_balance(self):
         logger.info(f"[Charge Wallet] Starting wallet charge process | payment_id={self.pk}")
         if self.state in [StateChoices.IPG_SUCCESS]:
@@ -221,6 +266,7 @@ class PaymentRequest(models.Model):
             to_pay_success = self.deposit_verify()
             if to_pay_success:
                 logger.info(f"[Charge Wallet] Wallet charged successfully | payment_id={self.pk}")
+                self.charge_wallet_income()
             else:
                 logger.warning(f"[Charge Wallet] Wallet charge verification failed | payment_id={self.pk}")
             return bool(to_pay_success)

main/settings.py

@@ -49,6 +49,7 @@ INSTALLED_APPS = [
     'django_filters',
     'jalali_date',
     'django_admin_logs',
+    'rangefilter',
 
     # local apps
     'apps.core',
@@ -63,7 +64,7 @@ MIDDLEWARE = [
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.locale.LocaleMiddleware',
-    'utils.i18n.ForceAdminLanguageMiddleware',
+    # 'utils.i18n.ForceAdminLanguageMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'oauth2_provider.middleware.OAuth2TokenMiddleware',
@@ -262,7 +263,8 @@ LOGGING = get_logging_setting()
 
 PNA_CORPORATION_PIN = config('PNA_CORPORATION_PIN')
 WALLET_BASE_PUBLIC_URL = config('WALLET_BASE_PUBLIC_URL')
-WALLET_RIAL = config('WALLET_RIAL')
+WALLET_RIAL_DEPOSIT = config('WALLET_RIAL_DEPOSIT')
+WALLET_INCOME_FROM_IPG = config('WALLET_INCOME_FROM_IPG')
 IPG_BASE_PUBLIC_URL = config('IPG_BASE_PUBLIC_URL')
 
 COMMISSION_LEVEL1 = config('COMMISSION_LEVEL1', cast=int)

requirements.in

@@ -19,4 +19,5 @@ httpx
 django-redis
 xlsxwriter
 xlrd
-django_admin_logs
+django_admin_logs
+django-admin-rangefilter

requirements.txt

@@ -182,6 +182,7 @@ zope-event==5.0
     # via gevent
 zope-interface==7.2
     # via gevent
+django-admin-rangefilter==0.13.5
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools