Merge pull request #5 from romatallinn/v0.0.6

V0.0.6

Author: MrLightful

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.6
+
+Quickfix: fix data argument in Payment's capture_sale method for passing split data.
+
 ## 0.0.5
 
 Quickfix: fix circular import in `base_request.py` introduced in v0.0.4.

braspag_sdk/apps/payments/requests/update_sale.py

@@ -34,4 +34,4 @@ def execute(self, payment_id):
         if self.data:
             data = self.data
 
-        return self.send_request('PUT', uri, params=params, data=data)
+        return self.send_request('PUT', uri, data, params)

braspag_sdk/apps/payments/services.py

@@ -16,16 +16,11 @@ def create_sale(self, sale: Sale):
         request = CreateSale(self.merchant_credentials, self._environment)
         return request.execute(sale)
 
-    def capture_sale(self, payment_id: str, amount=None, service_tax_amount=None, **kwargs):
+    def capture_sale(self, payment_id: str, amount=None, service_tax_amount=None, data=None):
         request = UpdateSale('capture', self.merchant_credentials, self._environment)
         request.amount = amount
         request.service_tax_amount = service_tax_amount
-
-        data = None
-        if kwargs:
-            data = json.dumps(kwargs)
         request.data = data
-
         return request.execute(payment_id)
 
     def cancel_sale(self, payment_id: str, amount=None):

braspag_sdk/apps/split/data/split_payment.py

@@ -1,3 +1,5 @@
+from typing import List
+
 from braspag_sdk.utils import ObjectJSON
 
 
@@ -14,3 +16,10 @@ def __init__(self, subordinate_merchant_id, amount, mdr=None, fee=None):
         self.subordinate_merchant_id = subordinate_merchant_id
         self.amount = amount
         self.fares = SplitPaymentFares(mdr, fee)
+
+
+class SplitPaymentsCapture(ObjectJSON):
+    """ Data model for when capturing payment with a split. """
+
+    def __init__(self, split_payments: List[SplitPayment]):
+        self.split_payments = split_payments

braspag_sdk/utils/base_request.py

@@ -30,6 +30,8 @@ def send_request(self, method, uri, data=None, params=None):
             headers['Content-Length'] = '0'
         elif isinstance(data, ObjectJSON):
             body = body.toJSON()
+        else:
+            body = json.dumps(body)
 
         if 'Content-Type' not in headers:
             headers["Content-Type"] = "application/json"

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "braspag-sdk"
-version = "0.0.5"
+version = "0.0.6"
 description = "An unofficial Python SDK for Braspag"
 authors = [
     "Roman Sirokov <sirokov@dizconto.com>",
@@ -26,7 +26,7 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = ">=3.7,<4.0"
-future = "^0.18.3"
+future = "^1.0.0"
 requests = "^2.31.0"
 
 

pyproject.toml

@@ -1,9 +1,6 @@
-appdirs==1.4.4 ; python_version >= "3.12" and python_version < "4.0"
-certifi==2023.11.17 ; python_version >= "3.12" and python_version < "4.0"
-charset-normalizer==3.3.2 ; python_version >= "3.12" and python_version < "4.0"
-future==0.18.3 ; python_version >= "3.12" and python_version < "4.0"
-idna==3.6 ; python_version >= "3.12" and python_version < "4.0"
-packaging==23.2 ; python_version >= "3.12" and python_version < "4.0"
-pyparsing==3.1.1 ; python_version >= "3.12" and python_version < "4.0"
-requests==2.31.0 ; python_version >= "3.12" and python_version < "4.0"
-urllib3==2.1.0 ; python_version >= "3.12" and python_version < "4.0"
+certifi==2024.2.2 ; python_version >= "3.7" and python_version < "4.0"
+charset-normalizer==3.3.2 ; python_version >= "3.7" and python_version < "4.0"
+future==1.0.0 ; python_version >= "3.7" and python_version < "4.0"
+idna==3.6 ; python_version >= "3.7" and python_version < "4.0"
+requests==2.31.0 ; python_version >= "3.7" and python_version < "4.0"
+urllib3==2.0.7 ; python_version >= "3.7" and python_version < "4.0"