Implement product variations, enhanced order workflow, mobile responsiveness, and product import system
## 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>
This commit is contained in:
SilverLabs DevTeam
@@ -16,10 +16,49 @@ public class OrdersController : Controller
|
||||
_orderService = orderService;
|
||||
}
|
||||
|
||||
public async Task<IActionResult> Index()
|
||||
public async Task<IActionResult> Index(string tab = "accept")
|
||||
{
|
||||
var orders = await _orderService.GetAllOrdersAsync();
|
||||
return View(orders.OrderByDescending(o => o.CreatedAt));
|
||||
ViewData["CurrentTab"] = tab;
|
||||
|
||||
switch (tab.ToLower())
|
||||
{
|
||||
case "accept":
|
||||
ViewData["Orders"] = await _orderService.GetOrdersRequiringActionAsync();
|
||||
ViewData["TabTitle"] = "Orders to Accept";
|
||||
break;
|
||||
case "packing":
|
||||
ViewData["Orders"] = await _orderService.GetOrdersForPackingAsync();
|
||||
ViewData["TabTitle"] = "Orders for Packing";
|
||||
break;
|
||||
case "dispatched":
|
||||
ViewData["Orders"] = await _orderService.GetOrdersByStatusAsync(LittleShop.Enums.OrderStatus.Dispatched);
|
||||
ViewData["TabTitle"] = "Dispatched Orders";
|
||||
break;
|
||||
case "delivered":
|
||||
ViewData["Orders"] = await _orderService.GetOrdersByStatusAsync(LittleShop.Enums.OrderStatus.Delivered);
|
||||
ViewData["TabTitle"] = "Delivered Orders";
|
||||
break;
|
||||
case "onhold":
|
||||
ViewData["Orders"] = await _orderService.GetOrdersOnHoldAsync();
|
||||
ViewData["TabTitle"] = "Orders On Hold";
|
||||
break;
|
||||
case "cancelled":
|
||||
ViewData["Orders"] = await _orderService.GetOrdersByStatusAsync(LittleShop.Enums.OrderStatus.Cancelled);
|
||||
ViewData["TabTitle"] = "Cancelled Orders";
|
||||
break;
|
||||
default:
|
||||
ViewData["Orders"] = await _orderService.GetAllOrdersAsync();
|
||||
ViewData["TabTitle"] = "All Orders";
|
||||
break;
|
||||
}
|
||||
|
||||
// Get workflow counts for tab badges
|
||||
ViewData["AcceptCount"] = (await _orderService.GetOrdersRequiringActionAsync()).Count();
|
||||
ViewData["PackingCount"] = (await _orderService.GetOrdersForPackingAsync()).Count();
|
||||
ViewData["DispatchedCount"] = (await _orderService.GetOrdersByStatusAsync(LittleShop.Enums.OrderStatus.Dispatched)).Count();
|
||||
ViewData["OnHoldCount"] = (await _orderService.GetOrdersOnHoldAsync()).Count();
|
||||
|
||||
return View();
|
||||
}
|
||||
|
||||
public async Task<IActionResult> Details(Guid id)
|
||||
@@ -96,4 +135,126 @@ public class OrdersController : Controller
|
||||
|
||||
return RedirectToAction(nameof(Details), new { id });
|
||||
}
|
||||
|
||||
// Workflow action methods
|
||||
[HttpPost]
|
||||
public async Task<IActionResult> AcceptOrder(Guid id, string? notes)
|
||||
{
|
||||
var userName = User.Identity?.Name ?? "Unknown";
|
||||
var acceptDto = new AcceptOrderDto { Notes = notes };
|
||||
var success = await _orderService.AcceptOrderAsync(id, userName, acceptDto);
|
||||
|
||||
if (!success)
|
||||
{
|
||||
TempData["Error"] = "Could not accept order. Check order status.";
|
||||
}
|
||||
else
|
||||
{
|
||||
TempData["Success"] = "Order accepted successfully.";
|
||||
}
|
||||
|
||||
return RedirectToAction(nameof(Details), new { id });
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
public async Task<IActionResult> StartPacking(Guid id, string? notes)
|
||||
{
|
||||
var userName = User.Identity?.Name ?? "Unknown";
|
||||
var packingDto = new StartPackingDto { Notes = notes };
|
||||
var success = await _orderService.StartPackingAsync(id, userName, packingDto);
|
||||
|
||||
if (!success)
|
||||
{
|
||||
TempData["Error"] = "Could not start packing. Check order status.";
|
||||
}
|
||||
else
|
||||
{
|
||||
TempData["Success"] = "Packing started successfully.";
|
||||
}
|
||||
|
||||
return RedirectToAction(nameof(Details), new { id });
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
public async Task<IActionResult> DispatchOrder(Guid id, string trackingNumber, int estimatedDays = 3, string? notes = null)
|
||||
{
|
||||
var userName = User.Identity?.Name ?? "Unknown";
|
||||
var dispatchDto = new DispatchOrderDto
|
||||
{
|
||||
TrackingNumber = trackingNumber,
|
||||
EstimatedDeliveryDays = estimatedDays,
|
||||
Notes = notes
|
||||
};
|
||||
var success = await _orderService.DispatchOrderAsync(id, userName, dispatchDto);
|
||||
|
||||
if (!success)
|
||||
{
|
||||
TempData["Error"] = "Could not dispatch order. Check order status.";
|
||||
}
|
||||
else
|
||||
{
|
||||
TempData["Success"] = $"Order dispatched with tracking {trackingNumber}.";
|
||||
}
|
||||
|
||||
return RedirectToAction(nameof(Details), new { id });
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
public async Task<IActionResult> PutOnHold(Guid id, string reason, string? notes)
|
||||
{
|
||||
var userName = User.Identity?.Name ?? "Unknown";
|
||||
var holdDto = new PutOnHoldDto { Reason = reason, Notes = notes };
|
||||
var success = await _orderService.PutOnHoldAsync(id, userName, holdDto);
|
||||
|
||||
if (!success)
|
||||
{
|
||||
TempData["Error"] = "Could not put order on hold.";
|
||||
}
|
||||
else
|
||||
{
|
||||
TempData["Success"] = "Order put on hold.";
|
||||
}
|
||||
|
||||
return RedirectToAction(nameof(Details), new { id });
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
public async Task<IActionResult> RemoveFromHold(Guid id)
|
||||
{
|
||||
var userName = User.Identity?.Name ?? "Unknown";
|
||||
var success = await _orderService.RemoveFromHoldAsync(id, userName);
|
||||
|
||||
if (!success)
|
||||
{
|
||||
TempData["Error"] = "Could not remove order from hold.";
|
||||
}
|
||||
else
|
||||
{
|
||||
TempData["Success"] = "Order removed from hold and returned to workflow.";
|
||||
}
|
||||
|
||||
return RedirectToAction(nameof(Details), new { id });
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
public async Task<IActionResult> MarkDelivered(Guid id, DateTime? actualDeliveryDate, string? notes)
|
||||
{
|
||||
var deliveredDto = new MarkDeliveredDto
|
||||
{
|
||||
ActualDeliveryDate = actualDeliveryDate,
|
||||
Notes = notes
|
||||
};
|
||||
var success = await _orderService.MarkDeliveredAsync(id, deliveredDto);
|
||||
|
||||
if (!success)
|
||||
{
|
||||
TempData["Error"] = "Could not mark order as delivered.";
|
||||
}
|
||||
else
|
||||
{
|
||||
TempData["Success"] = "Order marked as delivered.";
|
||||
}
|
||||
|
||||
return RedirectToAction(nameof(Details), new { id });
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user