fix: typo "Merchat" to "Merchant" in methods

PayTechUz · Oct 1, 2023 · 108446f · 108446f
1 parent 0f239c0
commit 108446f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/lib/payme/methods/cancel_transaction.py b/lib/payme/methods/cancel_transaction.py
@@ -3,7 +3,7 @@
 from django.db import transaction
 
 from payme.utils.logging import logger
-from payme.models import MerchatTransactionsModel
+from payme.models import MerchantTransactionsModel
 from payme.errors.exceptions import PerformTransactionDoesNotExist
 from payme.serializers import MerchatTransactionsModelSerializer as MTMS
 
@@ -25,8 +25,8 @@ def __call__(self, params: dict):
         )
         try:
             with transaction.atomic():
-                transactions: MerchatTransactionsModel = \
-                    MerchatTransactionsModel.objects.filter(
+                transactions: MerchantTransactionsModel = \
+                    MerchantTransactionsModel.objects.filter(
                         _id=clean_data.get('_id'),
                     ).first()
                 if transactions.cancel_time == 0:

diff --git a/lib/payme/methods/check_transaction.py b/lib/payme/methods/check_transaction.py
@@ -1,7 +1,7 @@
 from django.db import DatabaseError
 
 from payme.utils.logging import logger
-from payme.models import MerchatTransactionsModel
+from payme.models import MerchantTransactionsModel
 from payme.serializers import MerchatTransactionsModelSerializer as MTMS
 
 
@@ -21,7 +21,7 @@ def __call__(self, params: dict) -> None:
 
         try:
             transaction = \
-                MerchatTransactionsModel.objects.get(
+                MerchantTransactionsModel.objects.get(
                     _id=clean_data.get("_id"),
                 )
             response = {

diff --git a/lib/payme/methods/create_transaction.py b/lib/payme/methods/create_transaction.py
@@ -4,7 +4,7 @@
 
 from payme.utils.logging import logger
 from payme.utils.get_params import get_params
-from payme.models import MerchatTransactionsModel
+from payme.models import MerchantTransactionsModel
 from payme.errors.exceptions import TooManyRequests
 from payme.serializers import MerchatTransactionsModelSerializer
 
@@ -26,7 +26,7 @@ def __call__(self, params: dict) -> dict:
         order_id = serializer.validated_data.get("order_id")
 
         try:
-            transaction = MerchatTransactionsModel.objects.filter(
+            transaction = MerchantTransactionsModel.objects.filter(
                 order_id=order_id
             ).last()
 
@@ -40,7 +40,7 @@ def __call__(self, params: dict) -> dict:
 
         if transaction is None:
             transaction, _ = \
-                MerchatTransactionsModel.objects.get_or_create(
+                MerchantTransactionsModel.objects.get_or_create(
                     _id=serializer.validated_data.get('_id'),
                     order_id=serializer.validated_data.get('order_id'),
                     transaction_id=uuid.uuid4(),

diff --git a/lib/payme/methods/get_statement.py b/lib/payme/methods/get_statement.py
@@ -1,7 +1,7 @@
 from django.db import DatabaseError
 
 from payme.utils.logging import logger
-from payme.models import MerchatTransactionsModel
+from payme.models import MerchantTransactionsModel
 from payme.serializers import MerchatTransactionsModelSerializer as MTMS
 from payme.utils.make_aware_datetime import make_aware_datetime as mad
 
@@ -29,13 +29,13 @@ def __call__(self, params: dict):
 
         try:
             transactions = \
-                MerchatTransactionsModel.objects.filter(
+                MerchantTransactionsModel.objects.filter(
                     created_at__gte=start_date,
                     created_at__lte=end_date
                 )
 
             if not transactions:  # no transactions found for the period
-                return {"result": {"transactions": []}}
+                return None, {"result": {"transactions": []}}
 
             statements = [
                 {

diff --git a/lib/payme/methods/perform_transaction.py b/lib/payme/methods/perform_transaction.py
@@ -4,7 +4,7 @@
 
 from payme.utils.logging import logger
 from payme.utils.get_params import get_params
-from payme.models import MerchatTransactionsModel
+from payme.models import MerchantTransactionsModel
 from payme.serializers import MerchatTransactionsModelSerializer
 
 
@@ -26,7 +26,7 @@ def __call__(self, params: dict) -> dict:
         response: dict = None
         try:
             transaction = \
-                MerchatTransactionsModel.objects.get(
+                MerchantTransactionsModel.objects.get(
                     _id=clean_data.get("_id"),
                 )
             transaction.state = 2