Merge branch 'payment-module' of https://github.com/volosoft/eventhub into payment-module

modules/payment/src/Payment.Domain.Shared/PaymentRequests/PaymentRequestCompletedEto.cs

@@ -8,6 +8,7 @@ namespace Payment.PaymentRequests
     public class PaymentRequestCompletedEto : EtoBase, IHasExtraProperties
     {
         public Guid PaymentRequestId { get; set; }
+        
         public ExtraPropertyDictionary ExtraProperties { get; set; }
     }
 }

modules/payment/src/Payment.Domain/PaymentRequests/PaymentRequest.cs

@@ -25,6 +25,7 @@ namespace Payment.PaymentRequests
 
         public bool IsDeleted { get; set; }
 
+        [CanBeNull]
         public string FailReason { get; protected set; }
 
         private PaymentRequest()

modules/payment/src/Payment.HttpApi/PaymentRequests/PaymentRequestController.cs

@@ -5,7 +5,7 @@ using Volo.Abp;
 
 namespace Payment.PaymentRequests
 {
-	[RemoteService(Name = PaymentRemoteServiceConsts.RemoteServiceName)]
+    [RemoteService(Name = PaymentRemoteServiceConsts.RemoteServiceName)]
     [Area("payment")]
     [Route("api/payment/requests")]
     public class PaymentRequestController : PaymentController, IPaymentRequestAppService
@@ -44,4 +44,4 @@ namespace Payment.PaymentRequests
             return PaymentRequestAppService.StartPaymentAsync(input);
         }
     }
-}
+}

modules/payment/src/Payment.Web/Pages/Payment/PostCheckout.cshtml.cs

@@ -39,7 +39,7 @@ namespace Payment.Web.Pages.Payment
 
             PaymentRequest = await _paymentRequestAppService.CompleteAsync(Token);
 
-            GoBackLink = _paymentUrlBuilder.BuildReturnUrl(PaymentRequest.Id).AbsoluteUri;
+            GoBackLink = _paymentUrlBuilder.BuildCheckoutUrl(PaymentRequest.Id).AbsoluteUri;
 
             if (PaymentRequest.State == PaymentRequestState.Completed 
                 && !_paymentWebOptions.PaymentSuccessfulCallbackUrl.IsNullOrWhiteSpace())