SilverLABS/littleshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add variant collections system and enhance ProductVariant with weight/stock tracking

Browse Source 
This commit introduces a comprehensive variant management system and enhances
the existing ProductVariant model with per-variant weight overrides and stock
tracking, integrated across Admin Panel and TeleBot.

Features Added:
- Variant Collections: Reusable variant templates (e.g., "Standard Sizes")
- Admin UI for managing variant collections (CRUD operations)
- Dynamic variant editor with JavaScript-based UI
- Per-variant weight and weight unit overrides
- Per-variant stock level tracking
- SalesLedger model for financial tracking

ProductVariant Enhancements:
- Added Weight (decimal, nullable) field for variant-specific weights
- Added WeightUnit (enum, nullable) field for variant-specific units
- Maintains backward compatibility with product-level weights

TeleBot Integration:
- Enhanced variant selection UI to display stock levels
- Shows weight information with proper unit conversion (µg, g, oz, lb, ml, L)
- Compact button format: "Medium (15 in stock, 350g)"
- Real-time stock availability display

Database Migrations:
- 20250928014850_AddVariantCollectionsAndSalesLedger
- 20250928155814_AddWeightToProductVariants

Technical Changes:
- Updated Product model to support VariantCollectionId and VariantsJson
- Extended ProductService with variant collection operations
- Enhanced OrderService to handle variant-specific pricing and weights
- Updated LittleShop.Client DTOs to match server models
- Added JavaScript dynamic variant form builder

Files Modified: 15
Files Added: 17
Lines Changed: ~2000

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
sysadmin
2025-09-28 17:03:09 +01:00
parent 191a9f27f2
commit eb87148c63
32 changed files with 5884 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
LittleShop/Services/IVariantCollectionService.cs Normal file
View File

@@ -0,0 +1,12 @@
using LittleShop.DTOs;
namespace LittleShop.Services;
public interface IVariantCollectionService
{
Task<IEnumerable<VariantCollectionDto>> GetAllVariantCollectionsAsync();
Task<VariantCollectionDto?> GetVariantCollectionByIdAsync(Guid id);
Task<VariantCollectionDto> CreateVariantCollectionAsync(CreateVariantCollectionDto createDto);
Task<bool> UpdateVariantCollectionAsync(Guid id, UpdateVariantCollectionDto updateDto);
Task<bool> DeleteVariantCollectionAsync(Guid id);
}

57
LittleShop/Services/OrderService.cs
View File

@@ -210,6 +210,9 @@ public class OrderService : IOrderService
{
var order = await _context.Orders
.Include(o => o.Customer)
.Include(o => o.Items)
.ThenInclude(oi => oi.Product)
.Include(o => o.Payments)
.FirstOrDefaultAsync(o => o.Id == id);
if (order == null) return false;
@@ -231,6 +234,12 @@ public class OrderService : IOrderService
order.ShippedAt = DateTime.UtcNow;
}
if (updateOrderStatusDto.Status == OrderStatus.PaymentReceived && previousStatus != OrderStatus.PaymentReceived)
{
await RecordSalesLedgerAsync(order);
await DeductStockAsync(order);
}
order.UpdatedAt = DateTime.UtcNow;
await _context.SaveChangesAsync();
@@ -611,4 +620,52 @@ public class OrderService : IOrderService
_ => $"Order #{orderId} status updated from {previousStatus} to {newStatus}."
};
}
private async Task RecordSalesLedgerAsync(Order order)
{
var payment = order.Payments.FirstOrDefault(p => p.Status == PaymentStatus.Completed);
foreach (var item in order.Items)
{
var ledgerEntry = new SalesLedger
{
Id = Guid.NewGuid(),
OrderId = order.Id,
ProductId = item.ProductId,
ProductName = item.Product.Name,
Quantity = item.Quantity,
SalePriceFiat = item.TotalPrice,
FiatCurrency = "GBP",
SalePriceBTC = payment?.PaidAmount,
Cryptocurrency = payment?.Currency.ToString(),
SoldAt = DateTime.UtcNow
};
_context.SalesLedgers.Add(ledgerEntry);
_logger.LogInformation("Recorded sales ledger entry for Order {OrderId}, Product {ProductId}, Quantity {Quantity}",
order.Id, item.ProductId, item.Quantity);
}
}
private async Task DeductStockAsync(Order order)
{
foreach (var item in order.Items)
{
var product = await _context.Products.FindAsync(item.ProductId);
if (product != null && product.StockQuantity >= item.Quantity)
{
product.StockQuantity -= item.Quantity;
product.UpdatedAt = DateTime.UtcNow;
_logger.LogInformation("Deducted {Quantity} units from product {ProductId} stock (Order {OrderId})",
item.Quantity, item.ProductId, order.Id);
}
else if (product != null)
{
_logger.LogWarning("Insufficient stock for product {ProductId}. Order {OrderId} requires {Required} but only {Available} available",
item.ProductId, order.Id, item.Quantity, product.StockQuantity);
}
}
}
}

10
LittleShop/Services/ProductService.cs
View File

@@ -131,6 +131,8 @@ public class ProductService : IProductService
StockQuantity = product.StockQuantity,
CategoryId = product.CategoryId,
CategoryName = product.Category.Name,
VariantCollectionId = product.VariantCollectionId,
VariantsJson = product.VariantsJson,
CreatedAt = product.CreatedAt,
UpdatedAt = product.UpdatedAt,
IsActive = product.IsActive,
@@ -171,6 +173,8 @@ public class ProductService : IProductService
WeightUnit = createProductDto.WeightUnit,
StockQuantity = createProductDto.StockQuantity,
CategoryId = createProductDto.CategoryId,
VariantCollectionId = createProductDto.VariantCollectionId,
VariantsJson = createProductDto.VariantsJson,
CreatedAt = DateTime.UtcNow,
UpdatedAt = DateTime.UtcNow,
IsActive = true
@@ -226,6 +230,12 @@ public class ProductService : IProductService
if (updateProductDto.CategoryId.HasValue)
product.CategoryId = updateProductDto.CategoryId.Value;
if (updateProductDto.VariantCollectionId.HasValue)
product.VariantCollectionId = updateProductDto.VariantCollectionId.Value;
if (updateProductDto.VariantsJson != null)
product.VariantsJson = updateProductDto.VariantsJson;
if (updateProductDto.IsActive.HasValue)
product.IsActive = updateProductDto.IsActive.Value;

112
LittleShop/Services/VariantCollectionService.cs Normal file
View File

@@ -0,0 +1,112 @@
using Microsoft.EntityFrameworkCore;
using LittleShop.Data;
using LittleShop.Models;
using LittleShop.DTOs;
namespace LittleShop.Services;
public class VariantCollectionService : IVariantCollectionService
{
private readonly LittleShopContext _context;
public VariantCollectionService(LittleShopContext context)
{
_context = context;
}
public async Task<IEnumerable<VariantCollectionDto>> GetAllVariantCollectionsAsync()
{
return await _context.VariantCollections
.OrderByDescending(vc => vc.CreatedAt)
.Select(vc => new VariantCollectionDto
{
Id = vc.Id,
Name = vc.Name,
PropertiesJson = vc.PropertiesJson,
IsActive = vc.IsActive,
CreatedAt = vc.CreatedAt,
UpdatedAt = vc.UpdatedAt
})
.ToListAsync();
}
public async Task<VariantCollectionDto?> GetVariantCollectionByIdAsync(Guid id)
{
var collection = await _context.VariantCollections
.FirstOrDefaultAsync(vc => vc.Id == id);
if (collection == null) return null;
return new VariantCollectionDto
{
Id = collection.Id,
Name = collection.Name,
PropertiesJson = collection.PropertiesJson,
IsActive = collection.IsActive,
CreatedAt = collection.CreatedAt,
UpdatedAt = collection.UpdatedAt
};
}
public async Task<VariantCollectionDto> CreateVariantCollectionAsync(CreateVariantCollectionDto createDto)
{
var collection = new VariantCollection
{
Id = Guid.NewGuid(),
Name = createDto.Name,
PropertiesJson = string.IsNullOrWhiteSpace(createDto.PropertiesJson) ? "[]" : createDto.PropertiesJson,
IsActive = true,
CreatedAt = DateTime.UtcNow,
UpdatedAt = DateTime.UtcNow
};
_context.VariantCollections.Add(collection);
await _context.SaveChangesAsync();
return new VariantCollectionDto
{
Id = collection.Id,
Name = collection.Name,
PropertiesJson = collection.PropertiesJson,
IsActive = collection.IsActive,
CreatedAt = collection.CreatedAt,
UpdatedAt = collection.UpdatedAt
};
}
public async Task<bool> UpdateVariantCollectionAsync(Guid id, UpdateVariantCollectionDto updateDto)
{
var collection = await _context.VariantCollections.FindAsync(id);
if (collection == null) return false;
if (!string.IsNullOrEmpty(updateDto.Name))
{
collection.Name = updateDto.Name;
}
if (updateDto.PropertiesJson != null)
{
collection.PropertiesJson = string.IsNullOrWhiteSpace(updateDto.PropertiesJson) ? "[]" : updateDto.PropertiesJson;
}
if (updateDto.IsActive.HasValue)
{
collection.IsActive = updateDto.IsActive.Value;
}
collection.UpdatedAt = DateTime.UtcNow;
await _context.SaveChangesAsync();
return true;
}
public async Task<bool> DeleteVariantCollectionAsync(Guid id)
{
var collection = await _context.VariantCollections.FindAsync(id);
if (collection == null) return false;
collection.IsActive = false;
collection.UpdatedAt = DateTime.UtcNow;
await _context.SaveChangesAsync();
return true;
}
}