payme-pkg 3.0.18__tar.gz → 3.0.20__tar.gz

{payme_pkg-3.0.18 → payme_pkg-3.0.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: payme-pkg
-Version: 3.0.18
+Version: 3.0.20
 Home-page: https://github.com/Muhammadali-Akbarov/payme-pkg
 Author: Muhammadali Akbarov
 Author-email: muhammadali17abc@gmail.com
@@ -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.18 → payme_pkg-3.0.20}/README.md

@@ -125,7 +125,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.18 → payme_pkg-3.0.20}/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_pkg-3.0.18 → payme_pkg-3.0.20}/payme/exceptions/general.py

@@ -272,4 +272,5 @@ errors_map = {
     -31602: ReceiptsNotFoundError,
     -32500: InvalidTokenFormat,
     -31601: UnknownPartnerError,
+    -32400: SystemError
 }

payme_pkg-3.0.20/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_pkg-3.0.18 → payme_pkg-3.0.20}/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_pkg-3.0.18 → payme_pkg-3.0.20}/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.18 → payme_pkg-3.0.20}/payme_pkg.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: payme-pkg
-Version: 3.0.18
+Version: 3.0.20
 Home-page: https://github.com/Muhammadali-Akbarov/payme-pkg
 Author: Muhammadali Akbarov
 Author-email: muhammadali17abc@gmail.com
@@ -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.18 → payme_pkg-3.0.20}/payme_pkg.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ payme/classes/receipts.py
 payme/exceptions/__init__.py
 payme/exceptions/general.py
 payme/exceptions/webhook.py
+payme/migrations/0001_initial.py
 payme/migrations/__init__.py
 payme/types/__init__.py
 payme/types/request/__init__.py

{payme_pkg-3.0.18 → payme_pkg-3.0.20}/setup.py

@@ -1,5 +1,6 @@
 import pathlib
-from setuptools import setup, find_packages
+
+from setuptools import find_packages, setup
 
 here = pathlib.Path(__file__).parent.resolve()
 
@@ -7,7 +8,7 @@ long_description = (here / "README.md").read_text(encoding="utf-8")
 
 setup(
     name='payme-pkg',
-    version='3.0.18',
+    version='3.0.20',
     license='MIT',
     author="Muhammadali Akbarov",
     author_email='muhammadali17abc@gmail.com',