Added amount allocations and marked marketplace as deprecated

checkout · Sep 16, 2022 · 5c24f3a · 5c24f3a
1 parent 228ef8e
commit 5c24f3a
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 14 deletions.
diff --git a/checkout_sdk/common/common.py b/checkout_sdk/common/common.py
@@ -82,3 +82,15 @@ class Product:
     name: str
     quantity: int
     price: int
+
+
+class Commission:
+    amount: int
+    percentage: float
+
+
+class AmountAllocations:
+    id: str
+    amount: int
+    reference: str
+    commission: Commission
diff --git a/checkout_sdk/payments/hosted/hosted_payments.py b/checkout_sdk/payments/hosted/hosted_payments.py
@@ -3,9 +3,9 @@
 from checkout_sdk.common.common import CustomerRequest
 from checkout_sdk.common.common import MarketplaceData
 from checkout_sdk.common.enums import Currency
-from checkout_sdk.payments.payments_previous import BillingInformation
 from checkout_sdk.payments.payments import BillingDescriptor, PaymentType, ShippingDetails, ThreeDsRequest, \
     RiskRequest, PaymentRecipient, ProcessingSettings
+from checkout_sdk.payments.payments_previous import BillingInformation
 
 
 class HostedPaymentsSessionRequest:
@@ -34,4 +34,6 @@ class HostedPaymentsSessionRequest:
     capture_on: datetime
     # Not available on Previous
     processing_channel_id: str
+    # @deprecated marketplace property will be removed in the future, and should be used amount_allocations instead
     marketplace: MarketplaceData
+    amount_allocations: list  # values of AmountAllocations
diff --git a/checkout_sdk/payments/links/payments_links.py b/checkout_sdk/payments/links/payments_links.py
@@ -3,9 +3,9 @@
 from checkout_sdk.common.common import CustomerRequest
 from checkout_sdk.common.common import MarketplaceData
 from checkout_sdk.common.enums import Currency
-from checkout_sdk.payments.payments_previous import BillingInformation
 from checkout_sdk.payments.payments import BillingDescriptor, PaymentType, ShippingDetails, ThreeDsRequest, \
     RiskRequest, PaymentRecipient, ProcessingSettings
+from checkout_sdk.payments.payments_previous import BillingInformation
 
 
 class PaymentLinkRequest:
@@ -32,4 +32,6 @@ class PaymentLinkRequest:
     capture: bool
     capture_on: datetime
     processing_channel_id: str
+    # @deprecated marketplace property will be removed in the future, and should be used amount_allocations instead
     marketplace: MarketplaceData
+    amount_allocations: list  # values of AmountAllocations
diff --git a/checkout_sdk/payments/payments.py b/checkout_sdk/payments/payments.py
@@ -376,7 +376,9 @@ class PaymentRequest:
     payment_ip: str
     sender: PaymentSender
     recipient: PaymentRecipient
+    # @deprecated marketplace property will be removed in the future, and should be used amount_allocations instead
     marketplace: MarketplaceData
+    amount_allocations: list  # values of AmountAllocations
     processing: ProcessingSettings
     metadata: dict
     items: list  # payments.Product
@@ -450,7 +452,9 @@ class CaptureRequest:
     billing_descriptor: BillingDescriptor
     shipping: ShippingDetails
     items: list  # payments.Product
+    # @deprecated marketplace property will be removed in the future, and should be used amount_allocations instead
     marketplace: MarketplaceData
+    amount_allocations: list  # values of AmountAllocations
     processing: ProcessingSettings
     metadata: dict
 

diff --git a/tests/payments/links/payments_links_integration_test.py b/tests/payments/links/payments_links_integration_test.py
@@ -1,19 +1,27 @@
 from __future__ import absolute_import
 
-import pytest
-
-from checkout_sdk.common.common import CustomerRequest, Product
+from checkout_sdk.common.common import CustomerRequest, Product, Commission, AmountAllocations
 from checkout_sdk.common.enums import Currency, PaymentSourceType
 from checkout_sdk.payments.links.payments_links import PaymentLinkRequest
-from checkout_sdk.payments.payments_previous import BillingInformation
 from checkout_sdk.payments.payments import ShippingDetails, ThreeDsRequest, RiskRequest, PaymentRecipient, \
     ProcessingSettings
-from tests.checkout_test_utils import assert_response, phone, address, random_email
+from checkout_sdk.payments.payments_previous import BillingInformation
+from tests.checkout_test_utils import assert_response, phone, address, random_email, new_uuid
 
 
-@pytest.mark.skip(reason='not available')
 def test_should_create_and_get_payment_link(default_api):
+    commission = Commission()
+    commission.amount = 1
+    commission.percentage = 0.1
+
+    amount_allocations = AmountAllocations()
+    amount_allocations.id = 'ent_sdioy6bajpzxyl3utftdp7legq'
+    amount_allocations.reference = new_uuid()
+    amount_allocations.commission = commission
+    amount_allocations.amount = 100
+
     request = create_payment_link_request()
+    request.amount_allocations = [amount_allocations]
 
     response = default_api.payments_links.create_payment_link(request)
 
@@ -22,22 +30,17 @@ def test_should_create_and_get_payment_link(default_api):
                     'id',
                     'reference',
                     'expires_on',
-                    '_links',
-                    '_links.self',
-                    '_links.redirect',
                     'warnings')
 
     for warning in response.warnings:
         assert_response(warning,
-                        'http_metadata',
                         'code',
                         'value',
                         'description')
 
     hosted_details = default_api.payments_links.get_payment_link(response.id)
 
     assert_response(hosted_details,
-                    'http_metadata',
                     'id',
                     'reference',
                     'status',
@@ -52,7 +55,7 @@ def test_should_create_and_get_payment_link(default_api):
                     'products',
                     '_links',
                     '_links.self',
-                    '_links.redirect', )
+                    '_links.redirect')
 
 
 def create_payment_link_request():