payme-pkg 3.0.19__py3-none-any.whl → 3.0.20__py3-none-any.whl

payme/admin.py

@@ -1,6 +1,5 @@
 from django.contrib import admin
 
-
 from payme.models import PaymeTransactions
 
 
@@ -10,7 +9,7 @@ class PaymeTransactionsUI(admin.ModelAdmin):
     """
     list_display = ('id', 'state', 'cancel_reason', 'created_at')
     list_filter = ('state', 'cancel_reason', 'created_at')
-    search_fields = ('transaction_id', 'account__id')
+    search_fields = ('transaction_id', 'account_id')
     ordering = ('-created_at',)
 
 

payme/migrations/0001_initial.py

@@ -0,0 +1,60 @@
+# Generated by Django 5.1.2 on 2024-12-22 05:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="PaymeTransactions",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("transaction_id", models.CharField(max_length=50)),
+                ("account_id", models.BigIntegerField()),
+                ("amount", models.DecimalField(decimal_places=2, max_digits=10)),
+                (
+                    "state",
+                    models.IntegerField(
+                        choices=[
+                            (0, "Created"),
+                            (1, "Initiating"),
+                            (2, "Successfully"),
+                            (-2, "Canceled after successful performed"),
+                            (-1, "Canceled during initiation"),
+                        ],
+                        default=0,
+                    ),
+                ),
+                ("cancel_reason", models.IntegerField(blank=True, null=True)),
+                ("created_at", models.DateTimeField(auto_now_add=True, db_index=True)),
+                ("updated_at", models.DateTimeField(auto_now=True, db_index=True)),
+                (
+                    "performed_at",
+                    models.DateTimeField(blank=True, db_index=True, null=True),
+                ),
+                (
+                    "cancelled_at",
+                    models.DateTimeField(blank=True, db_index=True, null=True),
+                ),
+            ],
+            options={
+                "verbose_name": "Payme Transaction",
+                "verbose_name_plural": "Payme Transactions",
+                "db_table": "payme_transactions",
+                "ordering": ["-created_at"],
+            },
+        ),
+    ]

payme/models.py

@@ -4,13 +4,8 @@ It logs any significant modifications to payment transactions such as amount, st
 allowing for a detailed historical record of each transaction's state over time.
 """
 from django.db import models
-from django.conf import settings
 from django.utils import timezone
 
-from django.utils.module_loading import import_string
-
-AccountModel = import_string(settings.PAYME_ACCOUNT_MODEL)
-
 
 class PaymeTransactions(models.Model):
     """
@@ -31,11 +26,7 @@ class PaymeTransactions(models.Model):
     ]
 
     transaction_id = models.CharField(max_length=50)
-    account = models.ForeignKey(
-        AccountModel,
-        related_name="payme_transactions",
-        on_delete=models.CASCADE
-    )
+    account_id = models.BigIntegerField(null=False)
     amount = models.DecimalField(max_digits=10, decimal_places=2)
     state = models.IntegerField(choices=STATE, default=CREATED)
     cancel_reason = models.IntegerField(null=True, blank=True)
@@ -57,7 +48,7 @@ class PaymeTransactions(models.Model):
         """
         String representation of the PaymentTransaction model.
         """
-        return f"Payme Transaction #{self.transaction_id} Account: {self.account} - {self.state}"
+        return f"Payme Transaction #{self.transaction_id} Account: {self.account_id} - {self.state}"
 
     @classmethod
     def get_by_transaction_id(cls, transaction_id):

payme/views.py

@@ -1,17 +1,16 @@
 import base64
-import logging
 import binascii
+import logging
 from decimal import Decimal
 
 from django.conf import settings
 from django.utils.module_loading import import_string
-
 from rest_framework import views
 from rest_framework.response import Response
 
 from payme import exceptions
-from payme.types import response
 from payme.models import PaymeTransactions
+from payme.types import response
 from payme.util import time_to_payme, time_to_service
 
 logger = logging.getLogger(__name__)
@@ -169,13 +168,13 @@ class PaymeWebHookAPIView(views.APIView):
         defaults = {
             "amount": amount,
             "state": PaymeTransactions.INITIATING,
-            "account": account,
+            "account_id": account.id,
         }
 
         # Handle already existing transaction with the same ID for one-time payments
         if settings.PAYME_ONE_TIME_PAYMENT:
             # Check for an existing transaction with a different transaction_id for the given account
-            if PaymeTransactions.objects.filter(account=account).exclude(transaction_id=transaction_id).exists():
+            if PaymeTransactions.objects.filter(account_id=account.id).exclude(transaction_id=transaction_id).exists():
                 message = f"Transaction {transaction_id} already exists (Payme)."
                 logger.warning(message)
                 raise exceptions.TransactionAlreadyExists(message)
@@ -290,7 +289,7 @@ class PaymeWebHookAPIView(views.APIView):
                 "transaction": transaction.transaction_id,
                 "amount": transaction.amount,
                 "account": {
-                    settings.PAYME_ACCOUNT_FIELD: transaction.account.id
+                    settings.PAYME_ACCOUNT_FIELD: transaction.account_id
                 },
                 "reason": transaction.cancel_reason,
                 "state": transaction.state,

{payme_pkg-3.0.19.dist-info → payme_pkg-3.0.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: payme-pkg
-Version: 3.0.19
+Version: 3.0.20
 Home-page: https://github.com/Muhammadali-Akbarov/payme-pkg
 Author: Muhammadali Akbarov
 Author-email: muhammadali17abc@gmail.com
@@ -8,9 +8,9 @@ License: MIT
 Keywords: paymeuz paycomuz payme-merchant merchant-api subscribe-api payme-pkg payme-api
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: requests (==2.*)
-Requires-Dist: djangorestframework (==3.*)
-Requires-Dist: dataclasses (==0.*) ; python_version < "3.7"
+Requires-Dist: requests ==2.*
+Requires-Dist: djangorestframework ==3.*
+Requires-Dist: dataclasses ==0.* ; python_version < "3.7"
 
 <h1 align="center">Payme Software Development Kit</h1>
 
@@ -139,7 +139,7 @@ urlpatterns = [
 
 Run migrations
 ```shell
-python3 manage.py makemigrations && python manage.py migrate
+python manage.py migrate
 ```
 🎉 Congratulations you have been integrated merchant api methods with django, keep reading docs. After successfull migrations check your admin panel and see results what happened.
 

{payme_pkg-3.0.19.dist-info → payme_pkg-3.0.20.dist-info}/RECORD

@@ -1,11 +1,11 @@
 payme/__init__.py,sha256=dzLIyA9kQl0sO6z9nHkZDTjkfiI1BepdifKtJbjX2Cw,46
-payme/admin.py,sha256=67uHZiZe2w2s0TE23PS2v-V3xXRaha6o9acjVmNIQbM,470
+payme/admin.py,sha256=QW93VTNRZ3qr2eMySX0odyQDmBXJDMXVPCzJPLH78GI,468
 payme/apps.py,sha256=HHCY4zUNKPcjz25z0MahZcks0lsAxTGPS0Ml3U4DhZc,142
 payme/const.py,sha256=azndfKR53fe7mDfGW82Q-kwWdMu3x4S1upKc4gkYdlA,214
-payme/models.py,sha256=mT6sIeDOs-pKZ_b8Y9oafHBv5GruioJkpTqTGZ8AulA,4360
+payme/models.py,sha256=C0-dbXEpzZBx1-GsdBXwKQt7gJ6AvgPO6l-3VljfNtw,4130
 payme/urls.py,sha256=_oUOwxW1Suc5TUmnj--lySYbotRg4yTDkDLJU20CGjE,145
 payme/util.py,sha256=UFb4cEnaufS_hh9C_0z079CSgJGivYjIgOl2iAFrBMs,625
-payme/views.py,sha256=A5_GxSFS1Hif2W1LAGP5YfnGazdaaqLXgFLEy2z0A7k,11928
+payme/views.py,sha256=AYWXP9zJGcLkTM91RIiL6Ou4RHqLph3NyYIlzPAN3fU,11939
 payme/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 payme/classes/cards.py,sha256=dr3SQdKAhfQmECtwHYW2nmx8wXaNYQFkg5uQU9z8vs4,7624
 payme/classes/client.py,sha256=_eMcSTiwMdwIe0aeccVav-43Uq7ORdH7idOuSTPjpcg,837
@@ -15,6 +15,7 @@ payme/classes/receipts.py,sha256=KU4qyGHWZpWW88SjmmTD_N2Tz8pWOCvBbOPnw5tcS3Y,100
 payme/exceptions/__init__.py,sha256=HoBFnDA3eW_xWZiFlonJK4vhBDTsuik91tvgzXTy8KA,94
 payme/exceptions/general.py,sha256=-rkzvuLi6VoITMLrszrP7c-gM8X6lM8AWttd770KSJc,7679
 payme/exceptions/webhook.py,sha256=f0J-fmCW_wpgsTmjGAOtyoZjIOoFpbQwkh_7cZUZkv0,3046
+payme/migrations/0001_initial.py,sha256=jdtGB6bN-Za6N9XU8IuWsa5FbonGIRH5ro9xHwT7JmU,2128
 payme/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 payme/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 payme/types/request/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,8 +23,8 @@ payme/types/response/__init__.py,sha256=GAj5pjZ9oIO67T6YMiPd1fhTIvGrPfTv96tykfeC
 payme/types/response/cards.py,sha256=ilXFDUOPNabVsrQN1KWEzDiL6cDxdVvCbfEl6jCzGpU,1997
 payme/types/response/receipts.py,sha256=TlZeJyymRVHIorg0kbUaogy6MZxN1oq2jHGVRUnlY5A,4070
 payme/types/response/webhook.py,sha256=Br6Gr_-h7sCmOc3ag7H5yBryB8j-bm2mrt39Cy_Fy2E,2918
-payme_pkg-3.0.19.dist-info/LICENSE.txt,sha256=75dBVYmbzWUhwtaB1MSZfj-M-PGaMmeT9UVPli2-ZJ0,1086
-payme_pkg-3.0.19.dist-info/METADATA,sha256=ufH7t3XvVaM7oLSFSHv_oXQ663wygOaOVD64eiOWDqY,5534
-payme_pkg-3.0.19.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-payme_pkg-3.0.19.dist-info/top_level.txt,sha256=8mN-hGAa38pWbhrKHFs9CZywPCdidhMuwPKwuFJa0qw,6
-payme_pkg-3.0.19.dist-info/RECORD,,
+payme_pkg-3.0.20.dist-info/LICENSE.txt,sha256=75dBVYmbzWUhwtaB1MSZfj-M-PGaMmeT9UVPli2-ZJ0,1086
+payme_pkg-3.0.20.dist-info/METADATA,sha256=T_NZ7hWGdfTLYcgTYfq7QG693MG088odgIQYz1ZdrKY,5492
+payme_pkg-3.0.20.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+payme_pkg-3.0.20.dist-info/top_level.txt,sha256=8mN-hGAa38pWbhrKHFs9CZywPCdidhMuwPKwuFJa0qw,6
+payme_pkg-3.0.20.dist-info/RECORD,,

{payme_pkg-3.0.19.dist-info → payme_pkg-3.0.20.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.1)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any