Merge pull request #93 from Sina-Soltani/bug/FixingTheConfigureOption…

…sConfiguration Bug/fixing the configure options configuration
Sina-Soltani · Jun 30, 2020 · 253a32b · 253a32b
2 parents e351441 + 7826ea4
commit 253a32b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 18 deletions.
diff --git a/samples/Parbad.Sample.AspNetCore/Controllers/PaymentController.cs b/samples/Parbad.Sample.AspNetCore/Controllers/PaymentController.cs
@@ -42,14 +42,13 @@ public async Task<IActionResult> Pay(PayViewModel viewModel)
                 }
             });
 
+            // Save the result.TrackingNumber in your database.
+
             if (result.IsSucceed)
             {
                 return result.GatewayTransporter.TransportToGateway();
             }
 
-            // Note: This is just for development and testing.
-            // Don't show the actual result object to clients in production environment.
-            // Instead, show only the important information such as IsSucceed, Tracking Number and Transaction Code.
             return View("PayRequestError", result);
         }
 
@@ -67,7 +66,7 @@ public async Task<IActionResult> Verify()
                 return Content("The payment is already processed before.");
             }
 
-            // An example of checking the invoice in your website.
+            // This is an example of cancelling an invoice when you think that the payment process must be stopped.
             if (!Is_There_Still_Product_In_Shop(invoice.TrackingNumber))
             {
                 var cancelResult = await _onlinePayment.CancelAsync(invoice, cancellationReason: "Sorry, We have no more products to sell.");

diff --git a/samples/Parbad.Sample.Mvc/Controllers/PaymentController.cs b/samples/Parbad.Sample.Mvc/Controllers/PaymentController.cs
@@ -47,14 +47,13 @@ public async Task<ActionResult> Pay(RequestViewModel viewModel)
                 }
             });
 
+            // Save the result.TrackingNumber in your database.
+
             if (result.IsSucceed)
             {
                 return result.GatewayTransporter.TransportToGateway();
             }
 
-            // Note: This is just for development and testing.
-            // Don't show the actual result object to clients in production environment.
-            // Instead, show only the important information such as IsSucceed, Tracking Number and Transaction Code.
             return View("PayRequestError", result);
         }
 
@@ -72,7 +71,7 @@ public async Task<ActionResult> Verify()
                 return Content("The payment is already processed before.");
             }
 
-            // An example of checking the invoice in your website.
+            // This is an example of cancelling an invoice when you think that the payment process must be stopped.
             if (!Is_There_Still_Product_In_Shop(invoice.TrackingNumber))
             {
                 var cancelResult = await _onlinePayment.CancelAsync(invoice, cancellationReason: "Sorry, We have no more products to sell.");

diff --git a/samples/Parbad.Sample.WebForm/PayRequest.aspx.cs b/samples/Parbad.Sample.WebForm/PayRequest.aspx.cs
@@ -38,6 +38,8 @@ protected async void BtnPay_Click(object sender, EventArgs e)
                 }
             });
 
+            // Save the result.TrackingNumber in your database.
+
             if (result.IsSucceed)
             {
                 await result.GatewayTransporter.TransportAsync();
@@ -46,9 +48,6 @@ protected async void BtnPay_Click(object sender, EventArgs e)
             {
                 ResultPanel.Visible = true;
 
-                // Note: This is just for development and testing.
-                // Don't show the actual result object to clients in production environment.
-                // Instead, show only the important information such as IsSucceed, Tracking Number and Transaction Code.
                 LblTrackingNumber.Text = result.TrackingNumber.ToString();
                 LblAmount.Text = result.Amount.ToString();
                 LblGateway.Text = result.GatewayName;

diff --git a/samples/Parbad.Sample.WebForm/Verify.aspx.cs b/samples/Parbad.Sample.WebForm/Verify.aspx.cs
@@ -12,6 +12,7 @@ protected async void Page_Load(object sender, EventArgs e)
 
             var invoice = await StaticOnlinePayment.Instance.FetchAsync();
 
+            // This is an example of cancelling an invoice when you think that the payment process must be stopped.
             if (Is_There_Still_Product_In_Shop(invoice.TrackingNumber))
             {
                 var verifyResult = await StaticOnlinePayment.Instance.VerifyAsync(invoice);

diff --git a/src/Parbad/Options/ParbadOptionsExtensions.cs b/src/Parbad/Options/ParbadOptionsExtensions.cs
@@ -23,12 +23,7 @@ public static IParbadBuilder ConfigureOptions(this IParbadBuilder builder, Actio
 
             builder.Services.Configure(setupOptions);
 
-            builder.Services.AddTransient<IOptions<MessagesOptions>>(provider =>
-            {
-                var messages = provider.GetRequiredService<IOptions<ParbadOptions>>().Value.Messages;
-
-                return new OptionsWrapper<MessagesOptions>(messages);
-            });
+            RegisterMessagesOptions(builder);
 
             return builder;
         }
@@ -45,6 +40,8 @@ public static IParbadBuilder ConfigureOptions(this IParbadBuilder builder, IConf
 
             builder.Services.Configure<ParbadOptions>(configuration);
 
+            RegisterMessagesOptions(builder);
+
             return builder;
         }
 
@@ -69,5 +66,15 @@ public static IParbadBuilder ConfigureMessages(this IParbadBuilder builder, ICon
 
             return builder;
         }
+
+        private static void RegisterMessagesOptions(IParbadBuilder builder)
+        {
+            builder.Services.AddTransient<IOptions<MessagesOptions>>(provider =>
+            {
+                var messages = provider.GetRequiredService<IOptions<ParbadOptions>>().Value.Messages;
+
+                return new OptionsWrapper<MessagesOptions>(messages);
+            });
+        }
     }
 }
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.5.0</VersionPrefix>
+    <VersionPrefix>3.5.1</VersionPrefix>
     <Authors>Parbad Sina Soltani</Authors>
     <Description>Parbad is a free, open-source, integrated and extensible library which connects your web applications to online payment gateways. Gateways can be added or developed by you.
 The Virtual Gateway also simulates the online payment process, which helps the application development.