Stable payfast interaction
This commit is contained in:
@@ -59,8 +59,18 @@
|
||||
<span class="fw-bold">Total Due</span>
|
||||
<h4 class="fw-bold">R @($"{ShoppingCart.TotalAmount + ShoppingCart.TotalVat + ShippingCost:F2}")</h4>
|
||||
</div>
|
||||
<button class="btn btn-dark w-100 py-3 rounded-pill" @onclick="CompletePurchase">Complete Purchase</button>
|
||||
<button class="btn btn-dark w-100 py-3 rounded-pill" @onclick="PayNow">Complete Purchase</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if (IsProcessing == true && CheckoutPayload?.Count > 0)
|
||||
{
|
||||
<form id="payfastForm" action="@PayfastOptions.Value.CheckoutUrl" method="POST">
|
||||
@foreach (var field in CheckoutPayload)
|
||||
{
|
||||
<input type="hidden" name="@field.Key" value="@field.Value" />
|
||||
}
|
||||
</form>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,23 +1,39 @@
|
||||
using LiteCharms.Features.MidrandBooks.Payments;
|
||||
using LiteCharms.Features.Api.Configuration;
|
||||
using LiteCharms.Features.Hasher;
|
||||
using LiteCharms.Features.MidrandBooks.AuthorBooks;
|
||||
using LiteCharms.Features.MidrandBooks.Customers;
|
||||
using LiteCharms.Features.MidrandBooks.Customers.Models;
|
||||
using LiteCharms.Features.MidrandBooks.Orders;
|
||||
using LiteCharms.Features.MidrandBooks.Orders.Models;
|
||||
using LiteCharms.Features.MidrandBooks.Payments;
|
||||
using LiteCharms.Features.MidrandBooks.Payments.Models;
|
||||
using LiteCharms.Features.MidrandBooks.Products;
|
||||
|
||||
namespace MidrandBookshop.Components.Pages;
|
||||
|
||||
public partial class Checkout(CartService cartService)
|
||||
public partial class Checkout()
|
||||
{
|
||||
[Inject]
|
||||
private AuthenticationStateProvider AuthStateProvider { get; set; } = default!;
|
||||
|
||||
private LiteCharms.Features.MidrandBooks.Payments.Models.Cart ShoppingCart => cartService.ShoppingCart;
|
||||
[Inject] public HashService HashService { get; set; } = default!;
|
||||
[Inject] public PaymentService PaymentService { get; set; } = default!;
|
||||
[Inject] public OrderService OrderService { get; set; } = default!;
|
||||
[Inject] public BooksService BooksService { get; set; } = default!;
|
||||
[Inject] public CartService CartService { get; set; } = default!;
|
||||
[Inject] public PayfastService PayfastService { get; set; } = default!;
|
||||
[Inject] public CustomerService CustomerService { get; set; } = default!;
|
||||
[Inject] public ProductService ProductService { get; set; } = default!;
|
||||
[Inject] public IOptions<PayfastSettings> PayfastOptions { get; set; } = default!;
|
||||
[Inject] private AuthenticationStateProvider AuthStateProvider { get; set; } = default!;
|
||||
[Inject] public IJSRuntime JSRuntime { get; set; } = default!;
|
||||
|
||||
private Cart ShoppingCart => CartService.ShoppingCart;
|
||||
private AuthenticationState? AuthState { get; set; }
|
||||
private System.Security.Claims.ClaimsPrincipal? User { get; set; }
|
||||
private bool IsAuthenticated => User?.Identity?.IsAuthenticated ?? false;
|
||||
private ClaimsPrincipal? User { get; set; }
|
||||
private bool IsProcessing { get; set; }
|
||||
|
||||
private decimal ShippingCost = 0;
|
||||
private bool IsSameAddress = true;
|
||||
|
||||
private decimal OrderTotalAmount => ShoppingCart.TotalAmount + ShoppingCart.TotalVat + ShippingCost;
|
||||
private Dictionary<string, string> CheckoutPayload { get; set; } = [];
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
@@ -25,7 +41,7 @@ public partial class Checkout(CartService cartService)
|
||||
User = AuthState!.User;
|
||||
|
||||
Navigation.LocationChanged += OnLocationChanged;
|
||||
cartService.OnCartChanged += CartService_OnCartChanged;
|
||||
CartService.OnCartChanged += CartService_OnCartChanged;
|
||||
}
|
||||
|
||||
private async void CartService_OnCartChanged() => await InvokeAsync(StateHasChanged);
|
||||
@@ -38,17 +54,106 @@ public partial class Checkout(CartService cartService)
|
||||
|
||||
if (peekQuantity < 1) return;
|
||||
|
||||
cartService.UpdateQuantity(item.Price!.Id, delta);
|
||||
CartService.UpdateQuantity(item.Price!.Id, delta);
|
||||
|
||||
await cartService.SaveCartToStorageAsync();
|
||||
await CartService.SaveCartToStorageAsync();
|
||||
}
|
||||
|
||||
private async void RemoveFromCart(CartItem item)
|
||||
{
|
||||
cartService.RemoveOneItem(item.Price!.Id);
|
||||
CartService.RemoveOneItem(item.Price!.Id);
|
||||
|
||||
await cartService.SaveCartToStorageAsync();
|
||||
await CartService.SaveCartToStorageAsync();
|
||||
}
|
||||
|
||||
private void CompletePurchase(MouseEventArgs args) => Navigation.NavigateTo("/payment-confirmation");
|
||||
private async Task PayNow(MouseEventArgs args)
|
||||
{
|
||||
if (IsProcessing) return;
|
||||
|
||||
try
|
||||
{
|
||||
// 1. Instantly disable the button to prevent duplicate click submissions
|
||||
IsProcessing = true;
|
||||
StateHasChanged(); // Force Blazor Server to push the disabled state over SignalR immediately
|
||||
|
||||
var customerEmail = User?.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)!.Value!;
|
||||
|
||||
// 2. Create customer if ShoppingCart.CustomerId is null
|
||||
if (ShoppingCart.CustomerId == null)
|
||||
{
|
||||
var existingCustomer = await CustomerService.GetCustomerAsync(customerEmail);
|
||||
|
||||
if (existingCustomer.IsSuccess)
|
||||
ShoppingCart.CustomerId = existingCustomer.Value.Id;
|
||||
|
||||
if (existingCustomer.IsFailed)
|
||||
{
|
||||
var customerCreate = await CustomerService.CreateCustomerAsync(new CreateCustomer { Email = customerEmail });
|
||||
|
||||
if (customerCreate.IsSuccess)
|
||||
ShoppingCart.CustomerId = customerCreate.Value;
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Create order using shopping cart and assign the ShoppingCart.OrderId
|
||||
|
||||
var order = await OrderService.CreateOrderAsync(ShoppingCart.CustomerId!.Value, new CreateOrder(ShoppingCart.TotalAmount, null));
|
||||
List<CreateOrderItem> orderItems = [];
|
||||
|
||||
foreach (var item in ShoppingCart.Items)
|
||||
{
|
||||
var bookRequest = await BooksService.GetBookByProductIdAsync(item.Price!.Id);
|
||||
|
||||
if (bookRequest.IsSuccess)
|
||||
{
|
||||
var orderItem = new CreateOrderItem(bookRequest.Value.Id, item.Price.Id, item.Quantity);
|
||||
orderItems.Add(orderItem);
|
||||
}
|
||||
}
|
||||
|
||||
var paymentGen = await PaymentService.CreatePaymentAsync(ShoppingCart.TotalAmount, order.Value, HashService.HashEncodeLongId(order.Value).Value);
|
||||
var merchantPaymentId = HashService.HashEncodeLongId(order.Value).Value;
|
||||
|
||||
await PaymentService.WriteLedgerEntryAsync(new CreateLedgerEntry
|
||||
{
|
||||
OrderId = order.Value,
|
||||
CustomerId = ShoppingCart.CustomerId.Value,
|
||||
PaymentGatewayId = 1,
|
||||
PaymentGatewayReference = merchantPaymentId,
|
||||
PaymentId = paymentGen.Value,
|
||||
Status = LiteCharms.Features.LedgerStatuses.Sent,
|
||||
});
|
||||
|
||||
var addItemsResult = await OrderService.AddItemsToOrderAsync(order.Value, [.. orderItems]);
|
||||
|
||||
// 4. Generate the signed Payfast form payload using your backend service
|
||||
var hostAddress = "https://localhost:7021";
|
||||
|
||||
CheckoutPayload = new Dictionary<string, string>
|
||||
{
|
||||
{ "merchant_id", PayfastOptions.Value.MerchantId! },
|
||||
{ "merchant_key", PayfastOptions.Value.MerchantKey! },
|
||||
{ "return_url", $"{hostAddress}/payment-success" },
|
||||
{ "cancel_url", $"{hostAddress}/payment-failed" },
|
||||
{ "notify_url", "https://api.uat.midrandbooks.co.za/v1/payments/payfast/confirm" },
|
||||
{ "email_address", customerEmail },
|
||||
{ "m_payment_id", merchantPaymentId },
|
||||
{ "amount", ShoppingCart.TotalAmount.ToString("F2", CultureInfo.InvariantCulture) },
|
||||
{ "item_name", "MidrandBooks Sale" },
|
||||
};
|
||||
|
||||
var signature = PayfastService.GenerateSignature(CheckoutPayload!, PayfastOptions.Value.Passphrase).Value;
|
||||
CheckoutPayload.Add("signature", signature);
|
||||
|
||||
StateHasChanged();
|
||||
|
||||
// 6. Execute programmatic submit directly into the sandbox
|
||||
await JSRuntime.InvokeVoidAsync("eval", "document.getElementById('payfastForm').submit();");
|
||||
}
|
||||
catch
|
||||
{
|
||||
IsProcessing = false;
|
||||
StateHasChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
@page "/payment-failed"
|
||||
@rendermode InteractiveServer
|
||||
@attribute [Authorize]
|
||||
|
||||
<div class="container py-5">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-8 col-lg-6 text-center">
|
||||
<div class="mb-4">
|
||||
<div class="d-inline-block p-4 rounded-circle bg-danger bg-opacity-10 text-danger mb-3">
|
||||
<svg width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="12" cy="12" r="10"></circle>
|
||||
<line x1="12" y1="8" x2="12" y2="12"></line>
|
||||
<line x1="12" y1="16" x2="12.01" y2="16"></line>
|
||||
</svg>
|
||||
</div>
|
||||
<h1 class="fw-bold mb-3">Payment Failed</h1>
|
||||
<p class="text-muted fs-5">We couldn't process your transaction. Don't worry, no money was deducted from your account, and your cart items are safe.</p>
|
||||
|
||||
<div class="bg-light p-3 rounded mt-4">
|
||||
<p class="mb-0 text-muted small text-uppercase fw-bold">Common Causes</p>
|
||||
<p class="mb-0 fs-6 text-dark mt-1">Insufficient funds, incorrect card details, or a temporary bank gateway timeout.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="d-grid gap-3 mt-5">
|
||||
<a href="/checkout" class="btn btn-dark btn-lg rounded-pill py-3">Try Again</a>
|
||||
|
||||
<div class="row g-3">
|
||||
<div class="col-6">
|
||||
<a href="/" class="btn btn-outline-dark w-100 rounded-pill py-3">View Store</a>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<a href="/support" class="btn btn-outline-dark w-100 rounded-pill py-3">Get Help</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p class="mt-5 text-muted small">If you noticed a charge or have any order questions, please contact our support desk with your account email <strong>user@email.com</strong>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
+3
-1
@@ -1,4 +1,6 @@
|
||||
@page "/payment-confirmation"
|
||||
@page "/payment-success"
|
||||
@rendermode InteractiveServer
|
||||
@attribute [Authorize]
|
||||
|
||||
<div class="container py-5">
|
||||
<div class="row justify-content-center">
|
||||
@@ -18,13 +18,13 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="LiteCharms.Features" Version="1.102.0" />
|
||||
<PackageReference Include="LiteCharms.Features" Version="1.121.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- UI -->
|
||||
<ItemGroup>
|
||||
<PackageReference Include="ANM.Blazored.Toast" Version="0.1.1" />
|
||||
<PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.102.0" />
|
||||
<PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.121.0" />
|
||||
|
||||
<!-- Global Usings -->
|
||||
<Using Include="Blazored.Toast.Services" />
|
||||
@@ -51,6 +51,10 @@
|
||||
<!-- Shared Global Usings -->
|
||||
<ItemGroup>
|
||||
<Using Include="Blazored.Toast" />
|
||||
<Using Include="Microsoft.JSInterop" />
|
||||
<Using Include="System.Globalization" />
|
||||
<Using Include="System.Security.Claims" />
|
||||
<Using Include="Microsoft.Extensions.Options" />
|
||||
<Using Include="Microsoft.AspNetCore.Components.Authorization" />
|
||||
<Using Include="Microsoft.AspNetCore.Components.Routing" />
|
||||
<Using Include="Microsoft.AspNetCore.Components.Web" />
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using LiteCharms.Features.Extensions;
|
||||
using LiteCharms.Features.Mediator;
|
||||
using LiteCharms.Features.MidrandBooks.Extensions;
|
||||
using LiteCharms.Features.MidrandBooks.Payments;
|
||||
using Microsoft.AspNetCore.HttpOverrides;
|
||||
using MidrandBookshop.Components;
|
||||
using static LiteCharms.Features.Extensions.Quartz;
|
||||
@@ -25,8 +26,11 @@ builder.Services.AddEmailServices(builder.Configuration);
|
||||
builder.Services.AddEmailServiceBus();
|
||||
|
||||
builder.Services.AddHttpClient();
|
||||
builder.Services.AddShopServices();
|
||||
builder.Services.AddScoped<CartService>();
|
||||
builder.Services.AddShopServices(includeLocalStorage: true);
|
||||
builder.Services.AddHashServices(builder.Configuration);
|
||||
builder.Services.AddSecurityApiSdk(builder.Configuration);
|
||||
builder.Services.AddPayfastServices(builder.Configuration);
|
||||
builder.Services.AddMidrandShopDatabase(builder.Configuration);
|
||||
|
||||
builder.Services.AddMidrandShopPostgresHealthCheck();
|
||||
|
||||
@@ -1,7 +1,22 @@
|
||||
{
|
||||
"PayfastSettings": {
|
||||
"CheckoutUrl": "https://sandbox.payfast.co.za/eng/process",
|
||||
"ValidHosts": [
|
||||
"www.payfast.co.za",
|
||||
"sandbox.payfast.co.za",
|
||||
"ips.payfast.co.za",
|
||||
"api.payfast.co.za",
|
||||
"payment.payfast.io"
|
||||
]
|
||||
},
|
||||
"LiteCharmsSettings": {
|
||||
"Authority": "https://sts.security.khongisa.co.za"
|
||||
},
|
||||
"LiteCharmsClientSettings": {
|
||||
"Authority": "https://sts.security.khongisa.co.za",
|
||||
"GrantType": "client_credentials",
|
||||
"Scope": "midrandbooks-api"
|
||||
},
|
||||
"HasherSettings": {
|
||||
"MinHashLength": 11
|
||||
},
|
||||
|
||||
+36
-10
@@ -19,16 +19,18 @@ data:
|
||||
BookshopS3Settings__Region: "garage"
|
||||
BookshopS3Settings__BucketName: "bookshop"
|
||||
BookshopS3Settings__CdnBaseUrl: "https://bookshop.cdn.khongisa.co.za"
|
||||
ValidPayfastHosts__0: "www.payfast.co.za"
|
||||
ValidPayfastHosts__1: "sandbox.payfast.co.za"
|
||||
ValidPayfastHosts__2: "w1w.payfast.co.za"
|
||||
ValidPayfastHosts__3: "w2w.payfast.co.za"
|
||||
ValidPayfastHosts__4: "ips.payfast.co.za"
|
||||
ValidPayfastHosts__5: "api.payfast.co.za"
|
||||
ValidPayfastHosts__6: "payment.payfast.io"
|
||||
PayfastSettings__CheckoutUrl: "https://sandbox.payfast.co.za/eng/process"
|
||||
PayfastSettings__ValidHosts__0: "www.payfast.co.za"
|
||||
PayfastSettings__ValidHosts__1: "sandbox.payfast.co.za"
|
||||
PayfastSettings__ValidHosts__2: "ips.payfast.co.za"
|
||||
PayfastSettings__ValidHosts__3: "api.payfast.co.za"
|
||||
PayfastSettings__ValidHosts__4: "payment.payfast.io"
|
||||
LiteCharmsSettings__Authority: "https://sts.security.khongisa.co.za"
|
||||
LiteCharmsSettings__Audience: "midrandbooks-api"
|
||||
ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true"
|
||||
LiteCharmsClientSettings__Authority: "https://sts.security.khongisa.co.za"
|
||||
LiteCharmsClientSettings__GrantType: "client_credentials"
|
||||
LiteCharmsClientSettings__Scope: "midrandbooks-api"
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
@@ -41,11 +43,15 @@ data:
|
||||
connection-string-quartz: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
|
||||
aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
|
||||
hasher-salt: VEdsbmFIUWdRMmhoY20xekxDQk5hV1J5WVc1a1FtOXZhM01nYldGclpTQnNiM1J6SUc5bUlHMXZibVY1SUdGdVpDQmhjbVVnWVNCemRXTmpaWE56Wm5Wc0lIWnBjbUZzSUhOMGIzSjVJR2x1SUZOdmRYUm9JRUZtY21sallRPT0=
|
||||
hasher-payfastpassphrase: OUdBSVIwdFdwaFgwcU8=
|
||||
bookshop-s3-accesskey: R0s1MTRkMmNlOGRjNjkyMzdhMDVjMDFlZWY=
|
||||
bookshop-s3-secretkey: ZWFhZmVkYTFhZWQ0MDllY2ZlNjA3MTRlY2RhNTQ5YjgyYmRmNWEzZGFmOWYxOGRkNjFmNjZiNDk3M2E2NDgyZQ==
|
||||
litecharms-clientid: bWlkcmFuZGJvb2tzLXVhdA==
|
||||
litecharms-clientsecret: c2VjcmV0Xzc3OGJkODM3NWFjNGE3Mzg2N2QxZDdhNjcwODJlZTJjNGU4NmUwODYwYmI0Y2ZlZWI5NDExOTQ5OTk2ZThhOGU=
|
||||
payfast-passphrase: OUdBSVIwdFdwaFgwcU8=
|
||||
payfast-merchantid: MTAwNDkzMDc=
|
||||
payfast-merchantkey: anU2bmF2bjBqY2JmMA==
|
||||
litecharms-client-clientid: bWlkcmFuZGJvb2tzLWFwaS1zY2FsZXItdWF0
|
||||
litecharms-client-clientsecret: c2VjcmV0XzBhOGRjMWY5OTA2MTU5MGE1MmIxMjcyZGIzYTE4NzFkMjc2MWM3OWZiZDA1OGIyYTk2ODkxMTAyOWU0YjIwOGE=
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
@@ -123,11 +129,31 @@ spec:
|
||||
secretKeyRef:
|
||||
name: midrandbooks-secrets
|
||||
key: hasher-salt
|
||||
- name: HasherSettings__PayfastPassphrase
|
||||
- name: PayfastSettings__Passphrase
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: midrandbooks-secrets
|
||||
key: hasher-payfastpassphrase
|
||||
key: payfast-passphrase
|
||||
- name: PayfastSettings__MerchantId
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: midrandbooks-secrets
|
||||
key: payfast-merchantid
|
||||
- name: PayfastSettings__MerchantKey
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: midrandbooks-secrets
|
||||
key: payfast-merchantkey
|
||||
- name: LiteCharmsClientSettings__ClientId
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: midrandbooks-secrets
|
||||
key: litecharms-client-clientid
|
||||
- name: LiteCharmsClientSettings__ClientSecret
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: midrandbooks-secrets
|
||||
key: litecharms-client-clientsecret
|
||||
- name: ConnectionStrings__PostgresScheduler
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
|
||||
Reference in New Issue
Block a user