Merge branch 'master' into update-bnpl-integration

craftgate · Feb 4, 2025 · a1337bc · a1337bc
2 parents 7bb7fbc + db5aa87
commit a1337bc
Show file tree

Hide file tree

Showing 6 changed files with 159 additions and 7 deletions.
diff --git a/Craftgate/Adapter/PaymentAdapter.cs b/Craftgate/Adapter/PaymentAdapter.cs
@@ -618,19 +618,19 @@ public Task<MultiPaymentResponse> RetrieveMultiPaymentAsync(string token)
                 CreateHeaders(path, RequestOptions));
         }
 
-        public StoredCardResponse RetrieveProviderCard(RetrieveProviderCardRequest retrieveProviderCardRequest)
+        public StoredCardListResponse RetrieveProviderCards(RetrieveProviderCardRequest retrieveProviderCardRequest)
         {
             var queryParam = RequestQueryParamsBuilder.BuildQueryParam(retrieveProviderCardRequest);
             var path = "/payment/v1/cards/provider-card-mappings" + queryParam;
-            return RestClient.Get<StoredCardResponse>(RequestOptions.BaseUrl + path,
+            return RestClient.Get<StoredCardListResponse>(RequestOptions.BaseUrl + path,
                 CreateHeaders(path, RequestOptions));
         }
 
-        public Task<StoredCardResponse> RetrieveProviderCardAsync(RetrieveProviderCardRequest retrieveProviderCardRequest)
+        public Task<StoredCardListResponse> RetrieveProviderCardsAsync(RetrieveProviderCardRequest retrieveProviderCardRequest)
         {
             var queryParam = RequestQueryParamsBuilder.BuildQueryParam(retrieveProviderCardRequest);
             var path = "/payment/v1/cards/provider-card-mappings" + queryParam;
-            return AsyncRestClient.Get<StoredCardResponse>(RequestOptions.BaseUrl + path,
+            return AsyncRestClient.Get<StoredCardListResponse>(RequestOptions.BaseUrl + path,
                 CreateHeaders(path, RequestOptions));
         }
 

diff --git a/Craftgate/Model/ApmType.cs b/Craftgate/Model/ApmType.cs
@@ -28,9 +28,12 @@ public enum ApmType
         [EnumMember(Value = "MULTINET")] MULTINET,
         [EnumMember(Value = "MULTINET_GIFT")] MULTINET_GIFT,
         [EnumMember(Value = "ISPAY")] ISPAY,
+        [EnumMember(Value = "VODAFONE_DCB")] VODAFONE_DCB,
         [EnumMember(Value = "CHIPPIN")] CHIPPIN,
         [EnumMember(Value = "PAYMOB")] PAYMOB,
         [EnumMember(Value = "BIZUM")] BIZUM,
+        [EnumMember(Value = "PAYCELL_DCB")] PAYCELL_DCB,
+        [EnumMember(Value = "IWALLET")] IWALLET,
         [EnumMember(Value = "FUND_TRANSFER")] FUND_TRANSFER,
         [EnumMember(Value = "CASH_ON_DELIVERY")] CASH_ON_DELIVERY
     }

diff --git a/Craftgate/Model/PaymentMethod.cs b/Craftgate/Model/PaymentMethod.cs
@@ -18,6 +18,9 @@ public enum PaymentMethod
         [EnumMember(Value = "STRIPE")] STRIPE,
         [EnumMember(Value = "MULTINET")] MULTINET,
         [EnumMember(Value = "MULTINET_GIFT")] MULTINET_GIFT,
-        [EnumMember(Value = "INSTANT_TRANSFER")] INSTANT_TRANSFER
+        [EnumMember(Value = "INSTANT_TRANSFER")] INSTANT_TRANSFER,
+        [EnumMember(Value = "BIZUM")] BIZUM,
+        [EnumMember(Value = "PAYCELL_DCB")] PAYCELL_DCB,
+        [EnumMember(Value = "IWALLET")] IWALLET
     }
 }
diff --git a/Craftgate/Model/PaymentProvider.cs b/Craftgate/Model/PaymentProvider.cs
@@ -32,9 +32,12 @@ public enum PaymentProvider
         [EnumMember(Value = "HASO")] HASO,
         [EnumMember(Value = "MULTINET")] MULTINET,
         [EnumMember(Value = "ISPAY")] ISPAY,
+        [EnumMember(Value = "VODAFONE")] VODAFONE,
         [EnumMember(Value = "CHIPPIN")] CHIPPIN,
         [EnumMember(Value = "PAYMOB")] PAYMOB,
         [EnumMember(Value = "BIZUM")] BIZUM,
+        [EnumMember(Value = "PAYCELL_DCB")] PAYCELL_DCB,
+        [EnumMember(Value = "IWALLET")] IWALLET,
         [EnumMember(Value = "OFFLINE")] OFFLINE
     }
 }
diff --git a/Craftgate/Request/InitCheckoutPaymentRequest.cs b/Craftgate/Request/InitCheckoutPaymentRequest.cs
@@ -15,7 +15,7 @@ public class InitCheckoutPaymentRequest
         public string PaymentChannel { get; set; }
         public string ConversationId { get; set; }
         public string ExternalId { get; set; }
-        public string BankOrderId { get; set; }
+        public string OrderId { get; set; }
         public PaymentPhase PaymentPhase { get; set; } = PaymentPhase.AUTH;
         public IList<PaymentMethod> EnabledPaymentMethods { get; set; }
         public string MasterpassGsmNumber { get; set; }

diff --git a/Samples/PaymentSample.cs b/Samples/PaymentSample.cs
@@ -1066,6 +1066,89 @@ public void Init_Edenred_Apm_Payment()
             Assert.AreEqual(response.AdditionalAction, ApmAdditionalAction.OTP_REQUIRED);
         }
 
+        [Test]
+        public void Init_IWallet_Apm_Payment()
+        {
+            var request = new InitApmPaymentRequest
+            {
+                ApmType = ApmType.IWALLET,
+                Price = new decimal(1.0),
+                PaidPrice = new decimal(1.0),
+                Currency = Currency.TRY,
+                PaymentGroup = PaymentGroup.LISTING_OR_SUBSCRIPTION,
+                ConversationId = "456d1297-908e-4bd6-a13b-4be31a6e47d5",
+                ExternalId = "optional-ExternalId",
+                CallbackUrl = "https://www.your-website.com/craftgate-apm-callback",
+                ApmUserIdentity = "1111222233334444",
+                Items = new List<PaymentItem>
+                {
+                    new PaymentItem
+                    {
+                        Name = "Item 1",
+                        ExternalId = Guid.NewGuid().ToString(),
+                        Price = new decimal(0.40)
+                    },
+
+                    new PaymentItem
+                    {
+                        Name = "Item 2",
+                        ExternalId = Guid.NewGuid().ToString(),
+                        Price = new decimal(0.60)
+                    }
+                }
+            };
+
+            var response = _craftgateClient.Payment().InitApmPayment(request);
+            Assert.NotNull(response);
+            Assert.NotNull(response.PaymentId);
+            Assert.Null(response.RedirectUrl);
+            Assert.AreEqual(response.PaymentStatus, PaymentStatus.WAITING);
+            Assert.AreEqual(response.AdditionalAction, ApmAdditionalAction.OTP_REQUIRED);
+        }
+
+        [Test]
+        public void Init_IWallet_Apm_Payment_with_card_password()
+        {
+            var request = new InitApmPaymentRequest
+            {
+                ApmType = ApmType.IWALLET,
+                Price = new decimal(1.0),
+                PaidPrice = new decimal(1.0),
+                Currency = Currency.TRY,
+                PaymentGroup = PaymentGroup.LISTING_OR_SUBSCRIPTION,
+                ConversationId = "456d1297-908e-4bd6-a13b-4be31a6e47d5",
+                ExternalId = "optional-ExternalId",
+                CallbackUrl = "https://www.your-website.com/craftgate-apm-callback",
+                AdditionalParams = new Dictionary<string, object>
+                {
+                    { "cardNumber", "1111222233334444" }
+                },
+                Items = new List<PaymentItem>
+                {
+                    new PaymentItem
+                    {
+                        Name = "Item 1",
+                        ExternalId = Guid.NewGuid().ToString(),
+                        Price = new decimal(0.40)
+                    },
+
+                    new PaymentItem
+                    {
+                        Name = "Item 2",
+                        ExternalId = Guid.NewGuid().ToString(),
+                        Price = new decimal(0.60)
+                    }
+                }
+            };
+
+            var response = _craftgateClient.Payment().InitApmPayment(request);
+            Assert.NotNull(response);
+            Assert.NotNull(response.PaymentId);
+            Assert.Null(response.RedirectUrl);
+            Assert.AreEqual(response.PaymentStatus, PaymentStatus.SUCCESS);
+            Assert.AreEqual(response.AdditionalAction, ApmAdditionalAction.NONE);
+        }
+
         [Test]
         public void Init_Kaspi_Apm_Payment()
         {
@@ -1227,6 +1310,48 @@ public void Init_Bizum_Apm_Payment()
             Assert.AreEqual(response.PaymentStatus, PaymentStatus.WAITING);
             Assert.AreEqual(response.AdditionalAction, ApmAdditionalAction.WAIT_FOR_WEBHOOK);
         }
+
+        [Test]
+        public void Init_Paycell_DCB_Apm_Payment()
+        {
+            var additionalParams = new Dictionary<string, object>();
+            additionalParams.Add("paycellGsmNumber", "5305289290");
+
+            var request = new InitApmPaymentRequest
+            {
+                ApmType = ApmType.PAYCELL_DCB,
+                Price = new decimal(1.0),
+                PaidPrice = new decimal(1.0),
+                Currency = Currency.TRY,
+                PaymentGroup = PaymentGroup.LISTING_OR_SUBSCRIPTION,
+                ConversationId = "conversationId",
+                ExternalId = "externalId",
+                CallbackUrl = "callbackUrl",
+                Items = new List<PaymentItem>
+                {
+                    new PaymentItem
+                    {
+                        Name = "Item 1",
+                        ExternalId = Guid.NewGuid().ToString(),
+                        Price = new decimal(0.40)
+                    },
+
+                    new PaymentItem
+                    {
+                        Name = "Item 2",
+                        ExternalId = Guid.NewGuid().ToString(),
+                        Price = new decimal(0.60)
+                    }
+                },
+                AdditionalParams = additionalParams
+            };
+
+            var response = _craftgateClient.Payment().InitApmPayment(request);
+            Assert.NotNull(response);
+            Assert.NotNull(response.PaymentId);
+            Assert.AreEqual(response.PaymentStatus, PaymentStatus.WAITING);
+            Assert.AreEqual(response.AdditionalAction, ApmAdditionalAction.OTP_REQUIRED);
+        }
 
         [Test]
         public void Init_Paymob_Apm_Payment()
@@ -1287,6 +1412,24 @@ public void Complete_Edenred_Apm_Payment()
             Assert.AreEqual(PaymentStatus.SUCCESS, response.PaymentStatus);
         }
 
+        [Test]
+        public void Complete_IWallet_Apm_Payment()
+        {
+            var request = new CompleteApmPaymentRequest
+            {
+                PaymentId = 1,
+                AdditionalParams = new Dictionary<string, object>
+                {
+                    { "passCode", "1122" }
+                },
+            };
+
+            var response = _craftgateClient.Payment().CompleteApmPayment(request);
+            Assert.NotNull(response);
+            Assert.NotNull(response.PaymentId);
+            Assert.AreEqual(PaymentStatus.SUCCESS, response.PaymentStatus);
+        }
+
         [Test]
         public void Init_Metropol_Apm_Payment()
         {
@@ -2246,7 +2389,7 @@ public void Retrieve_Provider_Card()
 
             };
 
-            var response = _craftgateClient.Payment().RetrieveProviderCard(request);
+            var response = _craftgateClient.Payment().RetrieveProviderCards(request);
 
             Assert.NotNull(response);
         }