Compare commits

...

66 Commits

Author SHA1 Message Date
khwezi 16f7e1981e Merge pull request 'cart' (#99) from cart into main
Reviewed-on: #99
2026-06-16 14:50:12 +02:00
Khwezi Mngoma 554741c2e5 Added user feedback toaster messages
continuous-integration/drone/pr Build is passing
2026-06-16 14:49:03 +02:00
Khwezi Mngoma 02294d36e8 Implemented AddToCart functionality on home page 2026-06-16 14:37:44 +02:00
khwezi 867fad8584 Merge pull request 'cart' (#98) from cart into main
Reviewed-on: #98
2026-06-16 13:47:36 +02:00
Khwezi Mngoma 31423ea48d Solved double entry issue on order confirmation
continuous-integration/drone/pr Build is passing
2026-06-16 13:47:03 +02:00
Khwezi Mngoma 6ca781759f Stable payment and order process 2026-06-16 13:39:40 +02:00
khwezi 55d241e362 Merge pull request 'Docker image cache test' (#97) from cart into main
Reviewed-on: #97
2026-06-16 10:58:55 +02:00
khwezi 0da92cfb5a Merge pull request 'Specified buildkit inline caching' (#96) from cart into main
Reviewed-on: #96
2026-06-16 10:45:08 +02:00
khwezi 30cde40d5b Merge pull request 'Added caching to docker build stage' (#95) from cart into main
Reviewed-on: #95
2026-06-16 10:33:09 +02:00
khwezi 5abe7a1476 Merge pull request 'ensured that untranslatable claims do not crash signalr' (#94) from cart into main
Reviewed-on: #94
2026-06-16 00:16:02 +02:00
khwezi ace7eeef8e Merge pull request 'Added automati revision history pruning' (#93) from cart into main
Reviewed-on: #93
2026-06-15 23:28:53 +02:00
khwezi e21fd59b12 Merge pull request 'Removed https failsafe' (#92) from cart into main
Reviewed-on: #92
2026-06-15 22:54:33 +02:00
khwezi 956c19b9f7 Merge pull request 'Removed secrets from manifest since they are hosted in the cluster' (#91) from cart into main
Reviewed-on: #91
2026-06-15 22:40:51 +02:00
khwezi f27433a277 Merge pull request 'Added https failsafe' (#90) from cart into main
Reviewed-on: #90
2026-06-15 17:22:44 +02:00
khwezi 7294e5470f Merge pull request 'Removed UseHttpsRedirection' (#89) from cart into main
Reviewed-on: #89
2026-06-15 17:12:12 +02:00
khwezi 5db926f4c6 Merge pull request 'Implemented cart hydration and refactored paynow flow' (#88) from cart into main
Reviewed-on: #88
2026-06-15 16:42:52 +02:00
khwezi a4460888af Merge pull request 'cart' (#87) from cart into main
Reviewed-on: #87
2026-06-15 00:45:46 +02:00
khwezi 9de7abc3fb Merge pull request 'Refactored fowarded header config in app' (#86) from cart into main
Reviewed-on: #86
2026-06-15 00:26:27 +02:00
khwezi e9b2e958d2 Merge pull request 'Removed invalid manifest field' (#85) from cart into main
Reviewed-on: #85
2026-06-15 00:05:49 +02:00
khwezi 44df489406 Merge pull request 'Refactored manifest' (#84) from cart into main
Reviewed-on: #84
2026-06-14 23:57:35 +02:00
khwezi 0ea31a33ae Merge pull request 'Updates app pipelining and cleaned up service registration' (#83) from cart into main
Reviewed-on: #83
2026-06-14 23:41:44 +02:00
khwezi 4f44d0c597 Merge pull request 'Updated multi pod handling of sticky sessions' (#82) from cart into main
Reviewed-on: #82
2026-06-14 23:15:57 +02:00
khwezi fbde2ea1a9 Merge pull request 'Updated handling of fowarded header and fixed base64 encoding of certificate' (#81) from cart into main
Reviewed-on: #81
2026-06-14 22:56:51 +02:00
khwezi 651682156c Merge pull request 'Moved kerstel definition to the service defitniton section' (#80) from cart into main
Reviewed-on: #80
2026-06-14 18:02:28 +02:00
khwezi e81789f8c6 Merge pull request 'Refactore the entire k8s manifest for pure https routing' (#79) from cart into main
Reviewed-on: #79
2026-06-14 17:49:17 +02:00
khwezi b9f3274633 Merge pull request 'Update cookie policies' (#78) from cart into main
Reviewed-on: #78
2026-06-14 13:16:05 +02:00
khwezi 552e9ff1b4 Merge pull request 'Updated cookie policies' (#77) from cart into main
Reviewed-on: #77
2026-06-14 12:56:36 +02:00
khwezi 629dbe7cfe Merge pull request 'Reordered service registration' (#76) from cart into main
Reviewed-on: #76
2026-06-14 12:45:01 +02:00
khwezi 25acd67485 Merge pull request 'Refactored starup pipeline' (#75) from cart into main
Reviewed-on: #75
2026-06-14 12:23:55 +02:00
khwezi d3672a6db9 Merge pull request 'Encapsulated the cert string in a base 64 string' (#74) from cart into main
Reviewed-on: #74
2026-06-14 12:05:50 +02:00
khwezi a8056e7a9a Merge pull request 'Refactored manifest' (#73) from cart into main
Reviewed-on: #73
2026-06-14 11:49:38 +02:00
khwezi 4458a1e189 Merge pull request 'Added data protection keys and cert encryption to them' (#72) from cart into main
Reviewed-on: #72
2026-06-14 11:33:32 +02:00
khwezi 2aeeb7a240 Merge pull request 'Added data protection key persistance' (#71) from cart into main
Reviewed-on: #71
2026-06-13 23:51:54 +02:00
khwezi 378044d011 Merge pull request 'cart' (#70) from cart into main
Reviewed-on: #70
2026-06-13 23:20:54 +02:00
khwezi 4e42d9f21a Merge pull request 'Using shared service for Cart management' (#56) from cart into main
Reviewed-on: #56
2026-06-12 08:55:26 +02:00
khwezi 0b7476d31c Merge pull request 'Stable checkout page' (#55) from cart into main
Reviewed-on: #55
2026-06-11 14:25:23 +02:00
khwezi 925c1f5988 Merge pull request 'Completed Cart page design' (#54) from cart into main
Reviewed-on: #54
2026-06-11 00:24:41 +02:00
khwezi 9629d9ddf9 Merge pull request 'Wired up CartDrawel and ProductView to cart service and local storage' (#53) from cart into main
Reviewed-on: #53
2026-06-10 23:02:07 +02:00
khwezi 7a11572294 Merge pull request 'cart' (#52) from cart into main
Reviewed-on: #52
2026-06-09 23:41:28 +02:00
khwezi a75bf5951d Merge pull request 'Fixed manifest secret name' (#51) from mock-data into main
Reviewed-on: #51
2026-06-07 16:51:40 +02:00
khwezi bbcf64aa65 Merge pull request 'Stable user session management' (#50) from mock-data into main
Reviewed-on: #50
2026-06-07 16:39:15 +02:00
khwezi a688bc816a Merge pull request 'Updated packages' (#49) from mock-data into main
Reviewed-on: #49
2026-06-05 09:26:44 +02:00
khwezi 4fe801583e Merge pull request 'Build trigger' (#48) from mock-data into main
Reviewed-on: #48
2026-06-05 09:08:18 +02:00
khwezi af3d40531b Merge pull request 'Removd proto handling from login process' (#47) from mock-data into main
Reviewed-on: #47
2026-06-05 09:00:10 +02:00
khwezi bc2b9f81e0 Merge pull request 'Simplified logn and logout process' (#46) from mock-data into main
Reviewed-on: #46
2026-06-05 08:22:30 +02:00
khwezi 49279c0cec Merge pull request 'Added port stripping' (#45) from mock-data into main
Reviewed-on: #45
2026-06-05 07:40:24 +02:00
khwezi edabe266e5 Merge pull request 'Refactored https logni proto handling' (#44) from mock-data into main
Reviewed-on: #44
2026-06-05 06:44:12 +02:00
khwezi 248dd32b1b Merge pull request 'Added support for forwarded headers' (#43) from mock-data into main
Reviewed-on: #43
2026-06-05 06:30:37 +02:00
khwezi 1645b6bbae Merge pull request 'Fixed secrets mappings' (#42) from mock-data into main
Reviewed-on: #42
2026-06-05 06:17:30 +02:00
khwezi 72725a302a Merge pull request 'mock-data' (#41) from mock-data into main
Reviewed-on: #41
2026-06-05 05:58:44 +02:00
khwezi f3d79174be Merge pull request 'Upgraded quartz' (#40) from mock-data into main
Reviewed-on: #40
2026-06-03 11:54:17 +02:00
khwezi c086aa60e4 Merge pull request 'Updated backend' (#39) from mock-data into main
Reviewed-on: #39
2026-06-02 00:31:16 +02:00
khwezi 66b377bf69 Merge pull request 'Fixed event service discovery issue' (#38) from mock-data into main
Reviewed-on: #38
2026-06-01 23:39:37 +02:00
khwezi 82389a9304 Merge pull request 'Updated backend' (#37) from mock-data into main
Reviewed-on: #37
2026-06-01 22:58:55 +02:00
khwezi 4bf1d2e77a Merge pull request 'Ensured appsettings aligns with k8s config' (#36) from mock-data into main
Reviewed-on: #36
2026-06-01 16:37:57 +02:00
khwezi 2b6576de85 Merge pull request 'Refactored app k8s manifest' (#35) from mock-data into main
Reviewed-on: #35
2026-06-01 11:16:54 +02:00
khwezi 7de957ed6f Merge pull request 'Refactored manifest to include s3 bucket and HasherService configs and secrets' (#34) from mock-data into main
Reviewed-on: #34
2026-06-01 09:50:59 +02:00
khwezi 16fdcc8005 Merge pull request 'Authors now showing on the listing' (#31) from mock-data into main
Reviewed-on: #31
2026-05-30 22:23:09 +02:00
khwezi a614d14da5 Merge pull request 'mock-data' (#30) from mock-data into main
Reviewed-on: #30
2026-05-30 21:01:05 +02:00
khwezi b722ea2cd0 Merge pull request 'mock-data' (#29) from mock-data into main
Reviewed-on: #29
2026-05-30 19:06:49 +02:00
khwezi 73145fd360 Merge pull request 'Upgraded backend services' (#28) from ui-design into main
Reviewed-on: #28
2026-05-30 00:32:23 +02:00
khwezi 7f29680993 Merge pull request 'ui-design' (#18) from ui-design into main
Reviewed-on: #18
2026-05-24 11:30:13 +02:00
khwezi 56626d2693 Merge pull request 'ui-design' (#17) from ui-design into main
Reviewed-on: #17
2026-05-24 10:48:55 +02:00
khwezi f9f6788c79 Merge pull request 'Updated UAT url' (#16) from project-setup into main
Reviewed-on: #16
2026-05-23 12:17:28 +02:00
khwezi 249ad319d9 Merge pull request 'Fixed dependencies and config' (#15) from project-setup into main
Reviewed-on: #15
2026-05-23 12:06:13 +02:00
khwezi 4a476febf4 Merge pull request 'Basic project setup' (#14) from project-setup into main
Reviewed-on: #14
2026-05-23 10:56:41 +02:00
14 changed files with 371 additions and 46 deletions
+24 -7
View File
@@ -14,12 +14,29 @@
{
<div></div>
}
<button class="btn bg-white rounded-circle d-flex align-items-center justify-content-center p-2 shadow-sm border-0" style="width: 32px; height: 32px;">
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="var(--mb-text-dark)" stroke-width="2.5">
<line x1="7" y1="17" x2="17" y2="7" />
<polyline points="7,7 17,7 17,17" />
</svg>
</button>
<div class="d-flex align-items-center gap-2">
<button class="btn bg-white rounded-circle d-flex align-items-center justify-content-center p-2 shadow-sm border-0 btn-cart-icon"
style="width: 32px; height: 32px; transition: all 0.2s ease;"
title="Add to Cart"
data-bs-toggle="tooltip"
data-bs-placement="top"
@onclick="HandleAddToCart" @onclick:stopPropagation>
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="var(--mb-text-dark)" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
<circle cx="9" cy="21" r="1"></circle>
<circle cx="20" cy="21" r="1"></circle>
<path d="M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6"></path>
</svg>
</button>
<button class="btn bg-white rounded-circle d-flex align-items-center justify-content-center p-2 shadow-sm border-0"
style="width: 32px; height: 32px;">
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="var(--mb-text-dark)" stroke-width="2.5">
<line x1="7" y1="17" x2="17" y2="7" />
<polyline points="7,7 17,7 17,17" />
</svg>
</button>
</div>
</div>
<div class="d-flex justify-content-center align-items-center flex-grow-1 my-2">
@@ -49,4 +66,4 @@
</div>
</div>
</div>
</div>
+31 -1
View File
@@ -1,4 +1,9 @@
namespace MidrandBookshop.Components;
using LiteCharms.Features.MidrandBooks.AuthorBooks;
using LiteCharms.Features.MidrandBooks.Authors;
using LiteCharms.Features.MidrandBooks.Payments;
using LiteCharms.Features.MidrandBooks.Products;
namespace MidrandBookshop.Components;
public partial class BookCard
{
@@ -11,4 +16,29 @@ public partial class BookCard
[Parameter] public string BookImageUrl { get; set; } = string.Empty;
[Parameter] public EventCallback OnCardClick { get; set; }
[Inject] private CartService CartService { get; set; } = default!;
[Inject] private ProductService ProductService { get; set; } = default!;
[Inject] private AuthorService AuthorService { get; set; } = default!;
[Inject] private BooksService BooksService { get; set; } = default!;
[Inject] private IToastService ToastService { get; set; } = default!;
[Inject] private CancellationToken CancellationToken { get; set; } = default!;
private async Task HandleAddToCart()
{
try
{
var bookFetch = await BooksService.GetBookByProductIdAsync(Id, CancellationToken);
var authorFetch = await AuthorService.GetAuthorAsync(bookFetch.Value.AuthorId, CancellationToken);
var productPriceFetch = await ProductService.GetProductPriceAsync(Id, CancellationToken);
CartService.AddItem(productPriceFetch.Value, bookFetch.Value.Product!, authorFetch.Value);
ToastService.ShowSuccess($"Added '{Title}' to your order.", "Cart Changed");
}
catch
{
ToastService.ShowError("Could not update cart. Please try again.");
}
}
}
@@ -1,4 +1,5 @@
@inherits LayoutComponentBase
@using Blazored.Toast
@inherits LayoutComponentBase
@inject NavigationManager Navigation
<div class="position-relative vh-100 d-flex flex-column justify-content-between overflow-hidden" style="background-color: #F9F9F9;">
@@ -295,3 +296,4 @@
</div>
</div>
<BlazoredToasts />
@@ -5,13 +5,13 @@ namespace MidrandBookshop.Components.Layout;
public partial class MainLayout(CartService cartService) : IDisposable
{
[Inject]
private AuthenticationStateProvider AuthStateProvider { get; set; } = default!;
[Inject] private AuthenticationStateProvider AuthStateProvider { get; set; } = default!;
[Inject] public IToastService ToastService { get; set; } = default!;
private Cart ShoppingCart => cartService.ShoppingCart;
private AuthenticationState? AuthState { get; set; }
private System.Security.Claims.ClaimsPrincipal? User { get; set; }
private ClaimsPrincipal? User { get; set; }
private bool IsAuthenticated => User?.Identity?.IsAuthenticated ?? false;
private string SearchInputBuffer { get; set; } = string.Empty;
@@ -116,6 +116,8 @@ public partial class MainLayout(CartService cartService) : IDisposable
cartService.RemoveOneItem(item.Price!.Id);
await cartService.SaveCartToStorageAsync();
ToastService.ShowSuccess($"Removed {item.Product!.Name} from cart", "Cart Changed");
}
private decimal GetCartTotal() => ShoppingCart?.TotalAmount ?? 0.00m;
@@ -5,6 +5,8 @@ namespace MidrandBookshop.Components.Pages;
public partial class CartReview(CartService cartService)
{
[Inject] public IToastService ToastService { get; set; } = default!;
protected Cart ShoppingCart => cartService?.ShoppingCart!;
protected async void IncreaseQty(CartItem item)
@@ -32,5 +34,7 @@ public partial class CartReview(CartService cartService)
cartService.RemoveOneItem(item.Price!.Id);
await cartService.SaveCartToStorageAsync();
ToastService.ShowSuccess($"Removed {item.Product!.Name} from cart", "Cart Changed");
}
}
@@ -19,8 +19,8 @@ public partial class Checkout()
[Inject] public IOptions<PayfastSettings> PayfastOptions { get; set; } = default!;
[Inject] private AuthenticationStateProvider AuthStateProvider { get; set; } = default!;
[Inject] public IJSRuntime JSRuntime { get; set; } = default!;
[Inject] private HydrationService HydrationService { get; set; } = default!;
[Inject] private CancellationToken CancellationToken { get; set; } = default!;
[Inject] public IToastService ToastService { get; set; } = default!;
private Cart ShoppingCart => CartService.ShoppingCart;
private ClaimsPrincipal? User { get; set; }
@@ -38,19 +38,6 @@ public partial class Checkout()
Navigation.LocationChanged += OnLocationChanged;
CartService.OnCartChanged += CartService_OnCartChanged;
await CartService.LoadCartFromStorageAsync();
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender == false && HydrationService.CartHydrated == false)
{
await HydrationService.EnsureCustomerExistsAsync(CancellationToken);
await HydrationService.RehydrateCartFromPendingOrderAsync(CancellationToken);
CartService.NotifyStateChanged();
}
}
private async void CartService_OnCartChanged() => await InvokeAsync(StateHasChanged);
@@ -77,7 +64,12 @@ public partial class Checkout()
private async Task PayNow(MouseEventArgs args)
{
if (IsProcessing) return;
if (IsProcessing)
{
ToastService.ShowWarning("Please wait, completing your payment", "Busy...");
return;
}
try
{
@@ -117,13 +109,31 @@ public partial class Checkout()
var orderHash = HashService.HashEncodeLongId(orderId).Value;
var paymentGen = await PaymentService.CreatePaymentAsync(ShoppingCart.TotalAmount, orderId, orderHash, CancellationToken);
long paymentId = 0;
if (paymentGen.IsSuccess) paymentId = paymentGen.Value;
if(paymentGen.IsFailed)
{
var paymentFetch = await PaymentService.GetOrderPaymentAsync(orderId, CancellationToken);
if (paymentFetch.IsFailed)
{
ToastService.ShowError("Failed to get fetch your previously made payment", "Payment Check");
return;
}
paymentId = paymentFetch.Value.Id;
}
CreateLedgerEntry ledgerRequest = new()
{
OrderId = orderId,
CustomerId = customerId,
PaymentGatewayId = 1, // TODO: lookup value to match user selection
PaymentGatewayId = 1,
PaymentGatewayReference = orderHash,
PaymentId = paymentGen.Value,
PaymentId = paymentId,
Status = LiteCharms.Features.LedgerStatuses.Sent,
};
await PaymentService.WriteLedgerEntryAsync(ledgerRequest, CancellationToken);
@@ -135,8 +145,8 @@ public partial class Checkout()
{
{ "merchant_id", PayfastOptions.Value.MerchantId! },
{ "merchant_key", PayfastOptions.Value.MerchantKey! },
{ "return_url", $"{hostAddress}/payment-success" },
{ "cancel_url", $"{hostAddress}/payment-failed" },
{ "return_url", $"{hostAddress}/payment-success?reference={orderHash}" },
{ "cancel_url", $"{hostAddress}/payment-failed?reference={orderHash}" },
{ "notify_url", "https://api.uat.midrandbooks.co.za/v1/payments/payfast/confirm" },
{ "email_address", User?.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)!.Value! },
{ "m_payment_id", orderHash },
@@ -151,8 +161,10 @@ public partial class Checkout()
await JSRuntime.InvokeVoidAsync("eval", "document.getElementById('payfastForm').submit();");
}
catch
catch(Exception ex)
{
ToastService.ShowError($"Failed to perform checkout: {ex.Message}", "Checkout");
IsProcessing = false;
StateHasChanged();
}
@@ -99,14 +99,18 @@ public partial class Home : ComponentBase
private bool HasMoreItems => FilteredData.Count() > VisibleCount;
protected override async Task OnInitializedAsync() => await CartService.LoadCartFromStorageAsync();
protected override async Task OnInitializedAsync()
{
if (CartService.ShoppingCart.Items.Count == 0)
await CartService.LoadCartFromStorageAsync();
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender == false && HydrationService.CartHydrated == false)
{
await HydrationService.EnsureCustomerExistsAsync(CancellationToken);
await HydrationService.RehydrateCartFromPendingOrderAsync(CancellationToken);
if(!CartService.ShoppingCart.CustomerId.HasValue)
await HydrationService.EnsureCustomerExistsAsync(CancellationToken);
}
}
@@ -1,5 +1,6 @@
@page "/payment-failed"
@rendermode InteractiveServer
@inject NavigationManager Navigation
@attribute [Authorize]
<div class="container py-5">
@@ -13,18 +14,16 @@
<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>
<h1 class="fw-bold mb-3">Payment Cancelled</h1>
<p class="text-muted fs-5">We couldn't process your transaction. Don't worry, no money was deducted from your account.</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>
<p class="mb-0 fs-6 text-dark mt-1">The order was cancelled / 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="d-grid gap-3 mt-5">
<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>
@@ -35,7 +34,7 @@
</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>
<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>shop@litecharms.co.za</strong>.</p>
</div>
</div>
</div>
@@ -0,0 +1,72 @@
using LiteCharms.Features;
using LiteCharms.Features.Hasher;
using LiteCharms.Features.MidrandBooks.Customers;
using LiteCharms.Features.MidrandBooks.Orders;
using LiteCharms.Features.MidrandBooks.Payments;
using LiteCharms.Features.MidrandBooks.Payments.Models;
namespace MidrandBookshop.Components.Pages;
public partial class PaymentFailed
{
[Inject] public CartService CartService { get; set; } = default!;
[Inject] public OrderService OrderService { get; set; } = default!;
[Inject] private CustomerService CustomerService { get; set; } = default!;
[Inject] public PaymentService PaymentService { get; set; } = default!;
[Inject] public HashService HashService { get; set; } = default!;
[Inject] private AuthenticationStateProvider AuthStateProvider { get; set; } = default!;
[Inject] private CancellationToken CancellationToken { get; set; } = default!;
private ClaimsPrincipal? User { get; set; }
[Parameter]
[SupplyParameterFromQuery(Name = "reference")]
public string? PaymentReference { get; set; }
protected override async Task OnInitializedAsync()
{
var authState = await AuthStateProvider.GetAuthenticationStateAsync();
User = authState!.User;
if (User?.Identity?.IsAuthenticated == false) Navigation.NavigateTo("/login");
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (!firstRender) return;
long orderId = HashService.DecodeLongIdHash(PaymentReference!).Value;
var customerEmail = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)!.Value!;
var customerFetch = await CustomerService.GetCustomerAsync(customerEmail, CancellationToken);
if (customerFetch.IsFailed) return;
long customerId = customerFetch.Value.Id;
var orderUpdateResult = await OrderService.UpdateOrderStatusAsync(orderId, OrderStatus.Cancelled, CancellationToken);
if (orderUpdateResult.IsFailed) return;
var paymentIdFetch = await PaymentService.GetOrderPaymentAsync(orderId, CancellationToken);
if (paymentIdFetch.IsFailed) return;
await PaymentService.WriteLedgerEntryAsync(new CreateLedgerEntry
{
CustomerId = customerId,
OrderId = orderId,
PaymentGatewayId = 1,
PaymentGatewayReference = PaymentReference,
PaymentId = paymentIdFetch.Value.Id,
Status = LedgerStatuses.Cancelled
}, CancellationToken);
CartService.Clear();
CartService.ShoppingCart.OrderId = null;
await CartService.SaveCartToStorageAsync();
CartService.NotifyStateChanged();
}
}
@@ -1,5 +1,6 @@
@page "/payment-success"
@rendermode InteractiveServer
@inject NavigationManager Navigation
@attribute [Authorize]
<div class="container py-5">
@@ -16,7 +17,7 @@
<p class="text-muted fs-5">Thank you for shopping with Midrand Books. Your order has been received and is being processed.</p>
<div class="bg-light p-3 rounded mt-4">
<p class="mb-0 text-muted small text-uppercase fw-bold">Order Number</p>
<h5 class="fw-bold mb-0">#MB-2026-8834</h5>
<h5 class="fw-bold mb-0">@PaymentReference</h5>
</div>
</div>
@@ -27,12 +28,12 @@
<a href="/account" class="btn btn-outline-dark w-100 rounded-pill py-3">Order History</a>
</div>
<div class="col-6">
<a href="/track-order" class="btn btn-outline-dark w-100 rounded-pill py-3">Track Order</a>
<a href="/account" class="btn btn-outline-dark w-100 rounded-pill py-3">Track Order</a>
</div>
</div>
</div>
<p class="mt-5 text-muted small">You will receive a confirmation email shortly at <strong>user@email.com</strong>.</p>
<p class="mt-5 text-muted small">You will receive a confirmation email shortly at <strong>@CustomerEmail</strong>.</p>
</div>
</div>
</div>
@@ -0,0 +1,70 @@
using LiteCharms.Features;
using LiteCharms.Features.Hasher;
using LiteCharms.Features.MidrandBooks.Customers;
using LiteCharms.Features.MidrandBooks.Payments;
using LiteCharms.Features.MidrandBooks.Payments.Models;
namespace MidrandBookshop.Components.Pages;
public partial class PaymentSuccess
{
[Inject] private CartService CartService { get; set; } = default!;
[Inject] private CustomerService CustomerService { get; set; } = default!;
[Inject] private PaymentService PaymentService { get; set; } = default!;
[Inject] private HashService HashService { get; set; } = default!;
[Inject] private AuthenticationStateProvider AuthStateProvider { get; set; } = default!;
[Inject] private CancellationToken CancellationToken { get; set; } = default!;
[Inject] public IToastService ToastService { get; set; } = default!;
[Parameter]
[SupplyParameterFromQuery(Name = "reference")]
public string? PaymentReference { get; set; }
private ClaimsPrincipal? User { get; set; }
private string? CustomerEmail { get; set; }
protected override async Task OnInitializedAsync()
{
var authState = await AuthStateProvider.GetAuthenticationStateAsync();
User = authState!.User;
if (User?.Identity?.IsAuthenticated == false) Navigation.NavigateTo("/login");
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (!firstRender) return;
long orderId = HashService.DecodeLongIdHash(PaymentReference!).Value;
string orderHash = HashService.HashEncodeLongId(orderId).Value;
CustomerEmail = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)!.Value!;
var customerFetch = await CustomerService.GetCustomerAsync(CustomerEmail, CancellationToken);
if (customerFetch.IsFailed) return;
long customerId = customerFetch.Value.Id;
var paymentIdFetch = await PaymentService.GetOrderPaymentAsync(orderId, CancellationToken);
if (paymentIdFetch.IsFailed) return;
await PaymentService.WriteLedgerEntryAsync(new CreateLedgerEntry
{
CustomerId = customerId,
OrderId = orderId,
PaymentGatewayId = 1,
PaymentGatewayReference = orderHash,
PaymentId = paymentIdFetch.Value.Id,
Status = LedgerStatuses.Changed
}, CancellationToken);
CartService.Clear();
CartService.ShoppingCart.OrderId = null;
await CartService.SaveCartToStorageAsync();
CartService.NotifyStateChanged();
}
}
+1 -1
View File
@@ -65,7 +65,7 @@ public sealed class HydrationService(AuthenticationStateProvider authStateProvid
{
if (User?.Identity?.IsAuthenticated == false) return;
if (ShoppingCart.OrderId > 0 && ShoppingCart.CustomerId > 0)
if (ShoppingCart.OrderId.HasValue && ShoppingCart.CustomerId.HasValue)
{
cartService.CalculateTotalPrice();
CartHydrated = true;
+2
View File
@@ -15,6 +15,8 @@ public static class Setup
services.AddRazorComponents()
.AddInteractiveServerComponents();
services.AddBlazoredToast();
services.AddEndpointsApiExplorer();
+110
View File
@@ -112,3 +112,113 @@ h1:focus, h2:focus, h3:focus, h4:focus, p:focus, div:focus, span:focus {
[tabindex="-1"]:focus {
outline: none !important;
}
/* ==========================================================================
Global Toast Notification Framework Extensions
========================================================================== */
.blazored-toast-container {
position: fixed;
/* 🛠️ Shift anchors from top-right to bottom-left */
bottom: 24px;
left: 24px;
top: auto;
right: auto;
z-index: 2000 !important;
display: flex;
flex-direction: column-reverse; /* 💡 Newest toasts will now stack cleanly on top of old ones */
gap: 12px;
max-width: 400px;
width: 100%;
pointer-events: none;
}
.blazored-toast {
display: flex;
align-items: center;
padding: 16px 20px;
border-radius: var(--mb-radius);
background-color: var(--mb-card-bg);
color: var(--mb-text-dark);
box-shadow: 0 12px 32px rgba(0, 0, 0, 0.12), 0 2px 4px rgba(0, 0, 0, 0.04);
border: 1px solid rgba(0, 0, 0, 0.05);
font-family: var(--font-ui);
font-size: 0.9rem;
font-weight: 500;
animation: toastFadeIn 0.35s cubic-bezier(0.175, 0.885, 0.32, 1.125) forwards;
}
/* Success Toast Core Variants */
.blazored-toast-success {
border-left: 4px solid var(--mb-text-dark);
}
/* Error Toast Core Variants */
.blazored-toast-error {
border-left: 4px solid var(--mb-accent-red);
color: var(--mb-accent-red);
}
.blazored-toast-icon {
display: inline-flex;
align-items: center;
justify-content: center;
margin-right: 12px;
flex-shrink: 0;
}
/* Entry Transition Keyframes */
@keyframes toastFadeIn {
from {
opacity: 0;
transform: translateY(-12px) scale(0.96);
}
to {
opacity: 1;
transform: translateY(0) scale(1);
}
}
.book-shadow {
filter: drop-shadow(5px 10px 15px rgba(0, 0, 0, 0.15)) drop-shadow(1px 2px 4px rgba(0, 0, 0, 0.1));
}
.sm-icon {
width: 14px;
height: 14px;
vertical-align: middle;
}
/* 🛠️ Micro-interactions for the header icon placement */
.btn-cart-icon:hover {
transform: scale(1.08);
background-color: var(--mb-text-dark) !important;
}
.btn-cart-icon:hover svg {
stroke: #FFFFFF !important;
}
@keyframes toastFadeIn {
from {
opacity: 0;
transform: translateX(-24px) scale(0.95); /* Slide rightward into view */
}
to {
opacity: 1;
transform: translateX(0) scale(1);
}
}
.blazored-toast button.blazored-toast-close,
.blazored-toast-close-icon {
display: none !important;
visibility: hidden !important;
opacity: 0 !important;
width: 0 !important;
height: 0 !important;
padding: 0 !important;
margin: 0 !important;
}