Bug/gateway result status (#73)

* Gateways result status bug is fixed.
Sina-Soltani · Apr 14, 2020 · cd6ac5e · cd6ac5e
1 parent db0ddb9
commit cd6ac5e
Show file tree

Hide file tree

Showing 20 changed files with 42 additions and 36 deletions.
diff --git a/samples/Parbad.Sample.Mvc/Views/Home/Index.cshtml b/samples/Parbad.Sample.Mvc/Views/Home/Index.cshtml
@@ -3,6 +3,6 @@
 <div class="text-center">
     <h1 class="display-4">Parbad Demo</h1>
     <br />
-    <a href="@Url.Action("PayRequest", "Payment")" class="btn btn-primary btn-lg">Make a payment</a>
+    <a href="@Url.Action("Pay", "Payment")" class="btn btn-primary btn-lg">Make a payment</a>
     <a href="@Url.Action("Refund", "Payment")" class="btn btn-primary btn-lg">Refund a payment</a>
 </div>
diff --git a/samples/Parbad.Sample.Mvc/Views/Shared/_Layout.cshtml b/samples/Parbad.Sample.Mvc/Views/Shared/_Layout.cshtml
@@ -16,11 +16,11 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                @Html.ActionLink("Parbad Demo", "PayRequest", "Payment", new { area = "" }, new { @class = "navbar-brand" })
+                @Html.ActionLink("Parbad Demo", "Pay", "Payment", new { area = "" }, new { @class = "navbar-brand" })
             </div>
             <div class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
-                    <li>@Html.ActionLink("Make a payment", "PayRequest", "Payment")</li>
+                    <li>@Html.ActionLink("Make a payment", "Pay", "Payment")</li>
                     <li>@Html.ActionLink("Refund a payment", "Refund", "Payment")</li>
                 </ul>
             </div>

diff --git a/src/Parbad.AspNetCore/Parbad.AspNetCore.csproj b/src/Parbad.AspNetCore/Parbad.AspNetCore.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
-    <VersionPrefix>1.0.4</VersionPrefix>
+    <VersionPrefix>1.0.5</VersionPrefix>
     <Authors>Sina Soltani</Authors>
     <Copyright>Copyright © Sina Soltani 2016</Copyright>
     <PackageLicenseUrl></PackageLicenseUrl>
@@ -18,7 +18,7 @@ For more information see: https://www.nuget.org/packages/Parbad/</Description>
     <PackageTags>parbad aspnetcore Payment Gateway Bank Iran Shetab IranKish Mellat Melli Sadad Parsian Pasargad Saman Asan-Pardakht پرداخت درگاه بانک ایران شتاب ایران-کیش ملت ملی سداد پارسیان پاسارگاد سامان آسان-پرداخت</PackageTags>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
-    <PackageReleaseNotes>Code improvement.</PackageReleaseNotes>
+    <PackageReleaseNotes>Bug Ticket #71 is fixed.</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/src/Parbad.Gateway/IdPay/src/Parbad.Gateway.IdPay.csproj b/src/Parbad.Gateway/IdPay/src/Parbad.Gateway.IdPay.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
-    <VersionPrefix>1.0.1</VersionPrefix>
+    <VersionPrefix>1.0.2</VersionPrefix>
     <LangVersion>latest</LangVersion>
     <Authors>Sina Soltani</Authors>
     <Copyright>Copyright © Sina Soltani 2016</Copyright>
@@ -16,7 +16,7 @@
     <Description>IDPay.ir Gateway for Parbad project.
 
 For more information see: https://www.nuget.org/packages/Parbad/</Description>
-    <PackageReleaseNotes>Newtonsoft.Json is upgraded to version 11.0.1.</PackageReleaseNotes>
+    <PackageReleaseNotes>Bug Ticket #71 is fixed.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Parbad.Gateway/PayIr/src/Parbad.Gateway.PayIr.csproj b/src/Parbad.Gateway/PayIr/src/Parbad.Gateway.PayIr.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.1.1</VersionPrefix>
     <LangVersion>latest</LangVersion>
     <Authors>Sina Soltani</Authors>
     <Copyright>Copyright © Sina Soltani 2016</Copyright>
@@ -16,7 +16,7 @@
     <Description>Pay.ir Gateway for Parbad project.
 
 For more information see: https://www.nuget.org/packages/Parbad/</Description>
-    <PackageReleaseNotes>Verify Response Additional Data (ex. masked card number) are now included in the result object.</PackageReleaseNotes>
+    <PackageReleaseNotes>Bug Ticket #71 is fixed.</PackageReleaseNotes>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Parbad\Parbad.csproj" />

diff --git a/src/Parbad.Gateway/ZarinPal/src/Parbad.Gateway.ZarinPal.csproj b/src/Parbad.Gateway/ZarinPal/src/Parbad.Gateway.ZarinPal.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
-    <VersionPrefix>1.0.3</VersionPrefix>
+    <VersionPrefix>1.0.4</VersionPrefix>
     <LangVersion>latest</LangVersion>
     <Authors>Sina Soltani</Authors>
     <Copyright>Copyright © Sina Soltani 2016</Copyright>
@@ -16,7 +16,7 @@
     <Description>ZarinPal Gateway for Parbad project.
 
 For more information see: https://github.com/Sina-Soltani/Parbad</Description>
-    <PackageReleaseNotes>The bug for ticket #62 is fixed.</PackageReleaseNotes>
+    <PackageReleaseNotes>Bug Ticket #71 is fixed.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Parbad.Mvc/Parbad.Mvc.csproj b/src/Parbad.Mvc/Parbad.Mvc.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
-    <VersionPrefix>2.0.3</VersionPrefix>
+    <VersionPrefix>2.0.4</VersionPrefix>
     <LangVersion>latest</LangVersion>
     <Authors>Sina Soltani</Authors>
     <Description>ASP.NET MVC 4 and 5 integration for Parbad project.
@@ -20,6 +20,7 @@ For more information see: https://www.nuget.org/packages/Parbad/</Description>
     <PackageTags>parbad mvc Payment Gateway Bank Iran Shetab IranKish Mellat Melli Sadad Parsian Pasargad Saman Asan-Pardakht پرداخت درگاه بانک ایران شتاب ایران-کیش ملت ملی سداد پارسیان پاسارگاد سامان آسان-پرداخت</PackageTags>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
+    <PackageReleaseNotes>Bug Ticket #71 is fixed.</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/src/Parbad.Owin/Parbad.Owin.csproj b/src/Parbad.Owin/Parbad.Owin.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
-    <VersionPrefix>1.0.2</VersionPrefix>
+    <VersionPrefix>1.0.3</VersionPrefix>
     <LangVersion>latest</LangVersion>
     <Authors>Sina Soltani</Authors>
     <Description>Owin integration for Parbad project.
@@ -18,6 +18,7 @@ For more information see: https://www.nuget.org/packages/Parbad/</Description>
     <PackageTags>parbad owin webforms Payment Gateway Bank Iran Shetab IranKish Mellat Melli Sadad Parsian Pasargad Saman Asan-Pardakht پرداخت درگاه بانک ایران شتاب ایران-کیش ملت ملی سداد پارسیان پاسارگاد سامان آسان-پرداخت</PackageTags>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
+    <PackageReleaseNotes>Bug Ticket #71 is fixed.</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/src/Parbad.Storage/Cache/src/Parbad.Storage.Cache.csproj b/src/Parbad.Storage/Cache/src/Parbad.Storage.Cache.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageId>Parbad.Storage.Cache</PackageId>
-    <VersionPrefix>1.0.1</VersionPrefix>
+    <VersionPrefix>1.0.2</VersionPrefix>
     <LangVersion>latest</LangVersion>
     <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
@@ -17,7 +17,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Authors>Sina Soltani</Authors>
     <Product>Parbad.Storage.Cache</Product>
-    <PackageReleaseNotes>Targeting .NETCORE3.x is added.</PackageReleaseNotes>
+    <PackageReleaseNotes>Bug Ticket #71 is fixed.</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/src/Parbad.Storage/EntityFrameworkCore/src/Parbad.Storage.EntityFrameworkCore.csproj b/src/Parbad.Storage/EntityFrameworkCore/src/Parbad.Storage.EntityFrameworkCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageId>Parbad.Storage.EntityFrameworkCore</PackageId>
-    <VersionPrefix>1.0.3</VersionPrefix>
+    <VersionPrefix>1.0.4</VersionPrefix>
     <LangVersion>latest</LangVersion>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
@@ -17,7 +17,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Authors>Sina Soltani</Authors>
     <Product>Parbad.Storage.EntityframeworkCore</Product>
-    <PackageReleaseNotes>EF CORE implementation of StorageManager is added.</PackageReleaseNotes>
+    <PackageReleaseNotes>Bug Ticket #71 is fixed.</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/src/Parbad/Gateway/AsanPardakht/Internal/AsanPardakhtHelper.cs b/src/Parbad/Gateway/AsanPardakht/Internal/AsanPardakhtHelper.cs
@@ -149,7 +149,7 @@ public static AsanPardakhtCallbackResult CreateCallbackResult(
                 {
                     verifyResult = new PaymentVerifyResult
                     {
-                        IsSucceed = false,
+                        Status = PaymentVerifyResultStatus.Failed,
                         TrackingNumber = context.Payment.TrackingNumber,
                         TransactionCode = rrn,
                         Message = message
@@ -253,7 +253,7 @@ public static PaymentVerifyResult CreateSettleResult(
 
             var verifyResult = new PaymentVerifyResult
             {
-                IsSucceed = isSucceed,
+                Status = isSucceed ? PaymentVerifyResultStatus.Succeed : PaymentVerifyResultStatus.Failed,
                 TransactionCode = callbackResult.Rrn,
                 Message = message
             };

diff --git a/src/Parbad/Gateway/IranKish/Internal/IranKishHelper.cs b/src/Parbad/Gateway/IranKish/Internal/IranKishHelper.cs
@@ -121,7 +121,7 @@ public static IranKishCallbackResult CreateCallbackResult(
                     {
                         TrackingNumber = invoiceNumber,
                         TransactionCode = referenceId,
-                        IsSucceed = false,
+                        Status = PaymentVerifyResultStatus.Failed,
                         Message = translatedMessage
                     };
                 }
@@ -168,7 +168,7 @@ public static PaymentVerifyResult CreateVerifyResult(
                 {
                     TrackingNumber = callbackResult.InvoiceNumber,
                     TransactionCode = callbackResult.ReferenceId,
-                    IsSucceed = false,
+                    Status = PaymentVerifyResultStatus.Failed,
                     Message = messagesOptions.InvalidDataReceivedFromGateway
                 };
             }
@@ -183,7 +183,7 @@ public static PaymentVerifyResult CreateVerifyResult(
             {
                 TrackingNumber = callbackResult.InvoiceNumber,
                 TransactionCode = callbackResult.ReferenceId,
-                IsSucceed = true,
+                Status = PaymentVerifyResultStatus.Succeed,
                 Message = translatedMessage
             };
         }

diff --git a/src/Parbad/Gateway/Mellat/Internal/MellatHelper.cs b/src/Parbad/Gateway/Mellat/Internal/MellatHelper.cs
@@ -187,7 +187,7 @@ public static PaymentVerifyResult CreateSettleResult(string webServiceResponse,
 
             return new PaymentVerifyResult
             {
-                IsSucceed = isSuccess,
+                Status = isSuccess ? PaymentVerifyResultStatus.Succeed : PaymentVerifyResultStatus.Failed,
                 TransactionCode = callbackResult.SaleReferenceId,
                 Message = message,
             };
@@ -223,7 +223,7 @@ public static PaymentRefundResult CreateRefundResult(string webServiceResponse,
 
             return new PaymentRefundResult
             {
-                IsSucceed = isSuccess,
+                Status = isSuccess ? PaymentRefundResultStatus.Succeed : PaymentRefundResultStatus.Failed,
                 Message = message
             };
         }

diff --git a/src/Parbad/Gateway/Melli/Internal/MelliHelper.cs b/src/Parbad/Gateway/Melli/Internal/MelliHelper.cs
@@ -107,7 +107,7 @@ public static MelliCallbackResult CreateCallbackResult(InvoiceContext context, H
             };
         }
 
-        public static PaymentVerifyResult CreateVerifyResult(string token, MelliApiVerifyResult result, MessagesOptions messagesOptions)
+        public static PaymentVerifyResult CreateVerifyResult(MelliApiVerifyResult result, MessagesOptions messagesOptions)
         {
             if (result == null)
             {
@@ -125,9 +125,13 @@ public static PaymentVerifyResult CreateVerifyResult(string token, MelliApiVerif
                 message = MelliVerifyResultTranslator.Translate(result.ResCode, messagesOptions);
             }
 
+            var status = result.ResCode == SuccessCode
+                ? PaymentVerifyResultStatus.Succeed
+                : PaymentVerifyResultStatus.Failed;
+
             return new PaymentVerifyResult
             {
-                IsSucceed = result.ResCode == SuccessCode,
+                Status = status,
                 TransactionCode = result.RetrivalRefNo,
                 Message = message
             };

diff --git a/src/Parbad/Gateway/Melli/MelliGateway.cs b/src/Parbad/Gateway/Melli/MelliGateway.cs
@@ -83,7 +83,7 @@ public override async Task<IPaymentVerifyResult> VerifyAsync(InvoiceContext cont
 
             var result = await PostJsonAsync<MelliApiVerifyResult>(MelliHelper.ServiceVerifyUrl, data.JsonDataToVerify, cancellationToken).ConfigureAwaitFalse();
 
-            return MelliHelper.CreateVerifyResult(data.Token, result, _messageOptions.Value);
+            return MelliHelper.CreateVerifyResult(result, _messageOptions.Value);
         }
 
         /// <inheritdoc />

diff --git a/src/Parbad/Gateway/ParbadVirtual/ParbadVirtualGateway.cs b/src/Parbad/Gateway/ParbadVirtual/ParbadVirtualGateway.cs
@@ -77,7 +77,7 @@ public override Task<IPaymentVerifyResult> VerifyAsync(InvoiceContext context, C
 
             return new PaymentVerifyResult
             {
-                IsSucceed = isSucceed,
+                Status = isSucceed ? PaymentVerifyResultStatus.Succeed : PaymentVerifyResultStatus.Failed,
                 TransactionCode = transactionCode,
                 Message = message
             }.ToInterfaceAsync();

diff --git a/src/Parbad/Gateway/Parsian/Internal/ParsianHelper.cs b/src/Parbad/Gateway/Parsian/Internal/ParsianHelper.cs
@@ -184,7 +184,7 @@ public static PaymentVerifyResult CreateVerifyResult(string webServiceResponse,
 
             var result = new PaymentVerifyResult
             {
-                IsSucceed = isSucceed,
+                Status = isSucceed ? PaymentVerifyResultStatus.Succeed : PaymentVerifyResultStatus.Failed,
                 TransactionCode = rrn,
                 Message = message
             };
@@ -234,7 +234,7 @@ public static PaymentRefundResult CreateRefundResult(string webServiceResponse,
 
             var result = new PaymentRefundResult
             {
-                IsSucceed = status == "0",
+                Status = status == "0" ? PaymentRefundResultStatus.Succeed : PaymentRefundResultStatus.Failed,
                 Message = message
             };
 

diff --git a/src/Parbad/Gateway/Pasargad/Internal/PasargadHelper.cs b/src/Parbad/Gateway/Pasargad/Internal/PasargadHelper.cs
@@ -185,7 +185,7 @@ public static PaymentVerifyResult CreateVerifyResult(string webServiceResponse,
 
             return new PaymentVerifyResult
             {
-                IsSucceed = isSucceed,
+                Status = isSucceed ? PaymentVerifyResultStatus.Succeed : PaymentVerifyResultStatus.Failed,
                 TransactionCode = callbackResult.TransactionId,
                 Message = message
             };
@@ -243,7 +243,7 @@ public static PaymentRefundResult CreateRefundResult(string webServiceResponse,
 
             return new PaymentRefundResult
             {
-                IsSucceed = isSucceed,
+                Status = isSucceed ? PaymentRefundResultStatus.Succeed : PaymentRefundResultStatus.Failed,
                 Message = message
             };
         }

diff --git a/src/Parbad/Gateway/Saman/Internal/SamanHelper.cs b/src/Parbad/Gateway/Saman/Internal/SamanHelper.cs
@@ -105,7 +105,7 @@ public static PaymentVerifyResult CreateVerifyResult(string webServiceResponse,
 
             return new PaymentVerifyResult
             {
-                IsSucceed = isSuccess,
+                Status = isSuccess ? PaymentVerifyResultStatus.Succeed : PaymentVerifyResultStatus.Failed,
                 TransactionCode = callbackResult.TransactionId,
                 Message = message
             };
@@ -139,7 +139,7 @@ public static PaymentRefundResult CreateRefundResult(string webServiceResponse,
 
             return new PaymentRefundResult
             {
-                IsSucceed = isSucceed,
+                Status = isSucceed ? PaymentRefundResultStatus.Succeed : PaymentRefundResultStatus.Failed,
                 Message = message
             };
         }

diff --git a/src/Parbad/Parbad.csproj b/src/Parbad/Parbad.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
-    <VersionPrefix>3.3.2</VersionPrefix>
+    <VersionPrefix>3.3.3</VersionPrefix>
     <Authors>Parbad Sina Soltani</Authors>
     <Description>Parbad is a free and open-source integrated online payment library which helps developers and site owners to add the online payment ability to their websites. It provides an easy solution to perform payment request, verify a payment and refund a paid payment.
 It supports the most known online payment providers in Iran such as Mellat, Melli, Parsian, Tejarat, Saman, Pasargad and Asan Pardakht.
@@ -20,7 +20,7 @@ More information: https://github.com/Sina-Soltani/Parbad
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageTags>parbad Payment Gateway virtual virtual-gateway Bank Iran Shetab IranKish Mellat Melli Sadad Parsian Pasargad Saman Asan-Pardakht پرداخت درگاه بانک ایران شتاب ایران-کیش ملت ملی سداد پارسیان پاسارگاد سامان آسان-پرداخت</PackageTags>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageReleaseNotes>Code improvement.</PackageReleaseNotes>
+    <PackageReleaseNotes>Bug Ticket #71 is fixed.</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">