Some checks failed
Build and Deploy LittleShop / Build TeleBot Docker Image (push) Failing after 11s
Build and Deploy LittleShop / Build LittleShop Docker Image (push) Failing after 15s
Build and Deploy LittleShop / Deploy to Production VPS (Manual Only) (push) Has been skipped
Build and Deploy LittleShop / Deploy to Pre-Production (CT109) (push) Has been skipped
Major Feature Additions: - Customer management: Full CRUD with data export and privacy compliance - Payment management: Centralized payment tracking and administration - Push notification subscriptions: Manage and track web push subscriptions Security Enhancements: - IP whitelist middleware for administrative endpoints - Data retention service with configurable policies - Enhanced push notification security documentation - Security fixes progress tracking (2025-11-14) UI/UX Improvements: - Enhanced navigation with improved mobile responsiveness - Updated admin dashboard with order status counts - Improved product CRUD forms - New customer and payment management interfaces Backend Improvements: - Extended customer service with data export capabilities - Enhanced order service with status count queries - Improved crypto payment service with better error handling - Updated validators and configuration Documentation: - DEPLOYMENT_NGINX_GUIDE.md: Nginx deployment instructions - IP_STORAGE_ANALYSIS.md: IP storage security analysis - PUSH_NOTIFICATION_SECURITY.md: Push notification security guide - UI_UX_IMPROVEMENT_PLAN.md: Planned UI/UX enhancements - UI_UX_IMPROVEMENTS_COMPLETED.md: Completed improvements Cleanup: - Removed temporary database WAL files - Removed stale commit message file 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
289 lines
8.9 KiB
C#
289 lines
8.9 KiB
C#
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using LittleShop.Services;
|
|
using LittleShop.DTOs;
|
|
|
|
namespace LittleShop.Areas.Admin.Controllers;
|
|
|
|
[Area("Admin")]
|
|
[Authorize(Policy = "AdminOnly")]
|
|
public class OrdersController : Controller
|
|
{
|
|
private readonly IOrderService _orderService;
|
|
|
|
public OrdersController(IOrderService orderService)
|
|
{
|
|
_orderService = orderService;
|
|
}
|
|
|
|
public async Task<IActionResult> Index(string tab = "accept")
|
|
{
|
|
ViewData["CurrentTab"] = tab;
|
|
|
|
switch (tab.ToLower())
|
|
{
|
|
case "pending":
|
|
ViewData["Orders"] = await _orderService.GetOrdersByStatusAsync(LittleShop.Enums.OrderStatus.PendingPayment);
|
|
ViewData["TabTitle"] = "Pending Payment";
|
|
break;
|
|
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 (single optimized query)
|
|
var statusCounts = await _orderService.GetOrderStatusCountsAsync();
|
|
ViewData["PendingCount"] = statusCounts.PendingPaymentCount;
|
|
ViewData["AcceptCount"] = statusCounts.RequiringActionCount;
|
|
ViewData["PackingCount"] = statusCounts.ForPackingCount;
|
|
ViewData["DispatchedCount"] = statusCounts.DispatchedCount;
|
|
ViewData["OnHoldCount"] = statusCounts.OnHoldCount;
|
|
|
|
return View();
|
|
}
|
|
|
|
public async Task<IActionResult> Details(Guid id)
|
|
{
|
|
var order = await _orderService.GetOrderByIdAsync(id);
|
|
if (order == null)
|
|
{
|
|
return NotFound();
|
|
}
|
|
|
|
return View(order);
|
|
}
|
|
|
|
public IActionResult Create()
|
|
{
|
|
return View(new CreateOrderDto());
|
|
}
|
|
|
|
[HttpPost]
|
|
[ValidateAntiForgeryToken]
|
|
public async Task<IActionResult> Create(CreateOrderDto model)
|
|
{
|
|
if (!ModelState.IsValid)
|
|
{
|
|
return View(model);
|
|
}
|
|
|
|
var order = await _orderService.CreateOrderAsync(model);
|
|
return RedirectToAction(nameof(Details), new { id = order.Id });
|
|
}
|
|
|
|
public async Task<IActionResult> Edit(Guid id)
|
|
{
|
|
var order = await _orderService.GetOrderByIdAsync(id);
|
|
if (order == null)
|
|
{
|
|
return NotFound();
|
|
}
|
|
|
|
return View(order);
|
|
}
|
|
|
|
[HttpPost]
|
|
[ValidateAntiForgeryToken]
|
|
public async Task<IActionResult> Edit(Guid id, OrderDto model)
|
|
{
|
|
if (!ModelState.IsValid)
|
|
{
|
|
return View(model);
|
|
}
|
|
|
|
var updateDto = new UpdateOrderStatusDto
|
|
{
|
|
Status = model.Status,
|
|
TrackingNumber = model.TrackingNumber,
|
|
Notes = model.Notes
|
|
};
|
|
|
|
var success = await _orderService.UpdateOrderStatusAsync(id, updateDto);
|
|
if (!success)
|
|
{
|
|
return NotFound();
|
|
}
|
|
|
|
return RedirectToAction(nameof(Details), new { id });
|
|
}
|
|
|
|
[HttpPost]
|
|
[ValidateAntiForgeryToken]
|
|
public async Task<IActionResult> UpdateStatus(Guid id, UpdateOrderStatusDto model)
|
|
{
|
|
if (!ModelState.IsValid)
|
|
{
|
|
// Return to details page with error
|
|
var order = await _orderService.GetOrderByIdAsync(id);
|
|
if (order == null)
|
|
{
|
|
return NotFound();
|
|
}
|
|
|
|
TempData["Error"] = "Failed to update order status. Please check your input.";
|
|
return View("Details", order);
|
|
}
|
|
|
|
var success = await _orderService.UpdateOrderStatusAsync(id, model);
|
|
if (!success)
|
|
{
|
|
return NotFound();
|
|
}
|
|
|
|
TempData["Success"] = "Order status updated successfully.";
|
|
return RedirectToAction(nameof(Details), new { id });
|
|
}
|
|
|
|
// Workflow action methods
|
|
[HttpPost]
|
|
[ValidateAntiForgeryToken]
|
|
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]
|
|
[ValidateAntiForgeryToken]
|
|
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]
|
|
[ValidateAntiForgeryToken]
|
|
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]
|
|
[ValidateAntiForgeryToken]
|
|
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]
|
|
[ValidateAntiForgeryToken]
|
|
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]
|
|
[ValidateAntiForgeryToken]
|
|
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 });
|
|
}
|
|
} |