Merge pull request #13 from dynamicweb/ssm/20967-dibs_fixes_inline_an…

…d_others Various fixes
dynamicweb · Nov 7, 2024 · 618ac33 · 618ac33
2 parents baa15e2 + b56f0ba
commit 618ac33
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 27 deletions.
diff --git a/src/DibsEasyCheckout.cs b/src/DibsEasyCheckout.cs
@@ -301,12 +301,17 @@ private void UpdateOrderInfo(string paymentId, Order order)
                     else
                     {
                         order.TransactionStatus = "Succeeded";
-
+                        bool updateReference = order.Id.StartsWith("CART", StringComparison.Ordinal);
                         SetOrderComplete(order, paymentId);
 
-                        if (AutoCapture)
+                        if (updateReference)
                         {
+                            string url = GetApprovetUrl(GetBaseUrl(order));
+                            service.UpdatePaymentReference(paymentId, url);
+                        }
 
+                        if (AutoCapture)
+                        {
                             try
                             {
                                 LogEvent(order, "Start autocapture request.");
@@ -425,13 +430,13 @@ public OrderCaptureInfo Capture(Order order)
                 LogEvent(order, "Start autocapture request.");
                 ChargePayment(order, order.TransactionNumber, amount);
 
+                double capturedAmount = amount / 100d;
+
                 if (order.Price.PricePIP == amount)
-                {
-                    LogEvent(order, "Capture successful", DebuggingInfoType.CaptureResult);
-                }
+                    LogEvent(order, string.Format("Message=\"{0}\" Amount=\"{1:f2}\"", "Capture successful", capturedAmount), DebuggingInfoType.CaptureResult);
                 else
                 {
-                    LogEvent(order, String.Format("Message=\"{0}\" Amount=\"{1:f2}\"", "Split capture(final)", amount / 100f), DebuggingInfoType.CaptureResult);
+                    LogEvent(order, string.Format("Message=\"{0}\" Amount=\"{1:f2}\"", "Split capture (final)", capturedAmount), DebuggingInfoType.CaptureResult);
                     order.CaptureInfo.Message = "Split capture successful";
                 }
 

diff --git a/src/Dynamicweb.Ecommerce.CheckoutHandlers.DibsEasyCheckout.csproj b/src/Dynamicweb.Ecommerce.CheckoutHandlers.DibsEasyCheckout.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<VersionPrefix>10.6.4</VersionPrefix>
+		<VersionPrefix>10.6.5</VersionPrefix>
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<Title>Nets Easy Checkout</Title>
 		<Description>Nets Easy Checkout</Description>
@@ -21,6 +21,7 @@
 		<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
+		<PackageIcon>dibs-logo.png</PackageIcon>
 	</PropertyGroup>
 	<ItemGroup>
 	  <None Remove="Updates\checkouthandler_error.cshtml" />
@@ -38,4 +39,10 @@
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>
+	<ItemGroup>
+	  <None Update="dibs-logo.png">
+	    <Pack>True</Pack>
+	    <PackagePath>\</PackagePath>
+	  </None>
+	</ItemGroup>
 </Project>
diff --git a/src/Models/UpdatePaymentReferenceRequest.cs b/src/Models/UpdatePaymentReferenceRequest.cs
@@ -0,0 +1,13 @@
+using System.Runtime.Serialization;
+
+namespace Dynamicweb.Ecommerce.CheckoutHandlers.DibsEasyCheckout.Models;
+
+[DataContract]
+internal sealed class UpdatePaymentReferenceRequest
+{
+    [DataMember(Name = "reference")]
+    public string Reference { get; set; }
+
+    [DataMember(Name = "checkoutUrl")]
+    public string CheckoutUrl { get; set; }
+}
diff --git a/src/Service/ApiCommand.cs b/src/Service/ApiCommand.cs
@@ -25,6 +25,11 @@ internal enum ApiCommand
     /// </summary>
     CapturePayment,
 
+    /// <summary>
+    /// Updates the specified payment object with a new reference string and a checkoutUrl
+    /// PUT /payments/{paymentId}/referenceinformation
+    /// </summary>
+    UpdatePaymentReference,
 
     /// <summary>
     /// POST /charges/{operatorId}/refunds

diff --git a/src/Service/DibsRequest.cs b/src/Service/DibsRequest.cs
@@ -38,6 +38,8 @@ ApiCommand.CancelPayment or
                     ApiCommand.CapturePayment or
                     ApiCommand.CreatePayment or
                     ApiCommand.RefundPayment => client.PostAsync(apiCommand, GetContent()),
+                    //PUT
+                    ApiCommand.UpdatePaymentReference => client.PutAsync(apiCommand, GetContent()),
                     //GET                 
                     ApiCommand.GetPayment => client.GetAsync(apiCommand),
                     _ => throw new NotSupportedException($"Unknown operation was used. The operation code: {configuration.CommandType}.")
@@ -107,6 +109,7 @@ private static string GetCommandLink(string baseAddress, ApiCommand command, str
             ApiCommand.GetPayment => GetCommandLink($"payments/{operatorId}"),
             ApiCommand.CancelPayment => GetCommandLink($"payments/{operatorId}/cancels"),
             ApiCommand.CapturePayment => GetCommandLink($"payments/{operatorId}/charges"),
+            ApiCommand.UpdatePaymentReference => GetCommandLink($"payments/{operatorId}/referenceinformation"),
             ApiCommand.RefundPayment => GetCommandLink($"charges/{operatorId}/refunds"),
             _ => throw new NotSupportedException($"The api command is not supported. Command: {command}")
         };

diff --git a/src/Service/DibsService.cs b/src/Service/DibsService.cs
@@ -77,16 +77,24 @@ public RefundPaymentResponse RefundPayment(string paymentId, long amount)
         return Converter.Deserialize<RefundPaymentResponse>(response);
     }
 
-    public void CancelPayment(string paymentId, long amount)
+    public void CancelPayment(string paymentId, long amount) => DibsRequest.SendRequest(Order, ApiUrl, SecretKey, new()
     {
-        string response = DibsRequest.SendRequest(Order, ApiUrl, SecretKey, new()
+        CommandType = ApiCommand.CancelPayment,
+        OperatorId = paymentId,
+        Data = new CancelPaymentRequest
         {
-            CommandType = ApiCommand.CancelPayment,
-            OperatorId = paymentId,
-            Data = new CancelPaymentRequest
-            {
-                Amount = amount
-            }
-        });
-    }
+            Amount = amount
+        }
+    });
+
+    public void UpdatePaymentReference(string paymentId, string checkoutUrl) => DibsRequest.SendRequest(Order, ApiUrl, SecretKey, new()
+    {
+        CommandType = ApiCommand.UpdatePaymentReference,
+        OperatorId = paymentId,
+        Data = new UpdatePaymentReferenceRequest
+        {
+            Reference = Order.Id,
+            CheckoutUrl = checkoutUrl
+        }
+    });
 }
diff --git a/src/Updates/DibsUpdateProvider.cs b/src/Updates/DibsUpdateProvider.cs
@@ -19,7 +19,7 @@ public override IEnumerable<Update> GetUpdates()
         return new List<Update>()
         {
             new FileUpdate("39da8029-91d8-4a10-a5e3-e4cc38330188", this, "/Files/Templates/eCom7/CheckoutHandler/DibsEasy/Error/checkouthandler_error.cshtml", () => GetResourceStream("checkouthandler_error.cshtml")),
-            new FileUpdate("2d813363-d092-47ef-b9f1-12aca0034508", this, "/Files/Templates/eCom7/CheckoutHandler/DibsEasy/Form/EmbededDibs.cshtml", () => GetResourceStream("EmbededDibs.cshtml")),
+            new FileUpdate("e0fc296d-b6b4-40b9-8ec1-ec0458504f10", this, "/Files/Templates/eCom7/CheckoutHandler/DibsEasy/Form/EmbededDibs.cshtml", () => GetResourceStream("EmbededDibs.cshtml")),
             new FileUpdate("8ac8cb90-18bb-40b0-a392-0acccc6df1ea", this, "/Files/Templates/eCom7/CheckoutHandler/DibsEasy/Form/HostedPaymentDibs.cshtml", () => GetResourceStream("HostedPaymentDibs.cshtml"))
         };
     }

diff --git a/src/Updates/EmbededDibs.cshtml b/src/Updates/EmbededDibs.cshtml
@@ -4,13 +4,9 @@
     <label>Order ID: <b>@GetString("Ecom:Order.ID")</b></label> <br />
     <label>Amount: <b>@GetString("Ecom:Order.Price.PriceWithVATFormatted")</b></label> <br />
 </p>
-
 <div id="dibs-complete-checkout"> </div>
 
 <script src="@GetString("DibsEasy.checkoutSrc")"></script>
-
-
-
 <script type="text/javascript" script-src="self">
     var key = "@GetString("DibsEasy.checkoutKey")";
     var paymentId = "@GetString("DibsEasy.paymentId")";
@@ -37,8 +33,4 @@
             }
         });
     }
-</script>
-
-
-
-<div>@TemplateTags()</div>
+</script>
diff --git a/src/dibs-logo.png b/src/dibs-logo.png