From 8cc311b8884b97d6f218516bef994574e264a721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 1 Nov 2021 14:48:01 +0300 Subject: [PATCH] Fixed PaymentRequest --- .../PaymentRequests/PaymentRequestAppService.cs | 3 ++- .../src/Payment.Domain/PaymentRequests/PaymentRequest.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/payment/src/Payment.Application/PaymentRequests/PaymentRequestAppService.cs b/modules/payment/src/Payment.Application/PaymentRequests/PaymentRequestAppService.cs index ecf79db..b585580 100644 --- a/modules/payment/src/Payment.Application/PaymentRequests/PaymentRequestAppService.cs +++ b/modules/payment/src/Payment.Application/PaymentRequests/PaymentRequestAppService.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Volo.Abp.Data; +using Volo.Abp.ObjectExtending; namespace Payment.PaymentRequests { @@ -152,7 +153,7 @@ namespace Payment.PaymentRequests var paymentRequest = await _paymentRequestRepository.GetAsync(paymentRequestId); - if (order.Status == PayPalConsts.OrderStatus.Completed || order.Status == PayPalConsts.OrderStatus.Approved) + if (order.Status is PayPalConsts.OrderStatus.Completed or PayPalConsts.OrderStatus.Approved) { paymentRequest.SetAsCompleted(); } diff --git a/modules/payment/src/Payment.Domain/PaymentRequests/PaymentRequest.cs b/modules/payment/src/Payment.Domain/PaymentRequests/PaymentRequest.cs index fa0090f..48fe239 100644 --- a/modules/payment/src/Payment.Domain/PaymentRequests/PaymentRequest.cs +++ b/modules/payment/src/Payment.Domain/PaymentRequests/PaymentRequest.cs @@ -68,7 +68,7 @@ namespace Payment.PaymentRequests public virtual void SetAsFailed(string failReason) { - if (State != PaymentRequestState.Failed) + if (State == PaymentRequestState.Failed) { return; }