Merge pull request #20 from Muhammadali-Akbarov/enhancement/version

bugs fixes and improvements

payme/classes/initializer.py

@@ -1,5 +1,7 @@
 import base64
 
+from django.conf import settings
+
 from payme.util import input_type_checker
 
 
@@ -17,8 +19,6 @@ class Initializer:
     def __init__(self, payme_id: str = None):
         self.payme_id = payme_id
 
-    # pylint: disable=W0622
-    @input_type_checker
     def generate_pay_link(
         self,
         id: int,
@@ -54,7 +54,7 @@ def generate_pay_link(
         """
         amount = amount * 100  # Convert amount to the smallest currency unit
         params = (
-            f'm={self.payme_id};ac.id={id};a={amount};c={return_url}'
+            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")
         return f"https://checkout.paycom.uz/{params}"

payme/views.py

@@ -113,10 +113,15 @@ def fetch_account(self, params: dict):
         Fetch account based on settings and params.
         """
         account_field = settings.PAYME_ACCOUNT_FIELD
+
         account_value = params['account'].get(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})
 
         return account

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name='payme-pkg',
-    version='3.0.3',
+    version='3.0.6',
     license='MIT',
     author="Muhammadali Akbarov",
     author_email='[email protected]',