payme-pkg 3.0.24__py3-none-any.whl → 3.0.28__py3-none-any.whl

payme/admin.py

@@ -8,7 +8,7 @@ class PaymeTransactionsUI(admin.ModelAdmin):
     """
     Custom admin interface for PaymeTransactions model.
     """
-    list_display = ('id', 'state', 'cancel_reason', 'created_at')
+    list_display = ('pk', 'state', 'cancel_reason', 'created_at')
     list_filter = ('state', 'cancel_reason', 'created_at')
     search_fields = ('transaction_id', 'account_id')
     ordering = ('-created_at',)

payme/classes/cards.py

@@ -19,7 +19,7 @@ class Cards:
     services. It allows you to create new cards and retrieve verification
     codes for existing cards.
     """
-    def __init__(self, url: str, payme_id: str) -> "Cards":
+    def __init__(self, url: str, payme_id: str) -> None:
         """
         Initialize the Cards client.
 

payme/classes/client.py

@@ -1,5 +1,4 @@
-
-from typing import Union
+import typing as t
 
 from payme.const import Networks
 from payme.classes.cards import Cards
@@ -11,14 +10,14 @@ class Payme:
     """
     The payme class provides a simple interface
     """
+
     def __init__(
         self,
         payme_id: str,
-        fallback_id: Union[str, None] = None,
-        payme_key: Union[str, None] = None,
-        is_test_mode: bool = False
-    ):
-
+        fallback_id: t.Optional[str] = None,
+        payme_key: t.Optional[str] = None,
+        is_test_mode: bool = False,
+    ) -> None:
         # initialize payme network
         url = Networks.PROD_NET.value
 
@@ -26,5 +25,8 @@ class Payme:
             url = Networks.TEST_NET.value
 
         self.cards = Cards(url=url, payme_id=payme_id)
-        self.initializer = Initializer(payme_id=payme_id, fallback_id=fallback_id, is_test_mode=is_test_mode)
-        self.receipts = Receipts(url=url, payme_id=payme_id, payme_key=payme_key)  # noqa
+        self.initializer = Initializer(
+            payme_id=payme_id, fallback_id=fallback_id, is_test_mode=is_test_mode
+        )
+        if payme_key:
+            self.receipts = Receipts(url=url, payme_id=payme_id, payme_key=payme_key)

payme/classes/initializer.py

@@ -13,17 +13,14 @@ class Initializer:
         The Payme ID associated with your account
     """
 
-    def __init__(self, payme_id: str = None, fallback_id: str = None, is_test_mode: bool = False):
+    def __init__(
+        self, payme_id: str = None, fallback_id: str = None, is_test_mode: bool = False
+    ) -> None:
         self.payme_id = payme_id
         self.fallback_id = fallback_id
         self.is_test_mode = is_test_mode
 
-    def generate_pay_link(
-        self,
-        id: int,
-        amount: int,
-        return_url: str
-    ) -> str:
+    def generate_pay_link(self, id: int, amount: int, return_url: str) -> str:
         """
         Generate a payment link for a specific order.
 
@@ -52,9 +49,7 @@ class Initializer:
         https://developer.help.paycom.uz/initsializatsiya-platezhey/
         """
         amount = amount * 100  # Convert amount to the smallest currency unit
-        params = (
-            f'm={self.payme_id};ac.{settings.PAYME_ACCOUNT_FIELD}={id};a={amount};c={return_url}'
-        )
+        params = f"m={self.payme_id};ac.{settings.PAYME_ACCOUNT_FIELD}={id};a={amount};c={return_url}"
         params = base64.b64encode(params.encode("utf-8")).decode("utf-8")
 
         if self.is_test_mode is True:

payme/classes/receipts.py

@@ -1,4 +1,6 @@
-from typing import Union, Optional
+import typing as t
+
+from urllib.parse import parse_qs
 
 from payme.classes.cards import Cards
 from payme.classes.http import HttpClient
@@ -13,6 +15,7 @@ ALLOWED_METHODS = {
     "receipts.check": response.CheckResponse,
     "receipts.get": response.GetResponse,
     "receipts.get_all": response.GetAllResponse,
+    "receipts.set_fiscal_data": response.SetFiscalDataResponse,
 }
 
 
@@ -20,7 +23,8 @@ class Receipts:
     """
     The Receipts class provides methods to interact with the Payme Receipts.
     """
-    def __init__(self, payme_id: str, payme_key: str, url: str) -> "Receipts":
+
+    def __init__(self, payme_id: str, payme_key: str, url: str) -> None:
         """
         Initialize the Receipts client.
 
@@ -32,25 +36,25 @@ class Receipts:
 
         headers = {
             "X-Auth": f"{payme_id}:{payme_key}",
-            "Content-Type": "application/json"
+            "Content-Type": "application/json",
         }
         self.http = HttpClient(url, headers)
 
     def create(
         self,
         account: dict,
-        amount: Union[float, int],
-        description: Optional[str] = None,
-        detail: Optional[dict] = None,
-        timeout: int = 10
+        amount: t.Union[float, int],
+        description: t.Optional[str] = None,
+        detail: t.Optional[t.Dict] = None,
+        timeout: int = 10,
     ) -> response.CreateResponse:
         """
         Create a new receipt.
 
         :param account: The account details for the receipt.
         :param amount: The amount of the receipt.
-        :param description: Optional description for the receipt.
-        :param detail: Optional additional details for the receipt.
+        :param description: t.Optional description for the receipt.
+        :param detail: t.Optional additional details for the receipt.
         :param timeout: The request timeout duration in seconds (default 10).
         """
         method = "receipts.create"
@@ -58,7 +62,7 @@ class Receipts:
             "amount": amount,
             "account": account,
             "description": description,
-            "detail": detail
+            "detail": detail,
         }
         return self._post_request(method, params, timeout)
 
@@ -74,10 +78,7 @@ class Receipts:
             The request timeout duration in seconds (default is 10).
         """
         method = "receipts.pay"
-        params = {
-            "id": receipts_id,
-            "token": token
-        }
+        params = {"id": receipts_id, "token": token}
         return self._post_request(method, params, timeout)
 
     def send(
@@ -91,15 +92,10 @@ class Receipts:
         :param timeout: The request timeout duration in seconds (default 10).
         """
         method = "receipts.send"
-        params = {
-            "id": receipts_id,
-            "phone": phone
-        }
+        params = {"id": receipts_id, "phone": phone}
         return self._post_request(method, params, timeout)
 
-    def cancel(
-        self, receipts_id: str, timeout: int = 10
-    ) -> response.CancelResponse:
+    def cancel(self, receipts_id: str, timeout: int = 10) -> response.CancelResponse:
         """
         Cancel the receipt.
 
@@ -107,14 +103,10 @@ class Receipts:
         :param timeout: The request timeout duration in seconds (default 10).
         """
         method = "receipts.cancel"
-        params = {
-            "id": receipts_id
-        }
+        params = {"id": receipts_id}
         return self._post_request(method, params, timeout)
 
-    def check(
-        self, receipts_id: str, timeout: int = 10
-    ) -> response.CheckResponse:
+    def check(self, receipts_id: str, timeout: int = 10) -> response.CheckResponse:
         """
         Check the status of a cheque.
 
@@ -122,14 +114,10 @@ class Receipts:
         :param timeout: The request timeout duration in seconds (default 10).
         """
         method = "receipts.check"
-        params = {
-            "id": receipts_id
-        }
+        params = {"id": receipts_id}
         return self._post_request(method, params, timeout)
 
-    def get(
-        self, receipts_id: str, timeout: int = 10
-    ) -> response.GetResponse:
+    def get(self, receipts_id: str, timeout: int = 10) -> response.GetResponse:
         """
         Get the details of a specific cheque.
 
@@ -137,29 +125,52 @@ class Receipts:
         :param timeout: The request timeout duration in seconds (default 10).
         """
         method = "receipts.get"
-        params = {
-            "id": receipts_id
-        }
+        params = {"id": receipts_id}
         return self._post_request(method, params, timeout)
 
     def get_all(
         self, count: int, from_: int, to: int, offset: int, timeout: int = 10
     ) -> response.GetAllResponse:
         """
-        Get all cheques for a specific account.
+         Get all cheques for a specific account.
 
-        :param count: The number of cheques to retrieve.
-        :param from_: The start index of the cheques to retrieve.
-        :param to: The end index of the cheques to retrieve.
-        :param offset: The offset for pagination.
-       :param timeout: The request timeout duration in seconds (default 10).
+         :param count: The number of cheques to retrieve.
+         :param from_: The start index of the cheques to retrieve.
+         :param to: The end index of the cheques to retrieve.
+         :param offset: The offset for pagination.
+        :param timeout: The request timeout duration in seconds (default 10).
         """
         method = "receipts.get_all"
+        params = {"count": count, "from": from_, "to": to, "offset": offset}
+        return self._post_request(method, params, timeout)
+
+    def set_fiscal_data(
+        self, receipt_id: str, qr_code_url: str, timeout: int = 10
+    ) -> response.SetFiscalDataResponse:
+        """
+        Get all cheques for a specific account.
+
+        :param receipt_id: The ID of the check used for payment.
+        :param qr_code_url: URL of the fiscal check from the ofd.uz.
+        :param timeout: The request timeout duration in seconds (default 10).
+        """
+        method = "receipts.set_fiscal_data"
+
+        check_params = parse_qs(qr_code_url.split("?")[1])
+        terminal_id = check_params["t"][0]
+        fiscal_sign = check_params["s"][0]
+        fiscal_receipt_id = check_params["r"][0]
+        fiscal_date = check_params["c"][0]
+
         params = {
-            "count": count,
-            "from": from_,
-            "to": to,
-            "offset": offset
+            "id": receipt_id,  # required
+            "fiscal_data": {
+                "terminal_id": terminal_id,
+                "receipt_id": int(fiscal_receipt_id),  # required
+                "date": fiscal_date,
+                "fiscal_sign": fiscal_sign,
+                "qr_code_url": qr_code_url,  # required
+            }
         }
         return self._post_request(method, params, timeout)
 
@@ -185,6 +196,7 @@ class Receipts:
         covering creation, payment, sending, cancellation, status checks,
         retrieval of a single receipt, and retrieval of multiple receipts.
         """
+
         # Helper to assert conditions with messaging
         def assert_condition(condition, message, test_case):
             self._assert_and_print(condition, message, test_case=test_case)
@@ -195,14 +207,14 @@ class Receipts:
                 account={"id": 12345},
                 amount=1000,
                 description="Test receipt",
-                detail={"key": "value"}
+                detail={"key": "value"},
             )
 
         # Test 1: Initialization check
         assert_condition(
             isinstance(self, Receipts),
             "Initialized Receipts class successfully.",
-            test_case="Initialization Test"
+            test_case="Initialization Test",
         )
 
         # Test 2: Create and Pay Receipt
@@ -210,21 +222,19 @@ class Receipts:
         assert_condition(
             isinstance(create_response, response.CreateResponse),
             "Created a new receipt successfully.",
-            test_case="Receipt Creation Test"
+            test_case="Receipt Creation Test",
         )
 
         # pylint: disable=W0212
         assert_condition(
             isinstance(create_response.result.receipt._id, str),
             "Created a valid receipt ID.",
-            test_case="Receipt ID Test"
+            test_case="Receipt ID Test",
         )
 
         # Prepare card and verification
         cards_create_response = self.__cards.create(
-            number="8600495473316478",
-            expire="0399",
-            save=True
+            number="8600495473316478", expire="0399", save=True
         )
         token = cards_create_response.result.card.token
         self.__cards.get_verify_code(token=token)
@@ -236,7 +246,7 @@ class Receipts:
         assert_condition(
             pay_response.result.receipt.state == 4,
             "Paid the receipt successfully.",
-            test_case="Payment Test"
+            test_case="Payment Test",
         )
 
         # Test 3: Create and Send Receipt
@@ -246,7 +256,7 @@ class Receipts:
         assert_condition(
             send_response.result.success is True,
             "Sent the receipt successfully.",
-            test_case="Send Test"
+            test_case="Send Test",
         )
 
         # Test 4: Create and Cancel Receipt
@@ -256,7 +266,7 @@ class Receipts:
         assert_condition(
             cancel_response.result.receipt.state == 50,
             "Cancelled the receipt successfully.",
-            test_case="Cancel Test"
+            test_case="Cancel Test",
         )
 
         # Test 5: Check Receipt Status
@@ -264,7 +274,7 @@ class Receipts:
         assert_condition(
             check_response.result.state == 50,
             "Checked the receipt status successfully.",
-            test_case="Check Test"
+            test_case="Check Test",
         )
 
         # Test 6: Get Receipt Details
@@ -272,27 +282,21 @@ class Receipts:
         assert_condition(
             get_response.result.receipt._id == receipt_id,
             "Retrieved the receipt details successfully.",
-            test_case="Get Test"
+            test_case="Get Test",
         )
 
         # Test 7: Retrieve All Receipts
         get_all_response = self.get_all(
-            count=1,
-            from_=1730322122000,
-            to=1730398982000,
-            offset=0
+            count=1, from_=1730322122000, to=1730398982000, offset=0
         )
         assert_condition(
             isinstance(get_all_response.result, list),
             "Retrieved all receipts successfully.",
-            test_case="Get All Test"
+            test_case="Get All Test",
         )
 
     # pylint: disable=W0212
     def _assert_and_print(
-        self,
-        condition: bool,
-        success_message: str,
-        test_case: Optional[str] = None
+        self, condition: bool, success_message: str, test_case: t.Optional[str] = None
     ):
         self.__cards._assert_and_print(condition, success_message, test_case)

payme/exceptions/webhook.py

@@ -1,28 +1,31 @@
 """
 Init Payme base exception.
 """
+
 import logging
+import typing as t
+
+from rest_framework import status
 from rest_framework.exceptions import APIException
 
 logger = logging.getLogger(__name__)
 
+MessageT = t.Optional[t.Union[str, t.Dict[str, str]]]
+
 
 class BasePaymeException(APIException):
     """
     BasePaymeException inherits from APIException.
     """
-    status_code = 200
-    error_code = None
-    message = None
+
+    status_code: int = status.HTTP_200_OK
+    error_code: t.Optional[int] = None
+    message: MessageT = None
 
     # pylint: disable=super-init-not-called
     def __init__(self, message: str = None):
         detail: dict = {
-            "error": {
-                "code": self.error_code,
-                "message": self.message,
-                "data": message
-            }
+            "error": {"code": self.error_code, "message": self.message, "data": message}
         }
         logger.error(f"Payme error detail: {detail}")
         self.detail = detail
@@ -34,7 +37,8 @@ class PermissionDenied(BasePaymeException):
 
     Raised when the client is not allowed to access the server.
     """
-    status_code = 200
+
+    status_code = status.HTTP_200_OK
     error_code = -32504
     message = "Permission denied."
 
@@ -45,12 +49,13 @@ class InternalServiceError(BasePaymeException):
 
     Raised when a transaction fails to perform.
     """
-    status_code = 200
+
+    status_code = status.HTTP_200_OK
     error_code = -32400
     message = {
         "uz": "Tizimda xatolik yuzaga keldi.",
         "ru": "Внутренняя ошибка сервиса.",
-        "en": "Internal service error."
+        "en": "Internal service error.",
     }
 
 
@@ -60,7 +65,8 @@ class MethodNotFound(BasePaymeException):
 
     Raised when the requested method does not exist.
     """
-    status_code = 405
+
+    status_code = status.HTTP_405_METHOD_NOT_ALLOWED
     error_code = -32601
     message = "Method not found."
 
@@ -71,12 +77,13 @@ class AccountDoesNotExist(BasePaymeException):
 
     Raised when an account does not exist or has been deleted.
     """
-    status_code = 200
+
+    status_code = status.HTTP_200_OK
     error_code = -31050
     message = {
         "uz": "Hisob topilmadi.",
         "ru": "Счет не найден.",
-        "en": "Account does not exist."
+        "en": "Account does not exist.",
     }
 
 
@@ -86,12 +93,13 @@ class IncorrectAmount(BasePaymeException):
 
     Raised when the provided amount is incorrect.
     """
-    status_code = 200
+
+    status_code = status.HTTP_200_OK
     error_code = -31001
     message = {
-        'ru': 'Неверная сумма.',
-        'uz': "Noto'g'ri summa.",
-        'en': 'Incorrect amount.'
+        "ru": "Неверная сумма.",
+        "uz": "Noto'g'ri summa.",
+        "en": "Incorrect amount.",
     }
 
 
@@ -107,12 +115,13 @@ class TransactionAlreadyExists(BasePaymeException):
         error_code (int): The specific error code for this exception.
         message (dict): A dictionary containing localized error messages.
     """
-    status_code = 200
+
+    status_code = status.HTTP_200_OK
     error_code = -31099
     message = {
         "uz": "Tranzaksiya allaqachon mavjud.",
         "ru": "Транзакция уже существует.",
-        "en": "Transaction already exists."
+        "en": "Transaction already exists.",
     }
 
 
@@ -122,12 +131,13 @@ class InvalidFiscalParams(BasePaymeException):
 
     Raised when the provided fiscal parameters are invalid.
     """
-    status_code = 200
+
+    status_code = status.HTTP_200_OK
     error_code = -32602
     message = {
         "uz": "Fiskal parameterlarida kamchiliklar bor",
         "ru": "Неверные фискальные параметры.",
-        "en": "Invalid fiscal parameters."
+        "en": "Invalid fiscal parameters.",
     }
 
 
@@ -137,12 +147,13 @@ class InvalidAccount(BasePaymeException):
 
     Raised when the provided account is invalid.
     """
-    status_code = 200
+
+    status_code = status.HTTP_200_OK
     error_code = -32400
     message = {
         "uz": "Hisob nomida kamchilik bor",
         "ru": "Неверный номер счета.",
-        "en": "Invalid account."
+        "en": "Invalid account.",
     }
 
 
@@ -153,5 +164,5 @@ exception_whitelist = (
     AccountDoesNotExist,
     TransactionAlreadyExists,
     InvalidFiscalParams,
-    InvalidAccount
+    InvalidAccount,
 )

payme/migrations/0004_alter_paymetransactions_account_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.5 on 2025-08-25 19:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("payme", "0003_alter_paymetransactions_fiscal_data"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="paymetransactions",
+            name="account_id",
+            field=models.CharField(max_length=256),
+        ),
+    ]

payme/models.py

@@ -26,7 +26,7 @@ class PaymeTransactions(models.Model):
     ]
 
     transaction_id = models.CharField(max_length=50)
-    account_id = models.BigIntegerField(null=False)
+    account_id = models.CharField(max_length=256, null=False)
     amount = models.DecimalField(max_digits=10, decimal_places=2)
     state = models.IntegerField(choices=STATE, default=CREATED)
     fiscal_data = models.JSONField(default=dict)

payme/types/response/cards.py

@@ -1,14 +1,15 @@
-from typing import Dict, Optional
+import typing as t
 from dataclasses import dataclass
 
 
+@dataclass
 class Common:
     """
     The common response structure.
     """
 
     @classmethod
-    def from_dict(cls, data: Dict):
+    def from_dict(cls, data: t.Dict):
         """
         Prepare fields for nested dataclasses
         """
@@ -30,13 +31,14 @@ class Card(Common):
     """
     The card object represents a credit card.
     """
+
     number: str
     expire: str
     token: str
     recurrent: bool
     verify: bool
     type: str
-    number_hash: Optional[str] = None
+    number_hash: t.Optional[str] = None
 
 
 @dataclass
@@ -44,6 +46,7 @@ class Result(Common):
     """
     The result object contains the created card.
     """
+
     card: Card
 
 
@@ -52,6 +55,7 @@ class CardsCreateResponse(Common):
     """
     The cards.create response.
     """
+
     jsonrpc: str
     result: Result
 
@@ -61,6 +65,7 @@ class VerifyResult(Common):
     """
     The result object for the verification response.
     """
+
     sent: bool
     phone: str
     wait: int
@@ -71,6 +76,7 @@ class GetVerifyResponse(Common):
     """
     The verification response structure.
     """
+
     jsonrpc: str
     result: VerifyResult
 
@@ -80,6 +86,7 @@ class VerifyResponse(Common):
     """
     The verification response structure.
     """
+
     jsonrpc: str
     result: Result
 
@@ -89,6 +96,7 @@ class RemoveCardResult(Common):
     """
     The result object for the removal response.
     """
+
     success: bool
 
 
@@ -97,6 +105,7 @@ class RemoveResponse(Common):
     """
     The remove response structure.
     """
+
     jsonrpc: str
     result: RemoveCardResult
 
@@ -106,5 +115,6 @@ class CheckResponse(Common):
     """
     The check response structure.
     """
+
     jsonrpc: str
     result: Result

payme/types/response/receipts.py

@@ -1,16 +1,18 @@
+import typing as t
 from dataclasses import dataclass
-from typing import Dict, Optional, Union
 
 
+@dataclass
 class Common:
     """
     The common response structure.
     """
+
     jsonrpc: str
     id: int
 
     @classmethod
-    def from_dict(cls, data: Dict):
+    def from_dict(cls, data: t.Dict):
         """
         Prepare fields for nested dataclasses
         """
@@ -32,6 +34,7 @@ class Account(Common):
     """
     The account object represents a user's banking account.
     """
+
     _id: str
     account_number: str
     account_name: str
@@ -46,10 +49,11 @@ class PaymentMethod(Common):
     """
     The payment method object represents a user's payment method.
     """
+
     name: str
     title: str
     value: str
-    main: Optional[bool] = None
+    main: t.Optional[bool] = None
 
 
 @dataclass
@@ -57,9 +61,10 @@ class Detail(Common):
     """
     The detail object represents additional details for a receipt.
     """
-    discount: Optional[str] = None
-    shipping: Optional[str] = None
-    items: Optional[str] = None
+
+    discount: t.Optional[str] = None
+    shipping: t.Optional[str] = None
+    items: t.Optional[str] = None
 
 
 # pylint: disable=C0103
@@ -68,6 +73,7 @@ class MerchantEpos(Common):
     """
     The merchantEpos object represents a user's ePOS.
     """
+
     eposId: str
     eposName: str
     eposType: str
@@ -79,9 +85,10 @@ class Meta(Common):
     """
     The meta object represents additional metadata for a receipt.
     """
-    source: any = None
-    owner: any = None
-    host: any = None
+
+    source: t.Any = None
+    owner: t.Any = None
+    host: t.Any = None
 
 
 @dataclass
@@ -89,17 +96,18 @@ class Merchant:
     """
     The merchant object represents a user's merchant.
     """
+
     _id: str
     name: str
     organization: str
-    address: Optional[str] = None
-    business_id: Optional[str] = None
-    epos: Optional[MerchantEpos] = None
-    restrictions: Optional[str] = None
-    date: Optional[int] = None
-    logo: Optional[str] = None
-    type: Optional[str] = None
-    terms: Optional[str] = None
+    address: t.Optional[str] = None
+    business_id: t.Optional[str] = None
+    epos: t.Optional[MerchantEpos] = None
+    restrictions: t.Optional[str] = None
+    date: t.Optional[int] = None
+    logo: t.Optional[str] = None
+    type: t.Optional[str] = None
+    terms: t.Optional[str] = None
 
 
 @dataclass
@@ -107,6 +115,7 @@ class Payer(Common):
     """
     The payer object represents a user's payer.
     """
+
     phone: str
 
 
@@ -115,6 +124,7 @@ class Receipt(Common):
     """
     The receipt object represents a payment receipt.
     """
+
     _id: str
     create_time: int
     pay_time: int
@@ -123,19 +133,19 @@ class Receipt(Common):
     type: int
     external: bool
     operation: int
-    error: any = None
-    description: str = None
-    detail: Detail = None
-    currency: int = None
-    commission: int = None
-    card: str = None
-    creator: str = None
-    payer: Payer = None
-    amount: Union[float, int] = None
-    account: list[Account] = None
-    merchant: Merchant = None
-    processing_id: str = None
-    meta: Meta = None
+    error: t.Any = None
+    description: t.Optional[str] = None
+    detail: t.Optional[Detail] = None
+    currency: t.Optional[int] = None
+    commission: t.Optional[int] = None
+    card: t.Optional[str] = None
+    creator: t.Optional[str] = None
+    payer: t.Optional[Payer] = None
+    amount: t.Optional[t.Union[float, int]] = None
+    account: t.Optional[t.List[Account]] = None
+    merchant: t.Optional[Merchant] = None
+    processing_id: t.Optional[str] = None
+    meta: t.Optional[Meta] = None
 
 
 @dataclass
@@ -143,6 +153,7 @@ class CreateResult(Common):
     """
     The result object for the create response.
     """
+
     receipt: Receipt
 
 
@@ -151,6 +162,7 @@ class CreateResponse(Common):
     """
     The create response structure.
     """
+
     result: CreateResult
 
 
@@ -166,6 +178,7 @@ class SendResult(Common):
     """
     The result object for the send response.
     """
+
     success: bool
 
 
@@ -174,6 +187,7 @@ class SendResponse(Common):
     """
     The send response structure.
     """
+
     result: SendResult
 
 
@@ -189,6 +203,7 @@ class CheckResult(Common):
     """
     The result object for the check response.
     """
+
     state: int
 
 
@@ -197,6 +212,7 @@ class CheckResponse(Common):
     """
     The check response structure.
     """
+
     result: CheckResult
 
 
@@ -213,3 +229,11 @@ class GetAllResponse(Common):
     The result object for the get all response.
     """
     result: list[Receipt] = None
+
+
+@dataclass
+class SetFiscalDataResponse(Common):
+    """
+    The result object for the set_fiscal_data response.
+    """
+    result: SendResult

payme/types/response/webhook.py

@@ -1,15 +1,16 @@
+import typing as t
 from dataclasses import dataclass, field
-from typing import List, Optional, Dict
 
 
 class CommonResponse:
     """
     The common response structure
     """
+
     def as_resp(self):
-        response = {'result': {}}
+        response = {"result": {}}
         for key, value in self.__dict__.items():
-            response['result'][key] = value
+            response["result"][key] = value
         return response
 
 
@@ -18,6 +19,7 @@ class Shipping(CommonResponse):
     """
     Shipping information response structure
     """
+
     title: str
     price: int
 
@@ -27,6 +29,7 @@ class Item(CommonResponse):
     """
     Item information response structure
     """
+
     discount: int
     title: str
     price: int
@@ -45,7 +48,7 @@ class Item(CommonResponse):
             "code": self.code,
             "units": self.units,
             "vat_percent": self.vat_percent,
-            "package_code": self.package_code
+            "package_code": self.package_code,
         }
 
 
@@ -54,11 +57,12 @@ class CheckPerformTransaction(CommonResponse):
     """
     Receipt information response structure for transaction checks.
     """
+
     allow: bool
-    additional: Optional[Dict[str, str]] = None
-    receipt_type: Optional[int] = None
-    shipping: Optional[Shipping] = None
-    items: List[Item] = field(default_factory=list)
+    additional: t.Optional[t.Dict[str, str]] = None
+    receipt_type: t.Optional[int] = None
+    shipping: t.Optional[Shipping] = None
+    items: t.List[Item] = field(default_factory=list)
 
     def add_item(self, item: Item):
         self.items.append(item)
@@ -90,9 +94,10 @@ class CreateTransaction(CommonResponse):
     """
     The create transaction request
     """
+
     transaction: str
     state: str
-    create_time: str
+    create_time: int
 
 
 @dataclass
@@ -100,9 +105,10 @@ class PerformTransaction(CommonResponse):
     """
     The perform transaction response
     """
+
     transaction: str
     state: str
-    perform_time: str
+    perform_time: int
 
 
 @dataclass
@@ -110,6 +116,7 @@ class CancelTransaction(CommonResponse):
     """
     The cancel transaction request
     """
+
     transaction: str
     state: str
     cancel_time: str
@@ -120,12 +127,13 @@ class CheckTransaction(CommonResponse):
     """
     The check transaction request
     """
+
     transaction: str
     state: str
     reason: str
-    create_time: str
-    perform_time: Optional[str] = None
-    cancel_time: Optional[str] = None
+    create_time: int
+    perform_time: t.Optional[int] = None
+    cancel_time: t.Optional[int] = None
 
 
 @dataclass
@@ -133,7 +141,8 @@ class GetStatement(CommonResponse):
     """
     The check perform transactions response
     """
-    transactions: List[str]
+
+    transactions: t.List[t.Dict[str, str | int | t.Dict[str, str | int]]]
 
 
 @dataclass
@@ -141,4 +150,5 @@ class SetFiscalData(CommonResponse):
     """
     The set fiscal data request
     """
+
     success: bool

payme/views.py

@@ -4,6 +4,7 @@ import logging
 from decimal import Decimal
 
 from django.conf import settings
+from django.core.exceptions import ValidationError
 from django.utils.module_loading import import_string
 from rest_framework import views
 from rest_framework.response import Response
@@ -33,6 +34,10 @@ def handle_exceptions(func):
             logger.error(f"Account does not exist: {exc} {args} {kwargs}")
             raise exceptions.AccountDoesNotExist(str(exc)) from exc
 
+        except ValidationError as exc:
+            logger.error(f"Invalid account identifier {exc}")
+            raise exceptions.AccountDoesNotExist("Invalid account identifier.")
+
         except PaymeTransactions.DoesNotExist as exc:
             logger.error(f"Transaction does not exist: {exc} {args} {kwargs}")
             raise exceptions.AccountDoesNotExist(str(exc)) from exc
@@ -112,17 +117,11 @@ class PaymeWebHookAPIView(views.APIView):
         """
         Fetch account based on settings and params.
         """
-        account_field = settings.PAYME_ACCOUNT_FIELD
-
-        account_value = params['account'].get(account_field)
+        account_value = params["account"].get(settings.PAYME_ACCOUNT_FIELD)
         if not account_value:
             raise exceptions.InvalidAccount("Missing account field in parameters.")
 
-        # hard change
-        if account_field == "order_id":
-            account_field = "id"
-
-        account = AccountModel.objects.get(**{account_field: account_value})
+        account = AccountModel.objects.get(pk=account_value)
 
         return account
 
@@ -169,13 +168,17 @@ class PaymeWebHookAPIView(views.APIView):
         defaults = {
             "amount": amount,
             "state": PaymeTransactions.INITIATING,
-            "account_id": account.id,
+            "account_id": account.pk,
         }
 
         # 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_id=account.id).exclude(transaction_id=transaction_id).exists():
+            if (
+                PaymeTransactions.objects.filter(account_id=account.pk)
+                .exclude(transaction_id=transaction_id)
+                .exists()
+            ):
                 message = f"Transaction {transaction_id} already exists (Payme)."
                 logger.warning(message)
                 raise exceptions.TransactionAlreadyExists(message)
@@ -297,6 +300,7 @@ class PaymeWebHookAPIView(views.APIView):
                 "create_time": time_to_payme(transaction.created_at),
                 "perform_time": time_to_payme(transaction.performed_at),
                 "cancel_time": time_to_payme(transaction.cancelled_at),
+                "time": time_to_payme(transaction.created_at),
             })
 
         return result.as_resp()

{payme_pkg-3.0.24.dist-info → payme_pkg-3.0.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: payme-pkg
-Version: 3.0.24
+Version: 3.0.28
 Home-page: https://github.com/Muhammadali-Akbarov/payme-pkg
 Author: Muhammadali Akbarov
 Author-email: muhammadali17abc@gmail.com
@@ -8,9 +8,18 @@ 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: dataclasses==0.*; python_version < "3.7"
+Requires-Dist: djangorestframework==3.*
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
 
 <h1 align="center">Payme Software Development Kit</h1>
 

payme_pkg-3.0.28.dist-info/RECORD

@@ -0,0 +1,33 @@
+payme/__init__.py,sha256=dzLIyA9kQl0sO6z9nHkZDTjkfiI1BepdifKtJbjX2Cw,46
+payme/admin.py,sha256=dEpd49Qo-LqhRH5FgZ8EiwVYOL4RxNrJa3uP_bkOoSE,561
+payme/apps.py,sha256=HHCY4zUNKPcjz25z0MahZcks0lsAxTGPS0Ml3U4DhZc,142
+payme/const.py,sha256=azndfKR53fe7mDfGW82Q-kwWdMu3x4S1upKc4gkYdlA,214
+payme/models.py,sha256=dpFCQOPXCU1JjNJgqjUb7rUxflSnCkiTCwaTzWWCbD0,4189
+payme/urls.py,sha256=_oUOwxW1Suc5TUmnj--lySYbotRg4yTDkDLJU20CGjE,145
+payme/util.py,sha256=UFb4cEnaufS_hh9C_0z079CSgJGivYjIgOl2iAFrBMs,625
+payme/views.py,sha256=Zd9bp1ZBwRsfQ3IPhwf6dLkXnBr9nuCfP83V0K6VBu8,13084
+payme/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+payme/classes/cards.py,sha256=hjg3Wg189INeStGArQUnoxAAutKFbB6BnwYtMGLA0x0,7621
+payme/classes/client.py,sha256=HqJdFvgSBKxYsitAukYp6_UEa3J6ChVBUbUC1aGR2XM,904
+payme/classes/http.py,sha256=OufMeHrj0jTomDJx_6go9GC1NtA6QpQCxIiM3ISy3Eo,3530
+payme/classes/initializer.py,sha256=Pwb1oCUZzcW-ftFzaLMr8ySguC7fKsbeQ4vGmupYliw,2448
+payme/classes/receipts.py,sha256=J_ubm1zpqqUY9vOCeSUzJkwtRXYxagaRzzvJZmuP74Q,11010
+payme/exceptions/__init__.py,sha256=HoBFnDA3eW_xWZiFlonJK4vhBDTsuik91tvgzXTy8KA,94
+payme/exceptions/general.py,sha256=-rkzvuLi6VoITMLrszrP7c-gM8X6lM8AWttd770KSJc,7679
+payme/exceptions/webhook.py,sha256=ZW6HnjxZDQScaX0WLXltcEllCwl1m0JuCtEnR28shME,4090
+payme/migrations/0001_initial.py,sha256=jdtGB6bN-Za6N9XU8IuWsa5FbonGIRH5ro9xHwT7JmU,2128
+payme/migrations/0002_paymetransactions_fiscal_data.py,sha256=z-gxPP3IgN-XNPx6DEZUQ4E1XZceVnnpvUTcSkcv70c,395
+payme/migrations/0003_alter_paymetransactions_fiscal_data.py,sha256=Ish4Seup9pdEM0g4q4RQKrvUOWB2DXPN0RmIScKI2IQ,410
+payme/migrations/0004_alter_paymetransactions_account_id.py,sha256=Kzihw4-HHBG43fZ2WU-qLLU-kxN-plfS3mLeIEZGKxA,417
+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
+payme/types/response/__init__.py,sha256=GAj5pjZ9oIO67T6YMiPd1fhTIvGrPfTv96tykfeChQc,81
+payme/types/response/cards.py,sha256=ncGaE5NzI5AJLbrzR41G7jkUHXO71BnrIiaiV-lKsPo,2006
+payme/types/response/receipts.py,sha256=zwbe74sKS9lQ7VSz5LnPkdlZZ_WCWorU-P2J0uxRuic,4401
+payme/types/response/webhook.py,sha256=E8IVD683T7wra4OxUWq5T6y7HGpjwOVk8ak0tS0b-_o,3084
+payme_pkg-3.0.28.dist-info/licenses/LICENSE.txt,sha256=75dBVYmbzWUhwtaB1MSZfj-M-PGaMmeT9UVPli2-ZJ0,1086
+payme_pkg-3.0.28.dist-info/METADATA,sha256=vaTLw91LWEOD825jfZ7tcruIOjwJRSOCCYIEHNTgvl4,5554
+payme_pkg-3.0.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+payme_pkg-3.0.28.dist-info/top_level.txt,sha256=8mN-hGAa38pWbhrKHFs9CZywPCdidhMuwPKwuFJa0qw,6
+payme_pkg-3.0.28.dist-info/RECORD,,

{payme_pkg-3.0.24.dist-info → payme_pkg-3.0.28.dist-info}/WHEEL

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

payme_pkg-3.0.24.dist-info/RECORD

@@ -1,32 +0,0 @@
-payme/__init__.py,sha256=dzLIyA9kQl0sO6z9nHkZDTjkfiI1BepdifKtJbjX2Cw,46
-payme/admin.py,sha256=k4_kAX6k8993aQo_7xokIc7InUVw4LGZT5ROn-C9EYU,561
-payme/apps.py,sha256=HHCY4zUNKPcjz25z0MahZcks0lsAxTGPS0Ml3U4DhZc,142
-payme/const.py,sha256=azndfKR53fe7mDfGW82Q-kwWdMu3x4S1upKc4gkYdlA,214
-payme/models.py,sha256=nOVmknNjQkBos7w069ddAp_wTBj14UssdTgO8w8sTdI,4179
-payme/urls.py,sha256=_oUOwxW1Suc5TUmnj--lySYbotRg4yTDkDLJU20CGjE,145
-payme/util.py,sha256=UFb4cEnaufS_hh9C_0z079CSgJGivYjIgOl2iAFrBMs,625
-payme/views.py,sha256=gSQgctinjjAWhEO-kCIF4Jn01yapzHRi2ovtkc6JgJw,12873
-payme/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-payme/classes/cards.py,sha256=dr3SQdKAhfQmECtwHYW2nmx8wXaNYQFkg5uQU9z8vs4,7624
-payme/classes/client.py,sha256=Fjck3vSRh8-NQ8HnxwytCn_qZm6UfwMKCBYDHtUSJAs,864
-payme/classes/http.py,sha256=OufMeHrj0jTomDJx_6go9GC1NtA6QpQCxIiM3ISy3Eo,3530
-payme/classes/initializer.py,sha256=TWJnlJTXefROMleIvJeT64xjIVWQU-LIXai8TZ_M7nw,2488
-payme/classes/receipts.py,sha256=KU4qyGHWZpWW88SjmmTD_N2Tz8pWOCvBbOPnw5tcS3Y,10094
-payme/exceptions/__init__.py,sha256=HoBFnDA3eW_xWZiFlonJK4vhBDTsuik91tvgzXTy8KA,94
-payme/exceptions/general.py,sha256=-rkzvuLi6VoITMLrszrP7c-gM8X6lM8AWttd770KSJc,7679
-payme/exceptions/webhook.py,sha256=hiX3CEjlPsFkliJm7SNM3XImU1IBscPhiwsnJJqhku4,3843
-payme/migrations/0001_initial.py,sha256=jdtGB6bN-Za6N9XU8IuWsa5FbonGIRH5ro9xHwT7JmU,2128
-payme/migrations/0002_paymetransactions_fiscal_data.py,sha256=z-gxPP3IgN-XNPx6DEZUQ4E1XZceVnnpvUTcSkcv70c,395
-payme/migrations/0003_alter_paymetransactions_fiscal_data.py,sha256=Ish4Seup9pdEM0g4q4RQKrvUOWB2DXPN0RmIScKI2IQ,410
-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
-payme/types/response/__init__.py,sha256=GAj5pjZ9oIO67T6YMiPd1fhTIvGrPfTv96tykfeChQc,81
-payme/types/response/cards.py,sha256=ilXFDUOPNabVsrQN1KWEzDiL6cDxdVvCbfEl6jCzGpU,1997
-payme/types/response/receipts.py,sha256=TlZeJyymRVHIorg0kbUaogy6MZxN1oq2jHGVRUnlY5A,4070
-payme/types/response/webhook.py,sha256=9tw_QsKNAUqgZLwL7Pg0SIVAry0BlxlWOu8BDmKewzc,3034
-payme_pkg-3.0.24.dist-info/LICENSE.txt,sha256=75dBVYmbzWUhwtaB1MSZfj-M-PGaMmeT9UVPli2-ZJ0,1086
-payme_pkg-3.0.24.dist-info/METADATA,sha256=5M5dOOlQtVeu9ZFGxxpAL2zuHWzvWm4TWC4XSXQuUoQ,5372
-payme_pkg-3.0.24.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-payme_pkg-3.0.24.dist-info/top_level.txt,sha256=8mN-hGAa38pWbhrKHFs9CZywPCdidhMuwPKwuFJa0qw,6
-payme_pkg-3.0.24.dist-info/RECORD,,