## Product Variations System - Add ProductVariation model with quantity-based pricing (1 for £10, 2 for £19, 3 for £25) - Complete CRUD operations for product variations - Enhanced ProductService to include variations in all queries - Updated OrderItem to support ProductVariationId for variation-based orders - Graceful error handling for duplicate quantity constraints - Admin interface with variations management (Create/Edit/Delete) - API endpoints for programmatic variation management ## Enhanced Order Workflow Management - Redesigned OrderStatus enum with clear workflow states (Accept → Packing → Dispatched → Delivered) - Added workflow tracking fields (AcceptedAt, PackingStartedAt, DispatchedAt, ExpectedDeliveryDate) - User tracking for accountability (AcceptedByUser, PackedByUser, DispatchedByUser) - Automatic delivery date calculation (dispatch date + working days, skips weekends) - On Hold workflow for problem resolution with reason tracking - Tab-based orders interface focused on workflow stages - One-click workflow actions from list view ## Mobile-Responsive Design - Responsive orders interface: tables on desktop, cards on mobile - Touch-friendly buttons and spacing for mobile users - Horizontal scrolling tabs with condensed labels on mobile - Color-coded status borders for quick visual recognition - Smart text switching based on screen size ## Product Import/Export System - CSV import with product variations support - Template download with examples - Export existing products to CSV - Detailed import results with success/error reporting - Category name resolution (no need for GUIDs) - Photo URLs import support ## Enhanced Dashboard - Product variations count and metrics - Stock alerts (low stock/out of stock warnings) - Order workflow breakdown (pending, accepted, dispatched counts) - Enhanced layout with more detailed information ## Technical Improvements - Fixed form binding issues across all admin forms - Removed external CDN dependencies for isolated deployment - Bot Wizard form with auto-personality assignment - Proper authentication scheme configuration (Cookie + JWT) - Enhanced debug logging for troubleshooting ## Self-Contained Deployment - All external CDN references replaced with local libraries - Ready for air-gapped/isolated network deployment - No external internet dependencies 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
144 lines
4.1 KiB
C#
144 lines
4.1 KiB
C#
using System.ComponentModel.DataAnnotations;
|
|
using LittleShop.Enums;
|
|
|
|
namespace LittleShop.DTOs;
|
|
|
|
public class OrderDto
|
|
{
|
|
public Guid Id { get; set; }
|
|
public Guid? CustomerId { get; set; }
|
|
public string? IdentityReference { get; set; }
|
|
public OrderStatus Status { get; set; }
|
|
|
|
// Customer Information (embedded for convenience)
|
|
public CustomerSummaryDto? Customer { get; set; }
|
|
public decimal TotalAmount { get; set; }
|
|
public string Currency { get; set; } = "GBP";
|
|
public string ShippingName { get; set; } = string.Empty;
|
|
public string ShippingAddress { get; set; } = string.Empty;
|
|
public string ShippingCity { get; set; } = string.Empty;
|
|
public string ShippingPostCode { get; set; } = string.Empty;
|
|
public string ShippingCountry { get; set; } = string.Empty;
|
|
public string? Notes { get; set; }
|
|
public string? TrackingNumber { get; set; }
|
|
public DateTime CreatedAt { get; set; }
|
|
public DateTime UpdatedAt { get; set; }
|
|
public DateTime? PaidAt { get; set; }
|
|
|
|
// Workflow timestamps
|
|
public DateTime? AcceptedAt { get; set; }
|
|
public DateTime? PackingStartedAt { get; set; }
|
|
public DateTime? DispatchedAt { get; set; }
|
|
public DateTime? ExpectedDeliveryDate { get; set; }
|
|
public DateTime? ActualDeliveryDate { get; set; }
|
|
public DateTime? OnHoldAt { get; set; }
|
|
|
|
// Workflow details
|
|
public string? AcceptedByUser { get; set; }
|
|
public string? PackedByUser { get; set; }
|
|
public string? DispatchedByUser { get; set; }
|
|
public string? OnHoldReason { get; set; }
|
|
|
|
// Legacy field (for backward compatibility)
|
|
public DateTime? ShippedAt { get; set; }
|
|
|
|
public List<OrderItemDto> Items { get; set; } = new();
|
|
public List<CryptoPaymentDto> Payments { get; set; } = new();
|
|
}
|
|
|
|
public class OrderItemDto
|
|
{
|
|
public Guid Id { get; set; }
|
|
public Guid ProductId { get; set; }
|
|
public Guid? ProductVariationId { get; set; }
|
|
public string ProductName { get; set; } = string.Empty;
|
|
public string? ProductVariationName { get; set; }
|
|
public int Quantity { get; set; }
|
|
public decimal UnitPrice { get; set; }
|
|
public decimal TotalPrice { get; set; }
|
|
}
|
|
|
|
public class CreateOrderDto
|
|
{
|
|
// Either Customer ID (for registered customers) OR Identity Reference (for anonymous)
|
|
public Guid? CustomerId { get; set; }
|
|
|
|
public string? IdentityReference { get; set; }
|
|
|
|
// Customer Information (collected at checkout for anonymous orders)
|
|
public CreateCustomerDto? CustomerInfo { get; set; }
|
|
|
|
[Required]
|
|
public string ShippingName { get; set; } = string.Empty;
|
|
|
|
[Required]
|
|
public string ShippingAddress { get; set; } = string.Empty;
|
|
|
|
[Required]
|
|
public string ShippingCity { get; set; } = string.Empty;
|
|
|
|
[Required]
|
|
public string ShippingPostCode { get; set; } = string.Empty;
|
|
|
|
[Required]
|
|
public string ShippingCountry { get; set; } = "United Kingdom";
|
|
|
|
[Required]
|
|
public List<CreateOrderItemDto> Items { get; set; } = new();
|
|
|
|
public string? Notes { get; set; }
|
|
}
|
|
|
|
public class CreateOrderItemDto
|
|
{
|
|
[Required]
|
|
public Guid ProductId { get; set; }
|
|
|
|
public Guid? ProductVariationId { get; set; } // Optional: if specified, use variation pricing
|
|
|
|
[Range(1, int.MaxValue)]
|
|
public int Quantity { get; set; }
|
|
}
|
|
|
|
public class UpdateOrderStatusDto
|
|
{
|
|
public OrderStatus Status { get; set; }
|
|
public string? TrackingNumber { get; set; }
|
|
public string? Notes { get; set; }
|
|
}
|
|
|
|
// New workflow DTOs
|
|
public class AcceptOrderDto
|
|
{
|
|
public string? Notes { get; set; }
|
|
}
|
|
|
|
public class StartPackingDto
|
|
{
|
|
public string? Notes { get; set; }
|
|
}
|
|
|
|
public class DispatchOrderDto
|
|
{
|
|
[Required]
|
|
[StringLength(100)]
|
|
public string TrackingNumber { get; set; } = string.Empty;
|
|
|
|
public int EstimatedDeliveryDays { get; set; } = 3; // Default 3 working days
|
|
public string? Notes { get; set; }
|
|
}
|
|
|
|
public class PutOnHoldDto
|
|
{
|
|
[Required]
|
|
[StringLength(500)]
|
|
public string Reason { get; set; } = string.Empty;
|
|
|
|
public string? Notes { get; set; }
|
|
}
|
|
|
|
public class MarkDeliveredDto
|
|
{
|
|
public DateTime? ActualDeliveryDate { get; set; }
|
|
public string? Notes { get; set; }
|
|
} |