From f016059816da7b101a694ba18b1d91458acfdbcd Mon Sep 17 00:00:00 2001 From: Sergey Date: Wed, 11 Nov 2026 14:05:52 +0300 Subject: [PATCH] Do not mark a canceled order as paid on Momo payment callbacks Record the payment as succeeded with a refund-required note instead. --- .../Services/IOrderService.cs | 2 + .../Services/OrderService.cs | 5 +++ .../Controllers/MomoPaymentController.cs | 41 ++++++++++++++++++- .../OrderServiceTests.cs | 26 ++++++++++++ .../SimplCommerce.Module.Orders.Tests.csproj | 21 ++++++++++ 5 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 test/SimplCommerce.Module.Orders.Tests/OrderServiceTests.cs create mode 100644 test/SimplCommerce.Module.Orders.Tests/SimplCommerce.Module.Orders.Tests.csproj diff --git a/src/Modules/SimplCommerce.Module.Orders/Services/IOrderService.cs b/src/Modules/SimplCommerce.Module.Orders/Services/IOrderService.cs index bbbea6c49c..edf07060e7 100644 --- a/src/Modules/SimplCommerce.Module.Orders/Services/IOrderService.cs +++ b/src/Modules/SimplCommerce.Module.Orders/Services/IOrderService.cs @@ -15,6 +15,8 @@ public interface IOrderService void CancelOrder(Order order); + bool IsAwaitingPayment(Order order); + Task GetTax(Guid checkoutId, string countryId, long stateOrProvinceId, string zipCode); } } diff --git a/src/Modules/SimplCommerce.Module.Orders/Services/OrderService.cs b/src/Modules/SimplCommerce.Module.Orders/Services/OrderService.cs index 6ed129707f..2c4aa9f9d3 100644 --- a/src/Modules/SimplCommerce.Module.Orders/Services/OrderService.cs +++ b/src/Modules/SimplCommerce.Module.Orders/Services/OrderService.cs @@ -367,6 +367,11 @@ public void CancelOrder(Order order) } } + public bool IsAwaitingPayment(Order order) + { + return order.OrderStatus == OrderStatus.PendingPayment || order.OrderStatus == OrderStatus.PaymentFailed; + } + public async Task GetTax(Guid checkoutId, string countryId, long stateOrProvinceId, string zipCode) { decimal taxAmount = 0; diff --git a/src/Modules/SimplCommerce.Module.PaymentMomo/Areas/PaymentMomo/Controllers/MomoPaymentController.cs b/src/Modules/SimplCommerce.Module.PaymentMomo/Areas/PaymentMomo/Controllers/MomoPaymentController.cs index 75ac6fd04c..b36f074f57 100644 --- a/src/Modules/SimplCommerce.Module.PaymentMomo/Areas/PaymentMomo/Controllers/MomoPaymentController.cs +++ b/src/Modules/SimplCommerce.Module.PaymentMomo/Areas/PaymentMomo/Controllers/MomoPaymentController.cs @@ -120,7 +120,9 @@ public async Task Result(PaymentSubmitResult result) } else { - TempData["Error"] = result.LocalMessage; + TempData["Error"] = order.OrderStatus == OrderStatus.Canceled && result.ErrorCode == 0 + ? "Your payment was received after the order had been canceled. Please contact us for a refund." + : result.LocalMessage; return Redirect($"~/checkout/error?orderId={orderId}"); } } @@ -137,7 +139,7 @@ public async Task Notify([FromBody]PaymentSubmitResult result) var order = await _orderRepository.Query().FirstOrDefaultAsync(x => x.Id == orderId); // Update status in case the redirect fail - if(order != null && order.OrderStatus == OrderStatus.PendingPayment) + if(order != null && (_orderService.IsAwaitingPayment(order) || order.OrderStatus == OrderStatus.Canceled)) { await UpdatePaymentStatus(order, result); } @@ -145,9 +147,44 @@ public async Task Notify([FromBody]PaymentSubmitResult result) return Accepted(); } + private async Task RecordPaymentForCanceledOrder(Order order, PaymentSubmitResult paymentSubmitResult) + { + // result and notify may both report the same transaction + var alreadyRecorded = await _paymentRepository.Query() + .AnyAsync(x => x.OrderId == order.Id && x.GatewayTransactionId == paymentSubmitResult.TransId); + if (alreadyRecorded) + { + return; + } + + _paymentRepository.Add(new Payment() + { + OrderId = order.Id, + PaymentFee = order.PaymentFeeAmount, + Amount = order.OrderTotal, + PaymentMethod = "MomoPayment", + CreatedOn = DateTimeOffset.UtcNow, + Status = PaymentStatus.Succeeded, + GatewayTransactionId = paymentSubmitResult.TransId, + FailureMessage = "Payment received after the order was canceled. Refund required." + }); + await _paymentRepository.SaveChangesAsync(); + } + public async Task UpdatePaymentStatus(Order order, PaymentSubmitResult paymentSubmitResult) { bool status = false; + if (!_orderService.IsAwaitingPayment(order)) + { + if (order.OrderStatus == OrderStatus.Canceled && paymentSubmitResult.ErrorCode == 0) + { + await RecordPaymentForCanceledOrder(order, paymentSubmitResult); + } + + // Do not move a canceled (or otherwise already processed) order back to a payment status. + return order.OrderStatus != OrderStatus.Canceled && paymentSubmitResult.ErrorCode == 0; + } + var payment = new Payment() { OrderId = order.Id, diff --git a/test/SimplCommerce.Module.Orders.Tests/OrderServiceTests.cs b/test/SimplCommerce.Module.Orders.Tests/OrderServiceTests.cs new file mode 100644 index 0000000000..01293fbfb2 --- /dev/null +++ b/test/SimplCommerce.Module.Orders.Tests/OrderServiceTests.cs @@ -0,0 +1,26 @@ +using SimplCommerce.Module.Orders.Models; +using SimplCommerce.Module.Orders.Services; +using Xunit; + +namespace SimplCommerce.Module.Orders.Tests +{ + public class OrderServiceTests + { + // IsAwaitingPayment does not use any of the dependencies + private readonly OrderService _orderService = new OrderService(null, null, null, null, null, null, null, null, null, null, null); + + [Theory] + [InlineData(OrderStatus.PendingPayment, true)] + [InlineData(OrderStatus.PaymentFailed, true)] + [InlineData(OrderStatus.Canceled, false)] + [InlineData(OrderStatus.PaymentReceived, false)] + [InlineData(OrderStatus.New, false)] + [InlineData(OrderStatus.Shipped, false)] + public void IsAwaitingPayment_ReturnsTrueOnlyForUnpaidOrders(OrderStatus status, bool expected) + { + var order = new Order { OrderStatus = status }; + + Assert.Equal(expected, _orderService.IsAwaitingPayment(order)); + } + } +} diff --git a/test/SimplCommerce.Module.Orders.Tests/SimplCommerce.Module.Orders.Tests.csproj b/test/SimplCommerce.Module.Orders.Tests/SimplCommerce.Module.Orders.Tests.csproj new file mode 100644 index 0000000000..69319e3e05 --- /dev/null +++ b/test/SimplCommerce.Module.Orders.Tests/SimplCommerce.Module.Orders.Tests.csproj @@ -0,0 +1,21 @@ + + + + net8.0 + false + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + +