paytechuz 0.2.5__tar.gz → 0.2.7__tar.gz

{paytechuz-0.2.5/src/paytechuz.egg-info → paytechuz-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: paytechuz
-Version: 0.2.5
+Version: 0.2.7
 Summary: Unified Python package for Uzbekistan payment gateways
 Home-page: https://github.com/Muhammadali-Akbarov/paytechuz
 Author: Muhammadali Akbarov

{paytechuz-0.2.5 → paytechuz-0.2.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "paytechuz"
-version = "0.2.5"
+version = "0.2.7"
 description = "Unified Python package for Uzbekistan payment gateways"
 readme = "README.md"
 requires-python = ">=3.7"

{paytechuz-0.2.5 → paytechuz-0.2.7}/setup.py

@@ -8,7 +8,7 @@ long_description = (here / "README.md").read_text(encoding="utf-8")
 
 setup(
     name='paytechuz',
-    version='0.2.5',
+    version='0.2.7',
     license='MIT',
     author="Muhammadali Akbarov",
     author_email='muhammadali17abc@gmail.com',

{paytechuz-0.2.5/src/paytechuz → paytechuz-0.2.7/src}/gateways/click/merchant.py

@@ -70,7 +70,7 @@ class ClickMerchantApi:
         return hashlib.md5(sign_string.encode('utf-8')).hexdigest()
 
     @handle_exceptions
-    def check_payment(self, account_id: Union[int, str]) -> Dict[str, Any]:
+    def check_payment(self, id: Union[int, str]) -> Dict[str, Any]:
         """
         Check payment status.
 
@@ -83,7 +83,7 @@ class ClickMerchantApi:
         # Prepare request data
         data = {
             "service_id": self.service_id,
-            "merchant_transaction_id": str(account_id),
+            "merchant_transaction_id": str(id),
             "request_id": str(generate_timestamp())
         }
 
@@ -102,14 +102,14 @@ class ClickMerchantApi:
     @handle_exceptions
     def cancel_payment(
         self,
-        account_id: Union[int, str],
+        id: Union[int, str],
         reason: Optional[str] = None
     ) -> Dict[str, Any]:
         """
         Cancel payment.
 
         Args:
-            account_id: Account ID or order ID
+            id: Account ID or order ID
             reason: Optional reason for cancellation
 
         Returns:
@@ -118,7 +118,7 @@ class ClickMerchantApi:
         # Prepare request data
         data = {
             "service_id": self.service_id,
-            "merchant_transaction_id": str(account_id),
+            "merchant_transaction_id": str(id),
             "request_id": str(generate_timestamp())
         }
 
@@ -141,8 +141,8 @@ class ClickMerchantApi:
     @handle_exceptions
     def create_invoice(
         self,
+        id: Union[int, str],
         amount: Union[int, float],
-        account_id: Union[int, str],
         **kwargs
     ) -> Dict[str, Any]:
         """
@@ -150,7 +150,7 @@ class ClickMerchantApi:
 
         Args:
             amount: Payment amount
-            account_id: Account ID or order ID
+            id: Account ID or order ID
             **kwargs: Additional parameters
                 - description: Payment description
                 - phone: Customer phone number
@@ -161,7 +161,7 @@ class ClickMerchantApi:
             Dict containing invoice details
         """
         # Extract additional parameters
-        description = kwargs.get('description', f'Payment for account {account_id}')
+        description = kwargs.get('description', f'Payment for account {id}')
         phone = kwargs.get('phone')
         email = kwargs.get('email')
         expire_time = kwargs.get('expire_time', 60)  # Default 1 hour
@@ -170,7 +170,7 @@ class ClickMerchantApi:
         data = {
             "service_id": self.service_id,
             "amount": float(amount),
-            "merchant_transaction_id": str(account_id),
+            "merchant_transaction_id": str(id),
             "description": description,
             "request_id": str(generate_timestamp()),
             "expire_time": expire_time

{paytechuz-0.2.5 → paytechuz-0.2.7}/src/gateways/payme/client.py

@@ -176,8 +176,8 @@ class PaymeGateway(BasePaymentGateway):
         Async version of create_payment.
 
         Args:
+            id: Account or order ID
             amount: Payment amount in som
-            account_id: Account or order ID
             return_url: Return URL after payment (default: "")
             account_field_name: Field name for account ID (default: "order_id")
 

{paytechuz-0.2.5 → paytechuz-0.2.7}/src/integrations/django/views.py

@@ -9,6 +9,7 @@ from .webhooks import PaymeWebhook, ClickWebhook
 
 logger = logging.getLogger(__name__)
 
+
 @method_decorator(csrf_exempt, name='dispatch')
 class PaymeWebhookView(PaymeWebhook):
     """
@@ -54,6 +55,7 @@ class PaymeWebhookView(PaymeWebhook):
         """
         logger.info(f"Payme payment cancelled: {transaction.transaction_id}")
 
+
 @method_decorator(csrf_exempt, name='dispatch')
 class ClickWebhookView(ClickWebhook):
     """

{paytechuz-0.2.5/src/paytechuz → paytechuz-0.2.7/src}/integrations/django/webhooks.py

@@ -432,6 +432,10 @@ class PaymeWebhook(View):
             # If transaction is already cancelled, return the existing data
             return self._cancel_response(transaction)
 
+        if reason == 3:
+            transaction.state = PaymentTransaction.CANCELLED_DURING_INIT
+            transaction.save()
+
         # Use the mark_as_cancelled method to properly store the reason
         transaction.mark_as_cancelled(reason=reason)
 

{paytechuz-0.2.5 → paytechuz-0.2.7}/src/paytechuz/core/base.py

@@ -26,16 +26,16 @@ class BasePaymentGateway(ABC):
     @abstractmethod
     def create_payment(
         self,
+        id: Union[int, str],
         amount: Union[int, float, str],
-        account_id: Union[int, str],
         **kwargs
     ) -> Dict[str, Any]:
         """
         Create a payment.
 
         Args:
+            id: The account ID or order ID
             amount: The payment amount
-            account_id: The account ID or order ID
             **kwargs: Additional parameters specific to the payment gateway
 
         Returns:

{paytechuz-0.2.5 → paytechuz-0.2.7}/src/paytechuz/gateways/click/client.py

@@ -62,8 +62,8 @@ class ClickGateway(BasePaymentGateway):
     @handle_exceptions
     def create_payment(
         self,
+        id: Union[int, str],
         amount: Union[int, float, str],
-        account_id: Union[int, str],
         **kwargs
     ) -> Dict[str, Any]:
         """
@@ -71,7 +71,7 @@ class ClickGateway(BasePaymentGateway):
 
         Args:
             amount: The payment amount in som
-            account_id: The account ID or order ID
+            id: The account ID or order ID
             **kwargs: Additional parameters for the payment
                 - description: Payment description
                 - return_url: URL to return after payment
@@ -87,7 +87,7 @@ class ClickGateway(BasePaymentGateway):
         amount_tiyin = format_amount(amount)
 
         # Extract additional parameters
-        description = kwargs.get('description', f'Payment for account {account_id}') # noqa
+        description = kwargs.get('description', f'Payment for account {id}') # noqa
         return_url = kwargs.get('return_url')
         callback_url = kwargs.get('callback_url')
         # These parameters are not used in the URL but are available in the API
@@ -100,7 +100,7 @@ class ClickGateway(BasePaymentGateway):
         payment_url += f"?service_id={self.service_id}"
         payment_url += f"&merchant_id={self.merchant_id}"
         payment_url += f"&amount={amount}"
-        payment_url += f"&transaction_param={account_id}"
+        payment_url += f"&transaction_param={id}"
 
         if return_url:
             payment_url += f"&return_url={return_url}"
@@ -112,13 +112,13 @@ class ClickGateway(BasePaymentGateway):
             payment_url += f"&merchant_user_id={description}"
 
         # Generate a unique transaction ID
-        transaction_id = f"click_{account_id}_{int(amount_tiyin)}"
+        transaction_id = f"click_{id}_{int(amount_tiyin)}"
 
         return {
             'transaction_id': transaction_id,
             'payment_url': payment_url,
             'amount': amount,
-            'account_id': account_id,
+            'account_id': id,
             'status': 'created',
             'service_id': self.service_id,
             'merchant_id': self.merchant_id

{paytechuz-0.2.5/src → paytechuz-0.2.7/src/paytechuz}/gateways/click/merchant.py

@@ -11,6 +11,7 @@ from paytechuz.core.utils import handle_exceptions, generate_timestamp
 
 logger = logging.getLogger(__name__)
 
+
 class ClickMerchantApi:
     """
     Click merchant API operations.
@@ -69,7 +70,7 @@ class ClickMerchantApi:
         return hashlib.md5(sign_string.encode('utf-8')).hexdigest()
 
     @handle_exceptions
-    def check_payment(self, account_id: Union[int, str]) -> Dict[str, Any]:
+    def check_payment(self, id: Union[int, str]) -> Dict[str, Any]:
         """
         Check payment status.
 
@@ -82,7 +83,7 @@ class ClickMerchantApi:
         # Prepare request data
         data = {
             "service_id": self.service_id,
-            "merchant_transaction_id": str(account_id),
+            "merchant_transaction_id": str(id),
             "request_id": str(generate_timestamp())
         }
 
@@ -101,14 +102,14 @@ class ClickMerchantApi:
     @handle_exceptions
     def cancel_payment(
         self,
-        account_id: Union[int, str],
+        id: Union[int, str],
         reason: Optional[str] = None
     ) -> Dict[str, Any]:
         """
         Cancel payment.
 
         Args:
-            account_id: Account ID or order ID
+            id: Account ID or order ID
             reason: Optional reason for cancellation
 
         Returns:
@@ -117,7 +118,7 @@ class ClickMerchantApi:
         # Prepare request data
         data = {
             "service_id": self.service_id,
-            "merchant_transaction_id": str(account_id),
+            "merchant_transaction_id": str(id),
             "request_id": str(generate_timestamp())
         }
 
@@ -140,8 +141,8 @@ class ClickMerchantApi:
     @handle_exceptions
     def create_invoice(
         self,
+        id: Union[int, str],
         amount: Union[int, float],
-        account_id: Union[int, str],
         **kwargs
     ) -> Dict[str, Any]:
         """
@@ -160,7 +161,7 @@ class ClickMerchantApi:
             Dict containing invoice details
         """
         # Extract additional parameters
-        description = kwargs.get('description', f'Payment for account {account_id}')
+        description = kwargs.get('description', f'Payment for account {id}')
         phone = kwargs.get('phone')
         email = kwargs.get('email')
         expire_time = kwargs.get('expire_time', 60)  # Default 1 hour
@@ -169,7 +170,7 @@ class ClickMerchantApi:
         data = {
             "service_id": self.service_id,
             "amount": float(amount),
-            "merchant_transaction_id": str(account_id),
+            "merchant_transaction_id": str(id),
             "description": description,
             "request_id": str(generate_timestamp()),
             "expire_time": expire_time

{paytechuz-0.2.5 → paytechuz-0.2.7/src/paytechuz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: paytechuz
-Version: 0.2.5
+Version: 0.2.7
 Summary: Unified Python package for Uzbekistan payment gateways
 Home-page: https://github.com/Muhammadali-Akbarov/paytechuz
 Author: Muhammadali Akbarov