Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 16f7e1981e | |||
| 554741c2e5 | |||
| 02294d36e8 | |||
| 867fad8584 | |||
| 31423ea48d | |||
| 6ca781759f | |||
| 55d241e362 | |||
| cb03b91c6c | |||
| 0da92cfb5a | |||
| b0ea5ea098 |
+3
-1
@@ -23,7 +23,7 @@ trigger:
|
||||
kind: pipeline
|
||||
type: docker
|
||||
name: package
|
||||
|
||||
|
||||
steps:
|
||||
- name: docker-build
|
||||
image: plugins/docker
|
||||
@@ -33,6 +33,8 @@ steps:
|
||||
tags: [ latest, "1.${DRONE_BUILD_NUMBER}" ]
|
||||
use_cache: true
|
||||
cache_from: nexus.khongisa.co.za/midrandbooks:latest
|
||||
build_args:
|
||||
- BUILDKIT_INLINE_CACHE=1
|
||||
custom_labels:
|
||||
- org.opencontainers.image.source=https://gitea.khongisa.co.za/litecharms/midrandbooks
|
||||
- org.opencontainers.image.version=1.${DRONE_BUILD_NUMBER}
|
||||
|
||||
@@ -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>
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -15,6 +15,8 @@ public static class Setup
|
||||
|
||||
services.AddRazorComponents()
|
||||
.AddInteractiveServerComponents();
|
||||
|
||||
services.AddBlazoredToast();
|
||||
|
||||
services.AddEndpointsApiExplorer();
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
Reference in New Issue
Block a user