feat: add admin orders management
- Add admin API endpoints for order management - Add orders page with vendor selector and filtering - Add order schemas for admin operations - Support order status tracking and management 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
138
app/api/v1/admin/orders.py
Normal file
138
app/api/v1/admin/orders.py
Normal file
@@ -0,0 +1,138 @@
|
||||
# app/api/v1/admin/orders.py
|
||||
"""
|
||||
Admin order management endpoints.
|
||||
|
||||
Provides order management capabilities for administrators:
|
||||
- View orders across all vendors
|
||||
- View vendor-specific orders
|
||||
- Update order status on behalf of vendors
|
||||
- Order statistics and reporting
|
||||
|
||||
Admin Context: Uses admin JWT authentication.
|
||||
Vendor selection is passed as a request parameter.
|
||||
"""
|
||||
|
||||
import logging
|
||||
|
||||
from fastapi import APIRouter, Depends, Query
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.api.deps import get_current_admin_api
|
||||
from app.core.database import get_db
|
||||
from app.services.order_service import order_service
|
||||
from models.database.user import User
|
||||
from models.schema.order import (
|
||||
AdminOrderItem,
|
||||
AdminOrderListResponse,
|
||||
AdminOrderStats,
|
||||
AdminOrderStatusUpdate,
|
||||
AdminVendorsWithOrdersResponse,
|
||||
OrderDetailResponse,
|
||||
)
|
||||
|
||||
router = APIRouter(prefix="/orders")
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# List & Statistics Endpoints
|
||||
# ============================================================================
|
||||
|
||||
|
||||
@router.get("", response_model=AdminOrderListResponse)
|
||||
def get_all_orders(
|
||||
skip: int = Query(0, ge=0),
|
||||
limit: int = Query(50, ge=1, le=500),
|
||||
vendor_id: int | None = Query(None, description="Filter by vendor"),
|
||||
status: str | None = Query(None, description="Filter by status"),
|
||||
channel: str | None = Query(None, description="Filter by channel"),
|
||||
search: str | None = Query(None, description="Search by order number or customer"),
|
||||
db: Session = Depends(get_db),
|
||||
current_admin: User = Depends(get_current_admin_api),
|
||||
):
|
||||
"""
|
||||
Get orders across all vendors with filtering.
|
||||
|
||||
Allows admins to view and filter orders across the platform.
|
||||
"""
|
||||
orders, total = order_service.get_all_orders_admin(
|
||||
db=db,
|
||||
skip=skip,
|
||||
limit=limit,
|
||||
vendor_id=vendor_id,
|
||||
status=status,
|
||||
channel=channel,
|
||||
search=search,
|
||||
)
|
||||
|
||||
return AdminOrderListResponse(
|
||||
orders=[AdminOrderItem(**order) for order in orders],
|
||||
total=total,
|
||||
skip=skip,
|
||||
limit=limit,
|
||||
)
|
||||
|
||||
|
||||
@router.get("/stats", response_model=AdminOrderStats)
|
||||
def get_order_stats(
|
||||
db: Session = Depends(get_db),
|
||||
current_admin: User = Depends(get_current_admin_api),
|
||||
):
|
||||
"""Get platform-wide order statistics."""
|
||||
return order_service.get_order_stats_admin(db)
|
||||
|
||||
|
||||
@router.get("/vendors", response_model=AdminVendorsWithOrdersResponse)
|
||||
def get_vendors_with_orders(
|
||||
db: Session = Depends(get_db),
|
||||
current_admin: User = Depends(get_current_admin_api),
|
||||
):
|
||||
"""Get list of vendors that have orders."""
|
||||
vendors = order_service.get_vendors_with_orders_admin(db)
|
||||
return AdminVendorsWithOrdersResponse(vendors=vendors)
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Order Detail & Update Endpoints
|
||||
# ============================================================================
|
||||
|
||||
|
||||
@router.get("/{order_id}", response_model=OrderDetailResponse)
|
||||
def get_order_detail(
|
||||
order_id: int,
|
||||
db: Session = Depends(get_db),
|
||||
current_admin: User = Depends(get_current_admin_api),
|
||||
):
|
||||
"""Get order details including items and addresses."""
|
||||
order = order_service.get_order_by_id_admin(db, order_id)
|
||||
return order
|
||||
|
||||
|
||||
@router.patch("/{order_id}/status", response_model=OrderDetailResponse)
|
||||
def update_order_status(
|
||||
order_id: int,
|
||||
status_update: AdminOrderStatusUpdate,
|
||||
db: Session = Depends(get_db),
|
||||
current_admin: User = Depends(get_current_admin_api),
|
||||
):
|
||||
"""
|
||||
Update order status.
|
||||
|
||||
Admin can update status and add tracking number.
|
||||
Status changes are logged with optional reason.
|
||||
"""
|
||||
order = order_service.update_order_status_admin(
|
||||
db=db,
|
||||
order_id=order_id,
|
||||
status=status_update.status,
|
||||
tracking_number=status_update.tracking_number,
|
||||
reason=status_update.reason,
|
||||
)
|
||||
|
||||
logger.info(
|
||||
f"Admin {current_admin.email} updated order {order.order_number} "
|
||||
f"status to {status_update.status}"
|
||||
)
|
||||
|
||||
db.commit()
|
||||
return order
|
||||
@@ -366,5 +366,251 @@ class OrderService:
|
||||
raise ValidationException(f"Failed to update order: {str(e)}")
|
||||
|
||||
|
||||
# =========================================================================
|
||||
# Admin Methods (cross-vendor)
|
||||
# =========================================================================
|
||||
|
||||
def get_all_orders_admin(
|
||||
self,
|
||||
db: Session,
|
||||
skip: int = 0,
|
||||
limit: int = 50,
|
||||
vendor_id: int | None = None,
|
||||
status: str | None = None,
|
||||
channel: str | None = None,
|
||||
search: str | None = None,
|
||||
) -> tuple[list[dict], int]:
|
||||
"""
|
||||
Get orders across all vendors for admin.
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
skip: Pagination offset
|
||||
limit: Pagination limit
|
||||
vendor_id: Filter by vendor
|
||||
status: Filter by status
|
||||
channel: Filter by channel
|
||||
search: Search by order number or customer
|
||||
|
||||
Returns:
|
||||
Tuple of (orders with vendor info, total_count)
|
||||
"""
|
||||
from models.database.customer import Customer
|
||||
from models.database.vendor import Vendor
|
||||
|
||||
query = db.query(Order).join(Vendor).join(Customer)
|
||||
|
||||
if vendor_id:
|
||||
query = query.filter(Order.vendor_id == vendor_id)
|
||||
|
||||
if status:
|
||||
query = query.filter(Order.status == status)
|
||||
|
||||
if channel:
|
||||
query = query.filter(Order.channel == channel)
|
||||
|
||||
if search:
|
||||
search_term = f"%{search}%"
|
||||
query = query.filter(
|
||||
(Order.order_number.ilike(search_term))
|
||||
| (Customer.email.ilike(search_term))
|
||||
| (Customer.first_name.ilike(search_term))
|
||||
| (Customer.last_name.ilike(search_term))
|
||||
)
|
||||
|
||||
# Order by most recent first
|
||||
query = query.order_by(Order.created_at.desc())
|
||||
|
||||
total = query.count()
|
||||
orders = query.offset(skip).limit(limit).all()
|
||||
|
||||
# Build response with vendor/customer info
|
||||
result = []
|
||||
for order in orders:
|
||||
item_count = len(order.items) if order.items else 0
|
||||
customer_name = None
|
||||
customer_email = None
|
||||
|
||||
if order.customer:
|
||||
customer_name = (
|
||||
f"{order.customer.first_name} {order.customer.last_name}".strip()
|
||||
)
|
||||
customer_email = order.customer.email
|
||||
|
||||
result.append(
|
||||
{
|
||||
"id": order.id,
|
||||
"vendor_id": order.vendor_id,
|
||||
"vendor_name": order.vendor.name if order.vendor else None,
|
||||
"vendor_code": order.vendor.vendor_code if order.vendor else None,
|
||||
"customer_id": order.customer_id,
|
||||
"customer_name": customer_name,
|
||||
"customer_email": customer_email,
|
||||
"order_number": order.order_number,
|
||||
"channel": order.channel,
|
||||
"status": order.status,
|
||||
"subtotal": order.subtotal,
|
||||
"tax_amount": order.tax_amount,
|
||||
"shipping_amount": order.shipping_amount,
|
||||
"discount_amount": order.discount_amount,
|
||||
"total_amount": order.total_amount,
|
||||
"currency": order.currency,
|
||||
"shipping_method": order.shipping_method,
|
||||
"tracking_number": order.tracking_number,
|
||||
"item_count": item_count,
|
||||
"created_at": order.created_at,
|
||||
"updated_at": order.updated_at,
|
||||
"paid_at": order.paid_at,
|
||||
"shipped_at": order.shipped_at,
|
||||
"delivered_at": order.delivered_at,
|
||||
"cancelled_at": order.cancelled_at,
|
||||
}
|
||||
)
|
||||
|
||||
return result, total
|
||||
|
||||
def get_order_stats_admin(self, db: Session) -> dict:
|
||||
"""Get platform-wide order statistics."""
|
||||
from sqlalchemy import func
|
||||
|
||||
from models.database.vendor import Vendor
|
||||
|
||||
# Get status counts
|
||||
status_counts = (
|
||||
db.query(Order.status, func.count(Order.id)).group_by(Order.status).all()
|
||||
)
|
||||
|
||||
stats = {
|
||||
"total_orders": 0,
|
||||
"pending_orders": 0,
|
||||
"processing_orders": 0,
|
||||
"shipped_orders": 0,
|
||||
"delivered_orders": 0,
|
||||
"cancelled_orders": 0,
|
||||
"refunded_orders": 0,
|
||||
"total_revenue": 0.0,
|
||||
"vendors_with_orders": 0,
|
||||
}
|
||||
|
||||
for status, count in status_counts:
|
||||
stats["total_orders"] += count
|
||||
key = f"{status}_orders"
|
||||
if key in stats:
|
||||
stats[key] = count
|
||||
|
||||
# Get total revenue (from delivered orders only)
|
||||
revenue = (
|
||||
db.query(func.sum(Order.total_amount))
|
||||
.filter(Order.status == "delivered")
|
||||
.scalar()
|
||||
)
|
||||
stats["total_revenue"] = float(revenue) if revenue else 0.0
|
||||
|
||||
# Count vendors with orders
|
||||
vendors_count = (
|
||||
db.query(func.count(func.distinct(Order.vendor_id))).scalar() or 0
|
||||
)
|
||||
stats["vendors_with_orders"] = vendors_count
|
||||
|
||||
return stats
|
||||
|
||||
def get_vendors_with_orders_admin(self, db: Session) -> list[dict]:
|
||||
"""Get list of vendors that have orders."""
|
||||
from sqlalchemy import func
|
||||
|
||||
from models.database.vendor import Vendor
|
||||
|
||||
results = (
|
||||
db.query(
|
||||
Vendor.id,
|
||||
Vendor.name,
|
||||
Vendor.vendor_code,
|
||||
func.count(Order.id).label("order_count"),
|
||||
)
|
||||
.join(Order)
|
||||
.group_by(Vendor.id, Vendor.name, Vendor.vendor_code)
|
||||
.order_by(Vendor.name)
|
||||
.all()
|
||||
)
|
||||
|
||||
return [
|
||||
{
|
||||
"id": r.id,
|
||||
"name": r.name,
|
||||
"vendor_code": r.vendor_code,
|
||||
"order_count": r.order_count,
|
||||
}
|
||||
for r in results
|
||||
]
|
||||
|
||||
def get_order_by_id_admin(self, db: Session, order_id: int) -> Order:
|
||||
"""Get order by ID without vendor scope (admin only)."""
|
||||
order = db.query(Order).filter(Order.id == order_id).first()
|
||||
|
||||
if not order:
|
||||
raise OrderNotFoundException(str(order_id))
|
||||
|
||||
return order
|
||||
|
||||
def update_order_status_admin(
|
||||
self,
|
||||
db: Session,
|
||||
order_id: int,
|
||||
status: str,
|
||||
tracking_number: str | None = None,
|
||||
reason: str | None = None,
|
||||
) -> Order:
|
||||
"""
|
||||
Update order status as admin.
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
order_id: Order ID
|
||||
status: New status
|
||||
tracking_number: Optional tracking number
|
||||
reason: Optional reason for change
|
||||
|
||||
Returns:
|
||||
Updated Order object
|
||||
"""
|
||||
order = self.get_order_by_id_admin(db, order_id)
|
||||
|
||||
# Update status with timestamps
|
||||
old_status = order.status
|
||||
order.status = status
|
||||
|
||||
now = datetime.now(UTC)
|
||||
if status == "shipped" and not order.shipped_at:
|
||||
order.shipped_at = now
|
||||
elif status == "delivered" and not order.delivered_at:
|
||||
order.delivered_at = now
|
||||
elif status == "cancelled" and not order.cancelled_at:
|
||||
order.cancelled_at = now
|
||||
|
||||
# Update tracking number
|
||||
if tracking_number:
|
||||
order.tracking_number = tracking_number
|
||||
|
||||
# Add reason to internal notes if provided
|
||||
if reason:
|
||||
note = f"[{now.isoformat()}] Status changed from {old_status} to {status}: {reason}"
|
||||
if order.internal_notes:
|
||||
order.internal_notes = f"{order.internal_notes}\n{note}"
|
||||
else:
|
||||
order.internal_notes = note
|
||||
|
||||
order.updated_at = now
|
||||
db.flush()
|
||||
db.refresh(order)
|
||||
|
||||
logger.info(
|
||||
f"Admin updated order {order.order_number}: "
|
||||
f"{old_status} -> {status}"
|
||||
f"{f' (reason: {reason})' if reason else ''}"
|
||||
)
|
||||
|
||||
return order
|
||||
|
||||
|
||||
# Create service instance
|
||||
order_service = OrderService()
|
||||
|
||||
440
app/templates/admin/orders.html
Normal file
440
app/templates/admin/orders.html
Normal file
@@ -0,0 +1,440 @@
|
||||
{# app/templates/admin/orders.html #}
|
||||
{% extends "admin/base.html" %}
|
||||
{% from 'shared/macros/pagination.html' import pagination %}
|
||||
{% from 'shared/macros/headers.html' import page_header %}
|
||||
{% from 'shared/macros/alerts.html' import loading_state, error_state %}
|
||||
{% from 'shared/macros/tables.html' import table_wrapper %}
|
||||
{% from 'shared/macros/modals.html' import modal_simple %}
|
||||
{% from 'shared/macros/inputs.html' import vendor_selector %}
|
||||
|
||||
{% block title %}Orders{% endblock %}
|
||||
|
||||
{% block alpine_data %}adminOrders(){% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{{ page_header('Orders', subtitle='Manage orders across all vendors') }}
|
||||
|
||||
{{ loading_state('Loading orders...') }}
|
||||
|
||||
{{ error_state('Error loading orders') }}
|
||||
|
||||
<!-- Stats Cards -->
|
||||
<div x-show="!loading" class="grid gap-6 mb-8 md:grid-cols-2 xl:grid-cols-4">
|
||||
<!-- Card: Total Orders -->
|
||||
<div class="flex items-center p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800">
|
||||
<div class="p-3 mr-4 text-purple-500 bg-purple-100 rounded-full dark:text-purple-100 dark:bg-purple-500">
|
||||
<span x-html="$icon('clipboard-list', 'w-5 h-5')"></span>
|
||||
</div>
|
||||
<div>
|
||||
<p class="mb-2 text-sm font-medium text-gray-600 dark:text-gray-400">
|
||||
Total Orders
|
||||
</p>
|
||||
<p class="text-lg font-semibold text-gray-700 dark:text-gray-200" x-text="stats.total_orders || 0">
|
||||
0
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Card: Pending -->
|
||||
<div class="flex items-center p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800">
|
||||
<div class="p-3 mr-4 text-orange-500 bg-orange-100 rounded-full dark:text-orange-100 dark:bg-orange-500">
|
||||
<span x-html="$icon('clock', 'w-5 h-5')"></span>
|
||||
</div>
|
||||
<div>
|
||||
<p class="mb-2 text-sm font-medium text-gray-600 dark:text-gray-400">
|
||||
Pending
|
||||
</p>
|
||||
<p class="text-lg font-semibold text-gray-700 dark:text-gray-200" x-text="stats.pending_orders || 0">
|
||||
0
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Card: Processing -->
|
||||
<div class="flex items-center p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800">
|
||||
<div class="p-3 mr-4 text-blue-500 bg-blue-100 rounded-full dark:text-blue-100 dark:bg-blue-500">
|
||||
<span x-html="$icon('refresh', 'w-5 h-5')"></span>
|
||||
</div>
|
||||
<div>
|
||||
<p class="mb-2 text-sm font-medium text-gray-600 dark:text-gray-400">
|
||||
Processing
|
||||
</p>
|
||||
<p class="text-lg font-semibold text-gray-700 dark:text-gray-200" x-text="stats.processing_orders || 0">
|
||||
0
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Card: Revenue -->
|
||||
<div class="flex items-center p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800">
|
||||
<div class="p-3 mr-4 text-green-500 bg-green-100 rounded-full dark:text-green-100 dark:bg-green-500">
|
||||
<span x-html="$icon('currency-euro', 'w-5 h-5')"></span>
|
||||
</div>
|
||||
<div>
|
||||
<p class="mb-2 text-sm font-medium text-gray-600 dark:text-gray-400">
|
||||
Total Revenue
|
||||
</p>
|
||||
<p class="text-lg font-semibold text-gray-700 dark:text-gray-200" x-text="formatPrice(stats.total_revenue || 0)">
|
||||
0
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Search and Filters Bar -->
|
||||
<div x-show="!loading" class="mb-6 p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800">
|
||||
<div class="flex flex-col lg:flex-row lg:items-center lg:justify-between gap-4">
|
||||
<!-- Search Input -->
|
||||
<div class="flex-1 max-w-xl">
|
||||
<div class="relative">
|
||||
<span class="absolute inset-y-0 left-0 flex items-center pl-3">
|
||||
<span x-html="$icon('search', 'w-5 h-5 text-gray-400')"></span>
|
||||
</span>
|
||||
<input
|
||||
type="text"
|
||||
x-model="filters.search"
|
||||
@input="debouncedSearch()"
|
||||
placeholder="Search by order number or customer..."
|
||||
class="w-full pl-10 pr-4 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none dark:bg-gray-700 dark:text-gray-300"
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Filters -->
|
||||
<div class="flex flex-wrap gap-3">
|
||||
<!-- Vendor Filter (Tom Select) -->
|
||||
{{ vendor_selector(
|
||||
ref_name='vendorSelect',
|
||||
id='orders-vendor-select',
|
||||
placeholder='Filter by vendor...',
|
||||
width='w-64'
|
||||
) }}
|
||||
|
||||
<!-- Status Filter -->
|
||||
<select
|
||||
x-model="filters.status"
|
||||
@change="pagination.page = 1; loadOrders()"
|
||||
class="px-4 py-2 text-sm text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none"
|
||||
>
|
||||
<option value="">All Statuses</option>
|
||||
<option value="pending">Pending</option>
|
||||
<option value="processing">Processing</option>
|
||||
<option value="shipped">Shipped</option>
|
||||
<option value="delivered">Delivered</option>
|
||||
<option value="cancelled">Cancelled</option>
|
||||
<option value="refunded">Refunded</option>
|
||||
</select>
|
||||
|
||||
<!-- Channel Filter -->
|
||||
<select
|
||||
x-model="filters.channel"
|
||||
@change="pagination.page = 1; loadOrders()"
|
||||
class="px-4 py-2 text-sm text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none"
|
||||
>
|
||||
<option value="">All Channels</option>
|
||||
<option value="direct">Direct</option>
|
||||
<option value="letzshop">Letzshop</option>
|
||||
</select>
|
||||
|
||||
<!-- Refresh Button -->
|
||||
<button
|
||||
@click="refresh()"
|
||||
class="flex items-center px-4 py-2 text-sm font-medium text-gray-700 dark:text-gray-300 border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-700 focus:outline-none transition-colors"
|
||||
title="Refresh orders"
|
||||
>
|
||||
<span x-html="$icon('refresh', 'w-4 h-4 mr-2')"></span>
|
||||
Refresh
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Orders Table with Pagination -->
|
||||
<div x-show="!loading">
|
||||
{% call table_wrapper() %}
|
||||
<thead>
|
||||
<tr class="text-xs font-semibold tracking-wide text-left text-gray-500 uppercase border-b dark:border-gray-700 bg-gray-50 dark:text-gray-400 dark:bg-gray-800">
|
||||
<th class="px-4 py-3">Order</th>
|
||||
<th class="px-4 py-3">Customer</th>
|
||||
<th class="px-4 py-3">Vendor</th>
|
||||
<th class="px-4 py-3">Channel</th>
|
||||
<th class="px-4 py-3 text-right">Total</th>
|
||||
<th class="px-4 py-3">Status</th>
|
||||
<th class="px-4 py-3">Date</th>
|
||||
<th class="px-4 py-3">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
|
||||
<!-- Empty State -->
|
||||
<template x-if="orders.length === 0">
|
||||
<tr>
|
||||
<td colspan="8" class="px-4 py-8 text-center text-gray-600 dark:text-gray-400">
|
||||
<div class="flex flex-col items-center">
|
||||
<span x-html="$icon('clipboard-list', 'w-12 h-12 mb-2 text-gray-300')"></span>
|
||||
<p class="font-medium">No orders found</p>
|
||||
<p class="text-xs mt-1" x-text="filters.search || filters.vendor_id || filters.status || filters.channel ? 'Try adjusting your filters' : 'Orders will appear here when customers place orders'"></p>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</template>
|
||||
|
||||
<!-- Order Rows -->
|
||||
<template x-for="order in orders" :key="order.id">
|
||||
<tr class="text-gray-700 dark:text-gray-400">
|
||||
<!-- Order Info -->
|
||||
<td class="px-4 py-3">
|
||||
<div>
|
||||
<p class="font-semibold text-sm font-mono" x-text="order.order_number"></p>
|
||||
<p class="text-xs text-gray-500" x-text="order.item_count + ' item(s)'"></p>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
<!-- Customer Info -->
|
||||
<td class="px-4 py-3 text-sm">
|
||||
<p class="font-medium" x-text="order.customer_name || 'Guest'"></p>
|
||||
<p class="text-xs text-gray-500 dark:text-gray-400 truncate max-w-[150px]" x-text="order.customer_email || '-'"></p>
|
||||
</td>
|
||||
|
||||
<!-- Vendor Info -->
|
||||
<td class="px-4 py-3 text-sm">
|
||||
<p class="font-medium" x-text="order.vendor_name || 'Unknown'"></p>
|
||||
<p class="text-xs text-gray-500 dark:text-gray-400 font-mono" x-text="order.vendor_code || ''"></p>
|
||||
</td>
|
||||
|
||||
<!-- Channel -->
|
||||
<td class="px-4 py-3 text-sm">
|
||||
<span class="px-2 py-1 text-xs font-medium rounded-full"
|
||||
:class="order.channel === 'letzshop' ? 'bg-blue-100 text-blue-700 dark:bg-blue-900/30 dark:text-blue-400' : 'bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300'"
|
||||
x-text="order.channel"></span>
|
||||
</td>
|
||||
|
||||
<!-- Total -->
|
||||
<td class="px-4 py-3 text-sm text-right font-mono font-semibold">
|
||||
<span x-text="formatPrice(order.total_amount, order.currency)"></span>
|
||||
</td>
|
||||
|
||||
<!-- Status -->
|
||||
<td class="px-4 py-3 text-sm">
|
||||
<span class="px-2 py-1 font-semibold leading-tight rounded-full text-xs"
|
||||
:class="getStatusClass(order.status)"
|
||||
x-text="order.status"></span>
|
||||
</td>
|
||||
|
||||
<!-- Date -->
|
||||
<td class="px-4 py-3 text-sm">
|
||||
<p x-text="formatDate(order.created_at)"></p>
|
||||
<p class="text-xs text-gray-500" x-text="formatTime(order.created_at)"></p>
|
||||
</td>
|
||||
|
||||
<!-- Actions -->
|
||||
<td class="px-4 py-3 text-sm">
|
||||
<div class="flex items-center space-x-2">
|
||||
<button
|
||||
@click="viewOrder(order)"
|
||||
class="flex items-center justify-center px-2 py-1 text-xs font-medium leading-5 text-purple-600 rounded-lg dark:text-purple-400 focus:outline-none hover:bg-gray-100 dark:hover:bg-gray-700"
|
||||
title="View Details"
|
||||
>
|
||||
<span x-html="$icon('eye', 'w-4 h-4')"></span>
|
||||
</button>
|
||||
<button
|
||||
@click="openStatusModal(order)"
|
||||
class="flex items-center justify-center px-2 py-1 text-xs font-medium leading-5 text-blue-600 rounded-lg dark:text-blue-400 focus:outline-none hover:bg-gray-100 dark:hover:bg-gray-700"
|
||||
title="Update Status"
|
||||
>
|
||||
<span x-html="$icon('pencil', 'w-4 h-4')"></span>
|
||||
</button>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</template>
|
||||
</tbody>
|
||||
{% endcall %}
|
||||
|
||||
{{ pagination(show_condition="!loading && pagination.total > 0") }}
|
||||
</div>
|
||||
|
||||
<!-- Update Status Modal -->
|
||||
{% call modal_simple('updateStatusModal', 'Update Order Status', show_var='showStatusModal', size='sm') %}
|
||||
<div class="space-y-4">
|
||||
<div class="text-sm text-gray-600 dark:text-gray-400">
|
||||
<p class="font-medium text-gray-700 dark:text-gray-300">Order: <span x-text="selectedOrder?.order_number"></span></p>
|
||||
<p class="text-xs">Current Status: <span class="font-medium" x-text="selectedOrder?.status"></span></p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
New Status
|
||||
</label>
|
||||
<select
|
||||
x-model="statusForm.status"
|
||||
class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none dark:bg-gray-700 dark:text-gray-300"
|
||||
>
|
||||
<option value="pending">Pending</option>
|
||||
<option value="processing">Processing</option>
|
||||
<option value="shipped">Shipped</option>
|
||||
<option value="delivered">Delivered</option>
|
||||
<option value="cancelled">Cancelled</option>
|
||||
<option value="refunded">Refunded</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div x-show="statusForm.status === 'shipped'">
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Tracking Number
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
x-model="statusForm.tracking_number"
|
||||
class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none dark:bg-gray-700 dark:text-gray-300"
|
||||
placeholder="Enter tracking number"
|
||||
>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Reason (optional)
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
x-model="statusForm.reason"
|
||||
class="w-full px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none dark:bg-gray-700 dark:text-gray-300"
|
||||
placeholder="e.g., Customer requested cancellation"
|
||||
>
|
||||
</div>
|
||||
|
||||
<div class="flex items-center justify-end gap-3 pt-4 border-t border-gray-200 dark:border-gray-700">
|
||||
<button
|
||||
@click="showStatusModal = false"
|
||||
class="px-4 py-2 text-sm font-medium text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-600 transition-colors"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
<button
|
||||
@click="updateStatus()"
|
||||
:disabled="saving || statusForm.status === selectedOrder?.status"
|
||||
class="px-4 py-2 text-sm font-medium text-white bg-purple-600 rounded-lg hover:bg-purple-700 transition-colors disabled:opacity-50"
|
||||
>
|
||||
<span x-text="saving ? 'Updating...' : 'Update Status'"></span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
{% endcall %}
|
||||
|
||||
<!-- Order Detail Modal -->
|
||||
{% call modal_simple('orderDetailModal', 'Order Details', show_var='showDetailModal', size='lg') %}
|
||||
<div x-show="selectedOrderDetail" class="space-y-4">
|
||||
<!-- Order Header -->
|
||||
<div class="flex items-center justify-between pb-4 border-b border-gray-200 dark:border-gray-700">
|
||||
<div>
|
||||
<p class="text-lg font-semibold text-gray-800 dark:text-gray-200" x-text="selectedOrderDetail?.order_number"></p>
|
||||
<p class="text-sm text-gray-500" x-text="formatDateTime(selectedOrderDetail?.created_at)"></p>
|
||||
</div>
|
||||
<span class="px-3 py-1 text-sm font-semibold rounded-full"
|
||||
:class="getStatusClass(selectedOrderDetail?.status)"
|
||||
x-text="selectedOrderDetail?.status"></span>
|
||||
</div>
|
||||
|
||||
<!-- Customer & Vendor Info -->
|
||||
<div class="grid grid-cols-2 gap-4">
|
||||
<div>
|
||||
<p class="text-xs font-medium text-gray-500 dark:text-gray-400 uppercase">Customer</p>
|
||||
<p class="text-sm font-medium text-gray-800 dark:text-gray-200" x-text="selectedOrderDetail?.customer?.first_name + ' ' + selectedOrderDetail?.customer?.last_name"></p>
|
||||
<p class="text-xs text-gray-500" x-text="selectedOrderDetail?.customer?.email"></p>
|
||||
</div>
|
||||
<div>
|
||||
<p class="text-xs font-medium text-gray-500 dark:text-gray-400 uppercase">Vendor</p>
|
||||
<p class="text-sm font-medium text-gray-800 dark:text-gray-200" x-text="selectedOrderDetail?.vendor?.name"></p>
|
||||
<p class="text-xs text-gray-500 font-mono" x-text="selectedOrderDetail?.vendor?.vendor_code"></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Items -->
|
||||
<div>
|
||||
<p class="text-xs font-medium text-gray-500 dark:text-gray-400 uppercase mb-2">Items</p>
|
||||
<div class="bg-gray-50 dark:bg-gray-700 rounded-lg overflow-hidden">
|
||||
<template x-for="item in selectedOrderDetail?.items || []" :key="item.id">
|
||||
<div class="flex items-center justify-between px-4 py-2 border-b border-gray-200 dark:border-gray-600 last:border-0">
|
||||
<div>
|
||||
<p class="text-sm font-medium text-gray-800 dark:text-gray-200" x-text="item.product_name"></p>
|
||||
<p class="text-xs text-gray-500" x-text="'SKU: ' + (item.product_sku || '-')"></p>
|
||||
</div>
|
||||
<div class="text-right">
|
||||
<p class="text-sm font-medium text-gray-800 dark:text-gray-200" x-text="formatPrice(item.total_price)"></p>
|
||||
<p class="text-xs text-gray-500" x-text="item.quantity + ' x ' + formatPrice(item.unit_price)"></p>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Totals -->
|
||||
<div class="bg-gray-50 dark:bg-gray-700 rounded-lg p-4">
|
||||
<div class="flex justify-between text-sm mb-1">
|
||||
<span class="text-gray-600 dark:text-gray-400">Subtotal</span>
|
||||
<span x-text="formatPrice(selectedOrderDetail?.subtotal)"></span>
|
||||
</div>
|
||||
<div class="flex justify-between text-sm mb-1">
|
||||
<span class="text-gray-600 dark:text-gray-400">Tax</span>
|
||||
<span x-text="formatPrice(selectedOrderDetail?.tax_amount)"></span>
|
||||
</div>
|
||||
<div class="flex justify-between text-sm mb-1">
|
||||
<span class="text-gray-600 dark:text-gray-400">Shipping</span>
|
||||
<span x-text="formatPrice(selectedOrderDetail?.shipping_amount)"></span>
|
||||
</div>
|
||||
<template x-if="selectedOrderDetail?.discount_amount > 0">
|
||||
<div class="flex justify-between text-sm mb-1 text-green-600">
|
||||
<span>Discount</span>
|
||||
<span x-text="'-' + formatPrice(selectedOrderDetail?.discount_amount)"></span>
|
||||
</div>
|
||||
</template>
|
||||
<div class="flex justify-between text-sm font-semibold pt-2 border-t border-gray-200 dark:border-gray-600">
|
||||
<span>Total</span>
|
||||
<span x-text="formatPrice(selectedOrderDetail?.total_amount, selectedOrderDetail?.currency)"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Shipping Address -->
|
||||
<div x-show="selectedOrderDetail?.shipping_address">
|
||||
<p class="text-xs font-medium text-gray-500 dark:text-gray-400 uppercase mb-2">Shipping Address</p>
|
||||
<div class="text-sm text-gray-700 dark:text-gray-300">
|
||||
<p x-text="selectedOrderDetail?.shipping_address?.first_name + ' ' + selectedOrderDetail?.shipping_address?.last_name"></p>
|
||||
<p x-text="selectedOrderDetail?.shipping_address?.address_line_1"></p>
|
||||
<p x-show="selectedOrderDetail?.shipping_address?.address_line_2" x-text="selectedOrderDetail?.shipping_address?.address_line_2"></p>
|
||||
<p x-text="selectedOrderDetail?.shipping_address?.postal_code + ' ' + selectedOrderDetail?.shipping_address?.city"></p>
|
||||
<p x-text="selectedOrderDetail?.shipping_address?.country"></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Tracking Info -->
|
||||
<div x-show="selectedOrderDetail?.tracking_number">
|
||||
<p class="text-xs font-medium text-gray-500 dark:text-gray-400 uppercase mb-1">Tracking Number</p>
|
||||
<p class="text-sm font-mono text-gray-800 dark:text-gray-200" x-text="selectedOrderDetail?.tracking_number"></p>
|
||||
</div>
|
||||
|
||||
<!-- Notes -->
|
||||
<div x-show="selectedOrderDetail?.internal_notes">
|
||||
<p class="text-xs font-medium text-gray-500 dark:text-gray-400 uppercase mb-1">Internal Notes</p>
|
||||
<p class="text-sm text-gray-700 dark:text-gray-300 whitespace-pre-wrap" x-text="selectedOrderDetail?.internal_notes"></p>
|
||||
</div>
|
||||
|
||||
<div class="flex items-center justify-end gap-3 pt-4 border-t border-gray-200 dark:border-gray-700">
|
||||
<button
|
||||
@click="showDetailModal = false"
|
||||
class="px-4 py-2 text-sm font-medium text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-600 transition-colors"
|
||||
>
|
||||
Close
|
||||
</button>
|
||||
<button
|
||||
@click="showDetailModal = false; openStatusModal(selectedOrderDetail)"
|
||||
class="px-4 py-2 text-sm font-medium text-white bg-purple-600 rounded-lg hover:bg-purple-700 transition-colors"
|
||||
>
|
||||
Update Status
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
{% endcall %}
|
||||
{% endblock %}
|
||||
|
||||
{% block extra_scripts %}
|
||||
<script src="{{ url_for('static', path='admin/js/orders.js') }}"></script>
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user