feat(F-106): completed feature
This commit is contained in:
@@ -4656,6 +4656,162 @@
|
|||||||
"Shipped state allows tracking number",
|
"Shipped state allows tracking number",
|
||||||
"verify.sh is green"
|
"verify.sh is green"
|
||||||
],
|
],
|
||||||
|
"status": "done",
|
||||||
|
"created_at": "2026-08-21",
|
||||||
|
"gates": {
|
||||||
|
"reviewer": true,
|
||||||
|
"security": true,
|
||||||
|
"qa": true,
|
||||||
|
"close": true
|
||||||
|
},
|
||||||
|
"completed_at": "2026-08-21T07:27:55Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "F-107",
|
||||||
|
"type": "fix",
|
||||||
|
"title": "Reorder product editor form fields",
|
||||||
|
"problem": "Product editor form order is confusing and slug is manually editable",
|
||||||
|
"goal": "Slug auto-generated and disabled, featured star next to name, description right after name",
|
||||||
|
"scope_in": [
|
||||||
|
"admin product editor general tab"
|
||||||
|
],
|
||||||
|
"scope_out": [
|
||||||
|
"no schema change",
|
||||||
|
"no redesign"
|
||||||
|
],
|
||||||
|
"priority": "high",
|
||||||
|
"risk": "low",
|
||||||
|
"description": "Problem: Product editor form order is confusing and slug is manually editable. Goal: Slug auto-generated and disabled, featured star next to name, description right after name. Scope IN: admin product editor general tab. Scope OUT: no schema change, no redesign. Type: fix. Priority: high. Risk: low.",
|
||||||
|
"acceptance": [
|
||||||
|
"Slug auto-generated from name and input disabled",
|
||||||
|
"Featured star checkbox sits next to product name",
|
||||||
|
"Description follows name in form order",
|
||||||
|
"verify.sh is green"
|
||||||
|
],
|
||||||
|
"status": "pending",
|
||||||
|
"created_at": "2026-08-21",
|
||||||
|
"gates": {
|
||||||
|
"reviewer": false,
|
||||||
|
"security": false,
|
||||||
|
"qa": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "F-108",
|
||||||
|
"type": "fix",
|
||||||
|
"title": "Remove variants module: price stock EAN per product in General tab",
|
||||||
|
"problem": "Variants UI is useless because each variant is created as a separate product",
|
||||||
|
"goal": "Hide variant management, manage price stock EAN per product, show price and stock section in General tab between name and description",
|
||||||
|
"scope_in": [
|
||||||
|
"admin product editor",
|
||||||
|
"inventory",
|
||||||
|
"publish tab"
|
||||||
|
],
|
||||||
|
"scope_out": [
|
||||||
|
"no schema deletion",
|
||||||
|
"keep one internal variant per product"
|
||||||
|
],
|
||||||
|
"priority": "high",
|
||||||
|
"risk": "med",
|
||||||
|
"description": "Problem: Variants UI is useless because each variant is created as a separate product. Goal: Hide variant management, manage price stock EAN per product, show price and stock section in General tab between name and description. Scope IN: admin product editor, inventory, publish tab. Scope OUT: no schema deletion, keep one internal variant per product. Type: fix. Priority: high. Risk: med.",
|
||||||
|
"acceptance": [
|
||||||
|
"No variant creation UI remains in admin",
|
||||||
|
"Price stock EAN editable per product in General tab between name and description",
|
||||||
|
"Inventory lists products not variants",
|
||||||
|
"verify.sh is green"
|
||||||
|
],
|
||||||
|
"status": "pending",
|
||||||
|
"created_at": "2026-08-21",
|
||||||
|
"gates": {
|
||||||
|
"reviewer": false,
|
||||||
|
"security": false,
|
||||||
|
"qa": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "F-109",
|
||||||
|
"type": "fix",
|
||||||
|
"title": "Auto-generate SKU as SKU-MV-product-id and hide it from editor",
|
||||||
|
"problem": "SKU is internal only but operators must still see and type it",
|
||||||
|
"goal": "Generate SKU automatically as SKU-MV-[product_id], keep it internal, remove SKU input from product editor",
|
||||||
|
"scope_in": [
|
||||||
|
"catalog",
|
||||||
|
"admin product editor",
|
||||||
|
"inventory display"
|
||||||
|
],
|
||||||
|
"scope_out": [
|
||||||
|
"no SKU editability",
|
||||||
|
"no external service"
|
||||||
|
],
|
||||||
|
"priority": "high",
|
||||||
|
"risk": "low",
|
||||||
|
"description": "Problem: SKU is internal only but operators must still see and type it. Goal: Generate SKU automatically as SKU-MV-[product_id], keep it internal, remove SKU input from product editor. Scope IN: catalog, admin product editor, inventory display. Scope OUT: no SKU editability, no external service. Type: fix. Priority: high. Risk: low.",
|
||||||
|
"acceptance": [
|
||||||
|
"New product gets SKU SKU-MV-[product_id] without operator input",
|
||||||
|
"Product editor shows no SKU field",
|
||||||
|
"Supersedes F-100 title-based SKU idea",
|
||||||
|
"verify.sh is green"
|
||||||
|
],
|
||||||
|
"status": "pending",
|
||||||
|
"created_at": "2026-08-21",
|
||||||
|
"gates": {
|
||||||
|
"reviewer": false,
|
||||||
|
"security": false,
|
||||||
|
"qa": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "F-110",
|
||||||
|
"type": "feature",
|
||||||
|
"title": "Inventory: expiration date column, expiry and margin filters",
|
||||||
|
"problem": "Inventory shows internal SKU column and lacks expiry and profit-margin insight",
|
||||||
|
"goal": "Replace SKU column with expiration date, add expiring-soon filter under 30 days sorted ASC, add margin column and low-margin filter under 30 percent sorted ASC",
|
||||||
|
"scope_in": [
|
||||||
|
"admin inventory list"
|
||||||
|
],
|
||||||
|
"scope_out": [
|
||||||
|
"no pricing redesign"
|
||||||
|
],
|
||||||
|
"priority": "high",
|
||||||
|
"risk": "med",
|
||||||
|
"description": "Problem: Inventory shows internal SKU column and lacks expiry and profit-margin insight. Goal: Replace SKU column with expiration date, add expiring-soon filter under 30 days sorted ASC, add margin column and low-margin filter under 30 percent sorted ASC. Scope IN: admin inventory list. Scope OUT: no pricing redesign. Type: feature. Priority: high. Risk: med.",
|
||||||
|
"acceptance": [
|
||||||
|
"SKU column removed and expiration date column shown",
|
||||||
|
"Filter shows items expiring in under 30 days sorted by date ASC",
|
||||||
|
"Margin column shows profit margin percent",
|
||||||
|
"Filter shows items with margin under 30 percent sorted ASC",
|
||||||
|
"verify.sh is green"
|
||||||
|
],
|
||||||
|
"status": "pending",
|
||||||
|
"created_at": "2026-08-21",
|
||||||
|
"gates": {
|
||||||
|
"reviewer": false,
|
||||||
|
"security": false,
|
||||||
|
"qa": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "F-111",
|
||||||
|
"type": "feature",
|
||||||
|
"title": "Shipping management in order editing with tracking history",
|
||||||
|
"problem": "Order editing tab has no shipping management and tracking number leaves no history record",
|
||||||
|
"goal": "Manage shipping in order edit tab, register tracking number changes in order history",
|
||||||
|
"scope_in": [
|
||||||
|
"admin order detail",
|
||||||
|
"orders module history"
|
||||||
|
],
|
||||||
|
"scope_out": [
|
||||||
|
"no carrier integrations"
|
||||||
|
],
|
||||||
|
"priority": "high",
|
||||||
|
"risk": "med",
|
||||||
|
"description": "Problem: Order editing tab has no shipping management and tracking number leaves no history record. Goal: Manage shipping in order edit tab, register tracking number changes in order history. Scope IN: admin order detail, orders module history. Scope OUT: no carrier integrations. Type: feature. Priority: high. Risk: med.",
|
||||||
|
"acceptance": [
|
||||||
|
"Shipping section editable in order edit tab",
|
||||||
|
"Every tracking number change recorded in order history",
|
||||||
|
"History visible in order detail",
|
||||||
|
"verify.sh is green"
|
||||||
|
],
|
||||||
"status": "pending",
|
"status": "pending",
|
||||||
"created_at": "2026-08-21",
|
"created_at": "2026-08-21",
|
||||||
"gates": {
|
"gates": {
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
'use client';
|
'use client';
|
||||||
import { useState, useEffect, useCallback } from 'react';
|
import { useState, useEffect, useCallback } from 'react';
|
||||||
import { useParams, useRouter } from 'next/navigation';
|
import { useParams } from 'next/navigation';
|
||||||
import Link from 'next/link';
|
import Link from 'next/link';
|
||||||
import type { Order, OrderState } from '@/types';
|
import type { Order, OrderState, Product } from '@/types';
|
||||||
import { ordersApi } from '@/lib/api-client';
|
import { ordersApi, productsApi } from '@/lib/api-client';
|
||||||
|
|
||||||
const STATE_LABELS: Record<OrderState, string> = {
|
const STATE_LABELS: Record<OrderState, string> = {
|
||||||
PENDING: 'Pendiente',
|
PENDING: 'Pendiente',
|
||||||
@@ -53,19 +53,39 @@ const ACTION_LABELS: Record<OrderState, string> = {
|
|||||||
PARTIALLY_REFUNDED: 'Reembolso parcial',
|
PARTIALLY_REFUNDED: 'Reembolso parcial',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
interface DraftItem {
|
||||||
|
variantId: string;
|
||||||
|
productId: string;
|
||||||
|
sku: string;
|
||||||
|
name: string;
|
||||||
|
quantity: number;
|
||||||
|
}
|
||||||
|
|
||||||
function formatPrice(cents: number) {
|
function formatPrice(cents: number) {
|
||||||
return `€${(cents / 100).toFixed(2)}`;
|
return `€${(cents / 100).toFixed(2)}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function OrderDetailPage() {
|
export default function OrderDetailPage() {
|
||||||
const { id } = useParams<{ id: string }>();
|
const { id } = useParams<{ id: string }>();
|
||||||
const router = useRouter();
|
|
||||||
const [order, setOrder] = useState<Order | null>(null);
|
const [order, setOrder] = useState<Order | null>(null);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [error, setError] = useState('');
|
const [error, setError] = useState('');
|
||||||
const [transitioning, setTransitioning] = useState(false);
|
const [transitioning, setTransitioning] = useState(false);
|
||||||
const [showConfirm, setShowConfirm] = useState<OrderState | null>(null);
|
const [showConfirm, setShowConfirm] = useState<OrderState | null>(null);
|
||||||
const [confirmReason, setConfirmReason] = useState('');
|
const [confirmReason, setConfirmReason] = useState('');
|
||||||
|
const [trackingInput, setTrackingInput] = useState('');
|
||||||
|
const [notification, setNotification] = useState<{ ok: boolean; message: string } | null>(null);
|
||||||
|
|
||||||
|
// Edición de artículos
|
||||||
|
const [editing, setEditing] = useState(false);
|
||||||
|
const [draftItems, setDraftItems] = useState<DraftItem[]>([]);
|
||||||
|
const [savingItems, setSavingItems] = useState(false);
|
||||||
|
const [itemsError, setItemsError] = useState('');
|
||||||
|
const [productQuery, setProductQuery] = useState('');
|
||||||
|
const [searchResults, setSearchResults] = useState<Product[]>([]);
|
||||||
|
const [searching, setSearching] = useState(false);
|
||||||
|
const [addingProductId, setAddingProductId] = useState<string | null>(null);
|
||||||
|
const [addingVariants, setAddingVariants] = useState<{ id: string; sku: string }[]>([]);
|
||||||
|
|
||||||
const load = useCallback(async () => {
|
const load = useCallback(async () => {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
@@ -83,12 +103,22 @@ export default function OrderDetailPage() {
|
|||||||
useEffect(() => { load(); }, [load]);
|
useEffect(() => { load(); }, [load]);
|
||||||
|
|
||||||
const handleTransition = async (nextState: OrderState) => {
|
const handleTransition = async (nextState: OrderState) => {
|
||||||
|
if (nextState === 'SHIPPED' && !trackingInput.trim()) return;
|
||||||
setTransitioning(true);
|
setTransitioning(true);
|
||||||
try {
|
try {
|
||||||
const updated = await ordersApi.transition(id, nextState);
|
const updated = await ordersApi.transition(id, nextState, trackingInput);
|
||||||
setOrder(updated);
|
setOrder(updated);
|
||||||
setShowConfirm(null);
|
setShowConfirm(null);
|
||||||
setConfirmReason('');
|
setConfirmReason('');
|
||||||
|
setTrackingInput('');
|
||||||
|
if (updated.notified) {
|
||||||
|
setNotification({ ok: true, message: 'Cliente notificado por email.' });
|
||||||
|
} else {
|
||||||
|
setNotification({
|
||||||
|
ok: false,
|
||||||
|
message: updated.notificationError || 'No se pudo notificar al cliente por email.',
|
||||||
|
});
|
||||||
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
alert(err instanceof Error ? err.message : 'Error al cambiar estado');
|
alert(err instanceof Error ? err.message : 'Error al cambiar estado');
|
||||||
} finally {
|
} finally {
|
||||||
@@ -96,6 +126,108 @@ export default function OrderDetailPage() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const startEditing = () => {
|
||||||
|
if (!order) return;
|
||||||
|
setDraftItems(
|
||||||
|
order.items.map((item) => ({
|
||||||
|
variantId: item.variantId,
|
||||||
|
productId: item.productId,
|
||||||
|
sku: item.sku,
|
||||||
|
name: item.name,
|
||||||
|
quantity: item.quantity,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
setItemsError('');
|
||||||
|
setEditing(true);
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateDraftQuantity = (variantId: string, quantity: number) => {
|
||||||
|
setDraftItems((prev) =>
|
||||||
|
prev.map((item) =>
|
||||||
|
item.variantId === variantId
|
||||||
|
? { ...item, quantity: Math.max(1, Math.min(999, quantity || 1)) }
|
||||||
|
: item,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const removeDraftItem = (variantId: string) => {
|
||||||
|
setDraftItems((prev) => prev.filter((item) => item.variantId !== variantId));
|
||||||
|
};
|
||||||
|
|
||||||
|
const searchProducts = useCallback(async (query: string) => {
|
||||||
|
setProductQuery(query);
|
||||||
|
if (query.trim().length < 2) {
|
||||||
|
setSearchResults([]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setSearching(true);
|
||||||
|
try {
|
||||||
|
const result = await productsApi.list({ q: query.trim(), limit: 8 });
|
||||||
|
setSearchResults(result.items ?? []);
|
||||||
|
} catch {
|
||||||
|
setSearchResults([]);
|
||||||
|
} finally {
|
||||||
|
setSearching(false);
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const pickProductForAdd = async (product: Product) => {
|
||||||
|
setAddingProductId(product.id);
|
||||||
|
setAddingVariants([]);
|
||||||
|
try {
|
||||||
|
const result = await productsApi.getVariants(product.id);
|
||||||
|
const variants = (result.items ?? []).map((variant) => ({ id: variant.id, sku: variant.sku }));
|
||||||
|
if (variants.length === 1) {
|
||||||
|
addDraftItem(variants[0].id, product.id, variants[0].sku, product.name);
|
||||||
|
setAddingProductId(null);
|
||||||
|
} else {
|
||||||
|
setAddingVariants(variants);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
setItemsError(err instanceof Error ? err.message : 'Error al cargar variantes');
|
||||||
|
setAddingProductId(null);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const addDraftItem = (variantId: string, productId: string, sku: string, name: string) => {
|
||||||
|
setDraftItems((prev) => {
|
||||||
|
const existing = prev.find((item) => item.variantId === variantId);
|
||||||
|
if (existing) {
|
||||||
|
return prev.map((item) =>
|
||||||
|
item.variantId === variantId ? { ...item, quantity: Math.min(999, item.quantity + 1) } : item,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return [...prev, { variantId, productId, sku, name, quantity: 1 }];
|
||||||
|
});
|
||||||
|
setSearchResults([]);
|
||||||
|
setProductQuery('');
|
||||||
|
setAddingProductId(null);
|
||||||
|
setAddingVariants([]);
|
||||||
|
setItemsError('');
|
||||||
|
};
|
||||||
|
|
||||||
|
const saveItems = async () => {
|
||||||
|
if (draftItems.length === 0) {
|
||||||
|
setItemsError('El pedido debe tener al menos un artículo');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setSavingItems(true);
|
||||||
|
setItemsError('');
|
||||||
|
try {
|
||||||
|
const updated = await ordersApi.editItems(
|
||||||
|
id,
|
||||||
|
draftItems.map((item) => ({ variantId: item.variantId, quantity: item.quantity })),
|
||||||
|
);
|
||||||
|
setOrder(updated);
|
||||||
|
setEditing(false);
|
||||||
|
} catch (err) {
|
||||||
|
setItemsError(err instanceof Error ? err.message : 'Error al guardar artículos');
|
||||||
|
} finally {
|
||||||
|
setSavingItems(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
if (loading) {
|
if (loading) {
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center justify-center min-h-64">
|
<div className="flex items-center justify-center min-h-64">
|
||||||
@@ -117,6 +249,7 @@ export default function OrderDetailPage() {
|
|||||||
|
|
||||||
const currentState = order.state as OrderState;
|
const currentState = order.state as OrderState;
|
||||||
const allowed = ALLOWED_TRANSITIONS[currentState] ?? [];
|
const allowed = ALLOWED_TRANSITIONS[currentState] ?? [];
|
||||||
|
const itemsEditable = currentState !== 'CANCELLED' && currentState !== 'REFUNDED';
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="space-y-6">
|
<div className="space-y-6">
|
||||||
@@ -142,6 +275,20 @@ export default function OrderDetailPage() {
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Notification result */}
|
||||||
|
{notification && (
|
||||||
|
<div
|
||||||
|
className={`flex items-center justify-between px-4 py-3 rounded-xl text-sm border ${
|
||||||
|
notification.ok
|
||||||
|
? 'bg-green-50 border-green-200 text-green-800'
|
||||||
|
: 'bg-amber-50 border-amber-200 text-amber-800'
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
<span>{notification.message}</span>
|
||||||
|
<button onClick={() => setNotification(null)} className="ml-4 font-bold opacity-60 hover:opacity-100">✕</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
<div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
|
<div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
|
||||||
{/* Main content */}
|
{/* Main content */}
|
||||||
<div className="lg:col-span-2 space-y-6">
|
<div className="lg:col-span-2 space-y-6">
|
||||||
@@ -153,7 +300,7 @@ export default function OrderDetailPage() {
|
|||||||
{allowed.map((next) => (
|
{allowed.map((next) => (
|
||||||
<button
|
<button
|
||||||
key={next}
|
key={next}
|
||||||
onClick={() => setShowConfirm(next)}
|
onClick={() => { setShowConfirm(next); setNotification(null); }}
|
||||||
disabled={transitioning}
|
disabled={transitioning}
|
||||||
className="px-4 py-2 bg-[#2D6A4F] hover:bg-[#1B4332] disabled:opacity-50 text-white text-sm font-semibold rounded-xl transition-colors"
|
className="px-4 py-2 bg-[#2D6A4F] hover:bg-[#1B4332] disabled:opacity-50 text-white text-sm font-semibold rounded-xl transition-colors"
|
||||||
>
|
>
|
||||||
@@ -166,23 +313,135 @@ export default function OrderDetailPage() {
|
|||||||
|
|
||||||
{/* Order items */}
|
{/* Order items */}
|
||||||
<div className="bg-white border border-gray-200 rounded-xl p-6">
|
<div className="bg-white border border-gray-200 rounded-xl p-6">
|
||||||
<h2 className="font-bold text-gray-900 mb-4">Productos</h2>
|
<div className="flex items-center justify-between mb-4">
|
||||||
<div className="space-y-3">
|
<h2 className="font-bold text-gray-900">Productos</h2>
|
||||||
{order.items.map((item) => (
|
{itemsEditable && !editing && (
|
||||||
<div key={item.id} className="flex justify-between items-start py-2 border-b border-gray-50 last:border-0">
|
<button
|
||||||
<div className="flex-1 min-w-0">
|
onClick={startEditing}
|
||||||
<p className="text-sm font-medium text-gray-900">{item.name}</p>
|
className="px-3 py-1.5 text-sm font-semibold text-[#2D6A4F] border border-[#2D6A4F] rounded-lg hover:bg-[#2D6A4F]/5 transition-colors"
|
||||||
<p className="text-xs text-gray-400">
|
>
|
||||||
{item.quantity} × {formatPrice(item.unitPriceCents)}
|
✏️ Editar artículos
|
||||||
{item.discountCents > 0 && ` (-${formatPrice(item.discountCents)})`}
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{!editing ? (
|
||||||
|
<div className="space-y-3">
|
||||||
|
{order.items.map((item) => (
|
||||||
|
<div key={item.id} className="flex justify-between items-start py-2 border-b border-gray-50 last:border-0">
|
||||||
|
<div className="flex-1 min-w-0">
|
||||||
|
<p className="text-sm font-medium text-gray-900">{item.name}</p>
|
||||||
|
<p className="text-xs text-gray-400">
|
||||||
|
{item.quantity} × {formatPrice(item.unitPriceCents)}
|
||||||
|
{item.discountCents > 0 && ` (-${formatPrice(item.discountCents)})`}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<p className="text-sm font-bold text-gray-900 ml-4">
|
||||||
|
{formatPrice((item.unitPriceCents - item.discountCents) * item.quantity)}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<p className="text-sm font-bold text-gray-900 ml-4">
|
))}
|
||||||
{formatPrice((item.unitPriceCents - item.discountCents) * item.quantity)}
|
</div>
|
||||||
</p>
|
) : (
|
||||||
|
<div className="space-y-4">
|
||||||
|
<div className="space-y-3">
|
||||||
|
{draftItems.map((item) => (
|
||||||
|
<div key={item.variantId} className="flex items-center gap-3 py-2 border-b border-gray-50 last:border-0">
|
||||||
|
<div className="flex-1 min-w-0">
|
||||||
|
<p className="text-sm font-medium text-gray-900 truncate">{item.name}</p>
|
||||||
|
<p className="text-xs text-gray-400 font-mono">{item.sku}</p>
|
||||||
|
</div>
|
||||||
|
<input
|
||||||
|
type="number"
|
||||||
|
min={1}
|
||||||
|
max={999}
|
||||||
|
value={item.quantity}
|
||||||
|
onChange={(e) => updateDraftQuantity(item.variantId, Number(e.target.value))}
|
||||||
|
className="w-20 px-2 py-1.5 border border-gray-300 rounded-lg text-sm text-right focus:ring-2 focus:ring-[#2D6A4F] outline-none"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
onClick={() => removeDraftItem(item.variantId)}
|
||||||
|
disabled={draftItems.length === 1}
|
||||||
|
title="Quitar artículo"
|
||||||
|
className="p-1.5 text-red-500 hover:bg-red-50 rounded-lg disabled:opacity-30 disabled:cursor-not-allowed"
|
||||||
|
>
|
||||||
|
🗑️
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
{draftItems.length === 0 && (
|
||||||
|
<p className="text-sm text-gray-400 py-2">Sin artículos. Añade al menos uno.</p>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
))}
|
|
||||||
</div>
|
{/* Add product */}
|
||||||
|
<div className="border-t border-gray-100 pt-4">
|
||||||
|
<label className="text-xs font-semibold text-gray-500 uppercase tracking-wide">Añadir producto</label>
|
||||||
|
<input
|
||||||
|
type="search"
|
||||||
|
value={productQuery}
|
||||||
|
onChange={(e) => { searchProducts(e.target.value); }}
|
||||||
|
placeholder="Buscar por nombre o SKU (mín. 2 caracteres)…"
|
||||||
|
className="mt-1 w-full px-3 py-2 border border-gray-300 rounded-xl text-sm focus:ring-2 focus:ring-[#2D6A4F] outline-none"
|
||||||
|
/>
|
||||||
|
{searching && <p className="text-xs text-gray-400 mt-2">Buscando…</p>}
|
||||||
|
{!searching && searchResults.length > 0 && (
|
||||||
|
<ul className="mt-2 border border-gray-200 rounded-xl divide-y divide-gray-100 max-h-56 overflow-auto">
|
||||||
|
{searchResults.map((product) => (
|
||||||
|
<li key={product.id}>
|
||||||
|
{addingProductId === product.id && addingVariants.length > 0 ? (
|
||||||
|
<div className="px-3 py-2">
|
||||||
|
<p className="text-sm font-medium text-gray-900">{product.name}</p>
|
||||||
|
<div className="flex flex-wrap gap-2 mt-1">
|
||||||
|
{addingVariants.map((variant) => (
|
||||||
|
<button
|
||||||
|
key={variant.id}
|
||||||
|
onClick={() => addDraftItem(variant.id, product.id, variant.sku, product.name)}
|
||||||
|
className="px-2 py-1 text-xs font-mono bg-gray-100 hover:bg-[#2D6A4F] hover:text-white rounded-lg transition-colors"
|
||||||
|
>
|
||||||
|
{variant.sku}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<button
|
||||||
|
onClick={() => { pickProductForAdd(product); }}
|
||||||
|
disabled={addingProductId !== null}
|
||||||
|
className="w-full text-left px-3 py-2 text-sm text-gray-800 hover:bg-gray-50 disabled:opacity-50"
|
||||||
|
>
|
||||||
|
{product.name}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{itemsError && <p className="text-sm text-red-600">{itemsError}</p>}
|
||||||
|
|
||||||
|
<div className="flex gap-3 justify-end border-t border-gray-100 pt-4">
|
||||||
|
<button
|
||||||
|
onClick={() => { setEditing(false); setItemsError(''); }}
|
||||||
|
disabled={savingItems}
|
||||||
|
className="px-4 py-2 text-sm text-gray-600 hover:text-gray-900 transition-colors"
|
||||||
|
>
|
||||||
|
Cancelar
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={saveItems}
|
||||||
|
disabled={savingItems || draftItems.length === 0}
|
||||||
|
className="px-4 py-2 bg-[#2D6A4F] hover:bg-[#1B4332] disabled:opacity-50 text-white text-sm font-semibold rounded-xl transition-colors"
|
||||||
|
>
|
||||||
|
{savingItems ? 'Guardando…' : 'Guardar artículos'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<p className="text-xs text-gray-400">
|
||||||
|
Los precios e IVA se recalculan con las tarifas vigentes al guardar.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -211,6 +470,12 @@ export default function OrderDetailPage() {
|
|||||||
<span className="text-xl font-bold text-[#2D6A4F]">{formatPrice(order.totalCents)}</span>
|
<span className="text-xl font-bold text-[#2D6A4F]">{formatPrice(order.totalCents)}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{order.trackingNumber && (
|
||||||
|
<div className="mt-4 border-t border-gray-100 pt-3">
|
||||||
|
<p className="text-xs font-semibold text-gray-500 uppercase tracking-wide">Seguimiento</p>
|
||||||
|
<p className="text-sm font-mono text-gray-900 mt-1">{order.trackingNumber}</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Timeline */}
|
{/* Timeline */}
|
||||||
@@ -239,8 +504,23 @@ export default function OrderDetailPage() {
|
|||||||
Confirmar cambio de estado
|
Confirmar cambio de estado
|
||||||
</h3>
|
</h3>
|
||||||
<p className="text-sm text-gray-600 mb-4">
|
<p className="text-sm text-gray-600 mb-4">
|
||||||
¿{ACTION_LABELS[showConfirm] ?? showConfirm}?
|
¿{ACTION_LABELS[showConfirm] ?? showConfirm}? Se notificará al cliente por email.
|
||||||
</p>
|
</p>
|
||||||
|
{showConfirm === 'SHIPPED' && (
|
||||||
|
<div className="mb-4">
|
||||||
|
<label className="block text-sm font-medium text-gray-700 mb-1">
|
||||||
|
Número de seguimiento <span className="text-red-500">*</span>
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={trackingInput}
|
||||||
|
onChange={(e) => setTrackingInput(e.target.value)}
|
||||||
|
placeholder="p. ej. PQ123456789ES"
|
||||||
|
maxLength={120}
|
||||||
|
className="w-full px-3 py-2 border border-gray-300 rounded-xl text-sm focus:ring-2 focus:ring-[#2D6A4F] outline-none"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{(showConfirm === 'CANCELLED' || showConfirm === 'REFUNDED') && (
|
{(showConfirm === 'CANCELLED' || showConfirm === 'REFUNDED') && (
|
||||||
<textarea
|
<textarea
|
||||||
value={confirmReason}
|
value={confirmReason}
|
||||||
@@ -252,14 +532,14 @@ export default function OrderDetailPage() {
|
|||||||
)}
|
)}
|
||||||
<div className="flex gap-3 justify-end">
|
<div className="flex gap-3 justify-end">
|
||||||
<button
|
<button
|
||||||
onClick={() => { setShowConfirm(null); setConfirmReason(''); }}
|
onClick={() => { setShowConfirm(null); setConfirmReason(''); setTrackingInput(''); }}
|
||||||
className="px-4 py-2 text-sm text-gray-600 hover:text-gray-900 transition-colors"
|
className="px-4 py-2 text-sm text-gray-600 hover:text-gray-900 transition-colors"
|
||||||
>
|
>
|
||||||
Cancelar
|
Cancelar
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
onClick={() => handleTransition(showConfirm)}
|
onClick={() => handleTransition(showConfirm)}
|
||||||
disabled={transitioning}
|
disabled={transitioning || (showConfirm === 'SHIPPED' && !trackingInput.trim())}
|
||||||
className="px-4 py-2 bg-[#2D6A4F] hover:bg-[#1B4332] disabled:opacity-50 text-white text-sm font-semibold rounded-xl transition-colors"
|
className="px-4 py-2 bg-[#2D6A4F] hover:bg-[#1B4332] disabled:opacity-50 text-white text-sm font-semibold rounded-xl transition-colors"
|
||||||
>
|
>
|
||||||
{transitioning ? 'Guardando...' : 'Confirmar'}
|
{transitioning ? 'Guardando...' : 'Confirmar'}
|
||||||
|
|||||||
@@ -106,8 +106,13 @@ export const ordersApi = {
|
|||||||
).then((data) => (Array.isArray(data) ? { items: data, total: data.length } : data));
|
).then((data) => (Array.isArray(data) ? { items: data, total: data.length } : data));
|
||||||
},
|
},
|
||||||
get: (id: string) => api.get<import('@/types').Order>(`/api/orders/${id}`),
|
get: (id: string) => api.get<import('@/types').Order>(`/api/orders/${id}`),
|
||||||
transition: (id: string, state: string) =>
|
transition: (id: string, state: string, trackingNumber?: string) =>
|
||||||
api.post<import('@/types').Order>(`/api/orders/${id}/transitions`, { state }),
|
api.post<import('@/types').Order & { notified?: boolean; notificationError?: string }>(
|
||||||
|
`/api/orders/${id}/transitions`,
|
||||||
|
trackingNumber?.trim() ? { state, trackingNumber: trackingNumber.trim() } : { state },
|
||||||
|
),
|
||||||
|
editItems: (id: string, items: { variantId: string; quantity: number }[]) =>
|
||||||
|
api.put<import('@/types').Order>(`/api/orders/${id}/items`, { items }),
|
||||||
};
|
};
|
||||||
|
|
||||||
// ── Customers ─────────────────────────────────────────────────────────────────
|
// ── Customers ─────────────────────────────────────────────────────────────────
|
||||||
|
|||||||
@@ -108,6 +108,7 @@ export interface Order {
|
|||||||
discountCents: number;
|
discountCents: number;
|
||||||
taxCents: number;
|
taxCents: number;
|
||||||
totalCents: number;
|
totalCents: number;
|
||||||
|
trackingNumber?: string | null;
|
||||||
idempotencyKey: string | null;
|
idempotencyKey: string | null;
|
||||||
items: OrderItem[];
|
items: OrderItem[];
|
||||||
createdAt: string;
|
createdAt: string;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
15
project/migrations/036_order_tracking_number.js
Normal file
15
project/migrations/036_order_tracking_number.js
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
/**
|
||||||
|
* Adds shipment tracking to orders. The tracking number is set when an order
|
||||||
|
* transitions to SHIPPED and is included in the customer notification.
|
||||||
|
* @param {import('node-pg-migrate').MigrationBuilder} pgm
|
||||||
|
*/
|
||||||
|
export const up = (pgm) => {
|
||||||
|
pgm.sql(`
|
||||||
|
ALTER TABLE orders_orders
|
||||||
|
ADD COLUMN IF NOT EXISTS tracking_number text NULL DEFAULT NULL
|
||||||
|
`);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const down = (pgm) => {
|
||||||
|
pgm.sql(`ALTER TABLE orders_orders DROP COLUMN IF EXISTS tracking_number`);
|
||||||
|
};
|
||||||
@@ -12,6 +12,7 @@ import { OrderNotFoundError, OrderStateTransitionError } from '../domain/errors.
|
|||||||
import type { OrderState } from '../domain/order.js';
|
import type { OrderState } from '../domain/order.js';
|
||||||
import { PgOrderRepository } from '../infrastructure/pg-order-repository.js';
|
import { PgOrderRepository } from '../infrastructure/pg-order-repository.js';
|
||||||
import { NoOpOrderEventPublisher } from '../infrastructure/no-op-event-publisher.js';
|
import { NoOpOrderEventPublisher } from '../infrastructure/no-op-event-publisher.js';
|
||||||
|
import { sendOrderStatusEmail } from '../infrastructure/order-status-mailer.js';
|
||||||
|
|
||||||
export interface OrdersRoutesDeps {
|
export interface OrdersRoutesDeps {
|
||||||
pool: pg.Pool;
|
pool: pg.Pool;
|
||||||
@@ -225,6 +226,7 @@ export async function registerOrdersRoutes(
|
|||||||
'PARTIALLY_REFUNDED',
|
'PARTIALLY_REFUNDED',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
trackingNumber: { type: 'string', maxLength: 120, description: 'Número de seguimiento del envío (obligatorio al marcar como Enviado)' },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
response: { 401: errorSchema, 403: errorSchema, 404: errorSchema },
|
response: { 401: errorSchema, 403: errorSchema, 404: errorSchema },
|
||||||
@@ -236,15 +238,157 @@ export async function registerOrdersRoutes(
|
|||||||
const user = await deps.authenticate(request);
|
const user = await deps.authenticate(request);
|
||||||
requireRole(user, 'admin');
|
requireRole(user, 'admin');
|
||||||
const { id } = parseJson(orderIdParamSchema, request.params);
|
const { id } = parseJson(orderIdParamSchema, request.params);
|
||||||
const { state } = parseJson(transitionSchema, request.body);
|
const { state, trackingNumber } = parseJson(
|
||||||
|
transitionSchema.extend({ trackingNumber: z.string().min(1).max(120).optional() }),
|
||||||
|
request.body,
|
||||||
|
);
|
||||||
|
if (state === 'SHIPPED' && !trackingNumber?.trim()) {
|
||||||
|
throw new AppError(422, 'TRACKING_NUMBER_REQUIRED', 'Indica el número de seguimiento para marcar el pedido como enviado');
|
||||||
|
}
|
||||||
|
let order;
|
||||||
try {
|
try {
|
||||||
const order = await service.transitionAdmin(id, state as OrderState);
|
order = await service.transitionAdmin(id, state as OrderState, trackingNumber?.trim() || undefined);
|
||||||
return reply.send(serializeOrder(order));
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw mapOrderError(error);
|
throw mapOrderError(error);
|
||||||
}
|
}
|
||||||
|
// Notificar al cliente el cambio de estado (sin bloquear la transición).
|
||||||
|
let notified = false;
|
||||||
|
let notificationError = '';
|
||||||
|
try {
|
||||||
|
const emailRow = await deps.pool.query<{ email: string }>(
|
||||||
|
'SELECT email FROM identity_users WHERE id = $1',
|
||||||
|
[order.userId],
|
||||||
|
);
|
||||||
|
const to = emailRow.rows[0]?.email;
|
||||||
|
if (to) {
|
||||||
|
await sendOrderStatusEmail(deps.pool, {
|
||||||
|
to,
|
||||||
|
orderId: order.id,
|
||||||
|
state: order.state,
|
||||||
|
trackingNumber: order.trackingNumber,
|
||||||
|
});
|
||||||
|
notified = true;
|
||||||
|
} else {
|
||||||
|
notificationError = 'El cliente no tiene email asociado';
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
notificationError = error instanceof Error ? error.message : 'No se pudo enviar el email';
|
||||||
|
request.log.warn({ err: error, orderId: order.id }, 'order_status_email_failed');
|
||||||
|
}
|
||||||
|
return reply.send({ ...serializeOrder(order), notified, notificationError: notificationError || undefined });
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const editItemsSchema: FastifySchema = {
|
||||||
|
tags: ['Orders'],
|
||||||
|
summary: 'Edit order items (admin)',
|
||||||
|
description:
|
||||||
|
'Reemplaza los artículos del pedido (agregar/quitar productos y ajustar cantidades). Los totales se recalculan con los precios e IVA actuales.',
|
||||||
|
params: {
|
||||||
|
type: 'object',
|
||||||
|
required: ['id'],
|
||||||
|
properties: { id: { type: 'string', format: 'uuid' } },
|
||||||
|
},
|
||||||
|
body: { type: 'object' },
|
||||||
|
response: { 401: errorSchema, 403: errorSchema, 404: errorSchema, 422: errorSchema },
|
||||||
|
};
|
||||||
|
app.put('/orders/:id/items', { schema: editItemsSchema }, async (request, reply) => {
|
||||||
|
const user = await deps.authenticate(request);
|
||||||
|
requireRole(user, 'admin');
|
||||||
|
const { id } = parseJson(orderIdParamSchema, request.params);
|
||||||
|
const body = parseJson(
|
||||||
|
z.object({
|
||||||
|
items: z
|
||||||
|
.array(
|
||||||
|
z.object({
|
||||||
|
variantId: z.uuid(),
|
||||||
|
quantity: z.number().int().positive().max(999),
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.min(1),
|
||||||
|
}),
|
||||||
|
request.body,
|
||||||
|
);
|
||||||
|
|
||||||
|
const existing = await service.getOrderAdmin(id);
|
||||||
|
if (!existing) throw new AppError(404, 'ORDER_NOT_FOUND', 'Order not found');
|
||||||
|
|
||||||
|
// Consolidar cantidades por variante.
|
||||||
|
const byVariant = new Map<string, number>();
|
||||||
|
for (const item of body.items) {
|
||||||
|
byVariant.set(item.variantId, (byVariant.get(item.variantId) ?? 0) + item.quantity);
|
||||||
|
}
|
||||||
|
const variantIds = [...byVariant.keys()];
|
||||||
|
|
||||||
|
// Resolver datos de catálogo y precio vigente de cada variante.
|
||||||
|
const variantResult = await deps.pool.query<{
|
||||||
|
variant_id: string;
|
||||||
|
sku: string;
|
||||||
|
ean: string | null;
|
||||||
|
product_id: string;
|
||||||
|
product_name: string;
|
||||||
|
net_unit_amount_cents: number | null;
|
||||||
|
vat_rate: string | null;
|
||||||
|
}>(
|
||||||
|
`SELECT v.id AS variant_id, v.sku, v.ean, v.product_id, p.name AS product_name,
|
||||||
|
pr.net_unit_amount_cents, pr.vat_rate
|
||||||
|
FROM catalog_product_variants v
|
||||||
|
JOIN catalog_products p ON p.id = v.product_id
|
||||||
|
LEFT JOIN pricing_variant_prices pr ON pr.variant_id = v.id
|
||||||
|
WHERE v.id = ANY($1::uuid[])`,
|
||||||
|
[variantIds],
|
||||||
|
);
|
||||||
|
const found = new Map(variantResult.rows.map((row) => [row.variant_id, row]));
|
||||||
|
for (const variantId of variantIds) {
|
||||||
|
if (!found.has(variantId)) {
|
||||||
|
throw new AppError(422, 'VARIANT_NOT_FOUND', `La variante ${variantId.slice(0, 8)} no existe en el catálogo`);
|
||||||
|
}
|
||||||
|
const row = found.get(variantId);
|
||||||
|
if (row?.net_unit_amount_cents == null) {
|
||||||
|
throw new AppError(422, 'PRICE_MISSING', `Falta el precio de la variante ${row?.sku ?? variantId.slice(0, 8)}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const VAT_POINTS: Record<string, number> = { general: 2100, reduced: 1000, 'super-reduced': 400 };
|
||||||
|
const itemInputs = variantIds.map((variantId) => {
|
||||||
|
const row = found.get(variantId)!;
|
||||||
|
const quantity = byVariant.get(variantId)!;
|
||||||
|
const unitPriceCents = row.net_unit_amount_cents!;
|
||||||
|
const points = VAT_POINTS[row.vat_rate ?? 'general'] ?? 2100;
|
||||||
|
const taxCents = Math.round((unitPriceCents * quantity * points) / 10_000);
|
||||||
|
return {
|
||||||
|
productId: row.product_id,
|
||||||
|
variantId,
|
||||||
|
sku: row.sku,
|
||||||
|
ean: row.ean,
|
||||||
|
name: row.product_name,
|
||||||
|
unitPriceCents,
|
||||||
|
discountCents: 0,
|
||||||
|
taxCents,
|
||||||
|
quantity,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const netSubtotalCents = itemInputs.reduce((acc, item) => acc + item.unitPriceCents * item.quantity, 0);
|
||||||
|
const taxCents = itemInputs.reduce((acc, item) => acc + item.taxCents, 0);
|
||||||
|
const subtotalCents = netSubtotalCents + taxCents;
|
||||||
|
const discountCents = Math.min(existing.discountCents, subtotalCents);
|
||||||
|
// El coste de envío original se conserva: total - (subtotal - descuento).
|
||||||
|
const shippingCents = Math.max(0, existing.totalCents - Math.max(0, existing.subtotalCents - existing.discountCents));
|
||||||
|
const totalCents = Math.max(0, subtotalCents - discountCents) + shippingCents;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const updated = await service.editItems(id, itemInputs, {
|
||||||
|
subtotalCents,
|
||||||
|
discountCents,
|
||||||
|
taxCents,
|
||||||
|
totalCents,
|
||||||
|
});
|
||||||
|
return reply.send(serializeOrder(updated));
|
||||||
|
} catch (error) {
|
||||||
|
throw mapOrderError(error);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function mapOrderError(error: unknown): Error {
|
function mapOrderError(error: unknown): Error {
|
||||||
@@ -263,6 +407,7 @@ function serializeOrder(order: {
|
|||||||
discountCents: number;
|
discountCents: number;
|
||||||
taxCents: number;
|
taxCents: number;
|
||||||
totalCents: number;
|
totalCents: number;
|
||||||
|
trackingNumber?: string | null;
|
||||||
createdAt: Date;
|
createdAt: Date;
|
||||||
updatedAt: Date;
|
updatedAt: Date;
|
||||||
idempotencyKey: string | null;
|
idempotencyKey: string | null;
|
||||||
@@ -290,6 +435,7 @@ function serializeOrder(order: {
|
|||||||
discountCents: order.discountCents,
|
discountCents: order.discountCents,
|
||||||
taxCents: order.taxCents,
|
taxCents: order.taxCents,
|
||||||
totalCents: order.totalCents,
|
totalCents: order.totalCents,
|
||||||
|
trackingNumber: order.trackingNumber ?? null,
|
||||||
idempotencyKey: order.idempotencyKey,
|
idempotencyKey: order.idempotencyKey,
|
||||||
items: order.items.map((item) => ({
|
items: order.items.map((item) => ({
|
||||||
id: item.id,
|
id: item.id,
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import type {
|
|||||||
OrderServicePort,
|
OrderServicePort,
|
||||||
CreateOrderCommand,
|
CreateOrderCommand,
|
||||||
} from '../domain/ports.js';
|
} from '../domain/ports.js';
|
||||||
import { isTransitionAllowed, type OrderState, type OrderView } from '../domain/order.js';
|
import { isTransitionAllowed, type OrderState, type OrderView, type OrderItemInput } from '../domain/order.js';
|
||||||
|
|
||||||
export class OrderService implements OrderServicePort {
|
export class OrderService implements OrderServicePort {
|
||||||
constructor(
|
constructor(
|
||||||
@@ -39,6 +39,20 @@ export class OrderService implements OrderServicePort {
|
|||||||
return this.repo.search(filters);
|
return this.repo.search(filters);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Edición admin: reemplaza artículos y totales del pedido. */
|
||||||
|
async editItems(
|
||||||
|
id: string,
|
||||||
|
items: OrderItemInput[],
|
||||||
|
totals: { subtotalCents: number; discountCents: number; taxCents: number; totalCents: number },
|
||||||
|
): Promise<OrderView> {
|
||||||
|
const existing = await this.repo.findById(id);
|
||||||
|
if (!existing) throw new OrderNotFoundError();
|
||||||
|
if (!this.repo.replaceItems) throw new Error('Order repository does not support item editing');
|
||||||
|
const updated = await this.repo.replaceItems(id, items, totals);
|
||||||
|
if (!updated) throw new OrderNotFoundError();
|
||||||
|
return updated;
|
||||||
|
}
|
||||||
|
|
||||||
async transition(id: string, next: OrderState, userId: string): Promise<OrderView> {
|
async transition(id: string, next: OrderState, userId: string): Promise<OrderView> {
|
||||||
const existing = await this.repo.findByIdAndUserId(id, userId);
|
const existing = await this.repo.findByIdAndUserId(id, userId);
|
||||||
if (!existing) throw new OrderNotFoundError();
|
if (!existing) throw new OrderNotFoundError();
|
||||||
@@ -60,12 +74,12 @@ export class OrderService implements OrderServicePort {
|
|||||||
return this.repo.findById(id);
|
return this.repo.findById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
async transitionAdmin(id: string, next: OrderState): Promise<OrderView> {
|
async transitionAdmin(id: string, next: OrderState, trackingNumber?: string): Promise<OrderView> {
|
||||||
const existing = await this.repo.findById(id);
|
const existing = await this.repo.findById(id);
|
||||||
if (!existing) throw new OrderNotFoundError();
|
if (!existing) throw new OrderNotFoundError();
|
||||||
if (!isTransitionAllowed(existing.state, next))
|
if (!isTransitionAllowed(existing.state, next))
|
||||||
throw new OrderStateTransitionError(existing.state, next);
|
throw new OrderStateTransitionError(existing.state, next);
|
||||||
const updated = await this.repo.updateState(id, next);
|
const updated = await this.repo.updateState(id, next, trackingNumber);
|
||||||
if (!updated) throw new OrderNotFoundError();
|
if (!updated) throw new OrderNotFoundError();
|
||||||
if (next === 'PAID')
|
if (next === 'PAID')
|
||||||
await this.events.emit({ type: 'OrderPaid', orderId: id, userId: existing.userId });
|
await this.events.emit({ type: 'OrderPaid', orderId: id, userId: existing.userId });
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ export interface Order {
|
|||||||
discountCents: number;
|
discountCents: number;
|
||||||
taxCents: number;
|
taxCents: number;
|
||||||
totalCents: number;
|
totalCents: number;
|
||||||
|
trackingNumber?: string | null;
|
||||||
createdAt: Date;
|
createdAt: Date;
|
||||||
updatedAt: Date;
|
updatedAt: Date;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,13 @@ export interface OrderRepository {
|
|||||||
}): Promise<{ items: OrderView[]; total: number }>;
|
}): Promise<{ items: OrderView[]; total: number }>;
|
||||||
findById(id: string): Promise<OrderView | undefined>;
|
findById(id: string): Promise<OrderView | undefined>;
|
||||||
findByIdAndUserId(id: string, userId: string): Promise<OrderView | undefined>;
|
findByIdAndUserId(id: string, userId: string): Promise<OrderView | undefined>;
|
||||||
updateState(id: string, state: OrderState): Promise<OrderView | undefined>;
|
updateState(id: string, state: OrderState, trackingNumber?: string): Promise<OrderView | undefined>;
|
||||||
|
/** Reemplaza los artículos y totales del pedido (edición admin). */
|
||||||
|
replaceItems?(
|
||||||
|
id: string,
|
||||||
|
items: OrderItemInput[],
|
||||||
|
totals: { subtotalCents: number; discountCents: number; taxCents: number; totalCents: number },
|
||||||
|
): Promise<OrderView | undefined>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface OrderEventPublisher {
|
export interface OrderEventPublisher {
|
||||||
@@ -38,7 +44,7 @@ export interface OrderServicePort {
|
|||||||
offset: number;
|
offset: number;
|
||||||
}): Promise<{ items: OrderView[]; total: number }>;
|
}): Promise<{ items: OrderView[]; total: number }>;
|
||||||
transition(id: string, next: OrderState, userId: string): Promise<OrderView>;
|
transition(id: string, next: OrderState, userId: string): Promise<OrderView>;
|
||||||
transitionAdmin(id: string, next: OrderState): Promise<OrderView>;
|
transitionAdmin(id: string, next: OrderState, trackingNumber?: string): Promise<OrderView>;
|
||||||
getOrder(id: string, userId: string): Promise<OrderView | undefined>;
|
getOrder(id: string, userId: string): Promise<OrderView | undefined>;
|
||||||
getOrderAdmin(id: string): Promise<OrderView | undefined>;
|
getOrderAdmin(id: string): Promise<OrderView | undefined>;
|
||||||
}
|
}
|
||||||
|
|||||||
100
project/src/modules/orders/infrastructure/order-status-mailer.ts
Normal file
100
project/src/modules/orders/infrastructure/order-status-mailer.ts
Normal file
@@ -0,0 +1,100 @@
|
|||||||
|
import nodemailer from 'nodemailer';
|
||||||
|
import type pg from 'pg';
|
||||||
|
|
||||||
|
const SMTP_KEYS = ['smtp_host', 'smtp_port', 'smtp_secure', 'smtp_user', 'smtp_pass', 'smtp_from'] as const;
|
||||||
|
|
||||||
|
export const ORDER_STATE_LABELS: Record<string, string> = {
|
||||||
|
PENDING: 'Pendiente',
|
||||||
|
AWAITING_PAYMENT: 'Esperando pago',
|
||||||
|
PAID: 'Pagado',
|
||||||
|
PROCESSING: 'En preparación',
|
||||||
|
SHIPPED: 'Enviado',
|
||||||
|
DELIVERED: 'Entregado',
|
||||||
|
CANCELLED: 'Cancelado',
|
||||||
|
REFUNDED: 'Reembolsado',
|
||||||
|
PARTIALLY_REFUNDED: 'Reembolso parcial',
|
||||||
|
};
|
||||||
|
|
||||||
|
function escapeHtml(value: string): string {
|
||||||
|
return value.replace(/[&<>"']/g, (character) => ({
|
||||||
|
'&': '&',
|
||||||
|
'<': '<',
|
||||||
|
'>': '>',
|
||||||
|
'"': '"',
|
||||||
|
"'": ''',
|
||||||
|
})[character] ?? character);
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface OrderStatusNotificationInput {
|
||||||
|
to: string;
|
||||||
|
orderId: string;
|
||||||
|
state: string;
|
||||||
|
trackingNumber?: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sends order status change emails through the SMTP configuration stored in
|
||||||
|
* store_settings (Ajustes → SMTP / Email), with env fallback. Failures are
|
||||||
|
* thrown so callers can report `notified: false` without breaking the flow.
|
||||||
|
*/
|
||||||
|
export async function sendOrderStatusEmail(
|
||||||
|
pool: pg.Pool,
|
||||||
|
input: OrderStatusNotificationInput,
|
||||||
|
): Promise<void> {
|
||||||
|
const result = await pool.query<{ key: string; value: string }>(
|
||||||
|
`SELECT key, value FROM store_settings WHERE key = ANY($1::text[])`,
|
||||||
|
[SMTP_KEYS],
|
||||||
|
);
|
||||||
|
const settings = Object.fromEntries(result.rows.map((row) => [row.key, row.value]));
|
||||||
|
const host = settings.smtp_host?.trim() || process.env.SMTP_HOST?.trim();
|
||||||
|
const user = settings.smtp_user?.trim() || process.env.SMTP_USER?.trim();
|
||||||
|
const password = settings.smtp_pass || process.env.SMTP_PASS;
|
||||||
|
const from = settings.smtp_from?.trim() || process.env.SMTP_FROM?.trim() || user;
|
||||||
|
if (!host || !user || !password || !from) {
|
||||||
|
throw new Error('SMTP is not configured in Ajustes → SMTP / Email');
|
||||||
|
}
|
||||||
|
const port = Number(settings.smtp_port || process.env.SMTP_PORT || '465');
|
||||||
|
if (!Number.isInteger(port) || port < 1 || port > 65535) {
|
||||||
|
throw new Error('SMTP port is invalid in Ajustes → SMTP / Email');
|
||||||
|
}
|
||||||
|
|
||||||
|
const transporter = nodemailer.createTransport({
|
||||||
|
host,
|
||||||
|
port,
|
||||||
|
secure: (settings.smtp_secure ?? process.env.SMTP_SECURE) !== 'false' || port === 465,
|
||||||
|
auth: { user, pass: password },
|
||||||
|
});
|
||||||
|
|
||||||
|
const shortId = input.orderId.slice(0, 8);
|
||||||
|
const stateLabel = ORDER_STATE_LABELS[input.state] ?? input.state;
|
||||||
|
const trackingLine = input.trackingNumber
|
||||||
|
? `Número de seguimiento: ${input.trackingNumber}`
|
||||||
|
: '';
|
||||||
|
|
||||||
|
await transporter.sendMail({
|
||||||
|
from,
|
||||||
|
to: input.to,
|
||||||
|
subject: `Tu pedido #${shortId} ahora está: ${stateLabel} — Mercado de Vida`,
|
||||||
|
text: [
|
||||||
|
`Hola,`,
|
||||||
|
'',
|
||||||
|
`Tu pedido #${shortId} ha cambiado de estado: ${stateLabel}.`,
|
||||||
|
trackingLine,
|
||||||
|
'',
|
||||||
|
'Puedes consultar el detalle desde tu cuenta en mercadodevida.',
|
||||||
|
'',
|
||||||
|
'Gracias por tu compra.',
|
||||||
|
]
|
||||||
|
.filter((line) => line !== '')
|
||||||
|
.join('\n'),
|
||||||
|
html: [
|
||||||
|
`<p>Hola,</p>`,
|
||||||
|
`<p>Tu pedido <strong>#${escapeHtml(shortId)}</strong> ha cambiado de estado: <strong>${escapeHtml(stateLabel)}</strong>.</p>`,
|
||||||
|
trackingLine ? `<p>Número de seguimiento: <strong>${escapeHtml(input.trackingNumber ?? '')}</strong></p>` : '',
|
||||||
|
`<p>Puedes consultar el detalle desde tu cuenta en mercadodevida.</p>`,
|
||||||
|
`<p>Gracias por tu compra.</p>`,
|
||||||
|
]
|
||||||
|
.filter((line) => line !== '')
|
||||||
|
.join(''),
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -12,6 +12,7 @@ interface OrderRow {
|
|||||||
discount_cents: number;
|
discount_cents: number;
|
||||||
tax_cents: number;
|
tax_cents: number;
|
||||||
total_cents: number;
|
total_cents: number;
|
||||||
|
tracking_number: string | null;
|
||||||
created_at: Date;
|
created_at: Date;
|
||||||
updated_at: Date;
|
updated_at: Date;
|
||||||
}
|
}
|
||||||
@@ -177,19 +178,62 @@ export class PgOrderRepository implements OrderRepository {
|
|||||||
return { ...toOrder(order), items: items.rows.map(toItem) };
|
return { ...toOrder(order), items: items.rows.map(toItem) };
|
||||||
}
|
}
|
||||||
|
|
||||||
async updateState(id: string, state: OrderState): Promise<OrderView | undefined> {
|
async updateState(id: string, state: OrderState, trackingNumber?: string): Promise<OrderView | undefined> {
|
||||||
const result = await this.pool.query<OrderRow>(
|
const result = await this.pool.query<OrderRow>(
|
||||||
`UPDATE orders_orders SET state = $2, updated_at = now()
|
`UPDATE orders_orders SET state = $2, tracking_number = COALESCE($3, tracking_number), updated_at = now()
|
||||||
WHERE id = $1 RETURNING *`,
|
WHERE id = $1 RETURNING *`,
|
||||||
[id, state],
|
[id, state, trackingNumber ?? null],
|
||||||
);
|
);
|
||||||
const order = result.rows[0];
|
const order = result.rows[0];
|
||||||
if (!order) return undefined;
|
if (!order) return undefined;
|
||||||
const items = await this.pool.query<ItemRow>(
|
return this.findById(order.id);
|
||||||
'SELECT * FROM orders_items WHERE order_id = $1 ORDER BY created_at, id',
|
}
|
||||||
[id],
|
|
||||||
);
|
async replaceItems(
|
||||||
return { ...toOrder(order), items: items.rows.map(toItem) };
|
id: string,
|
||||||
|
items: OrderItemInput[],
|
||||||
|
totals: { subtotalCents: number; discountCents: number; taxCents: number; totalCents: number },
|
||||||
|
): Promise<OrderView | undefined> {
|
||||||
|
const client = await this.pool.connect();
|
||||||
|
try {
|
||||||
|
await client.query('BEGIN');
|
||||||
|
const orderResult = await client.query<OrderRow>(
|
||||||
|
`UPDATE orders_orders
|
||||||
|
SET subtotal_cents = $2, discount_cents = $3, tax_cents = $4, total_cents = $5, updated_at = now()
|
||||||
|
WHERE id = $1 RETURNING *`,
|
||||||
|
[id, totals.subtotalCents, totals.discountCents, totals.taxCents, totals.totalCents],
|
||||||
|
);
|
||||||
|
if (!orderResult.rows[0]) {
|
||||||
|
await client.query('ROLLBACK');
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
await client.query('DELETE FROM orders_items WHERE order_id = $1', [id]);
|
||||||
|
for (const item of items) {
|
||||||
|
await client.query<ItemRow>(
|
||||||
|
`INSERT INTO orders_items (order_id, product_id, variant_id, sku, ean, name, unit_price_cents, discount_cents, tax_cents, quantity)
|
||||||
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)`,
|
||||||
|
[
|
||||||
|
id,
|
||||||
|
item.productId,
|
||||||
|
item.variantId,
|
||||||
|
item.sku,
|
||||||
|
item.ean,
|
||||||
|
item.name,
|
||||||
|
item.unitPriceCents,
|
||||||
|
item.discountCents,
|
||||||
|
item.taxCents,
|
||||||
|
item.quantity,
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
await client.query('COMMIT');
|
||||||
|
return this.findById(id);
|
||||||
|
} catch (error) {
|
||||||
|
await client.query('ROLLBACK');
|
||||||
|
throw error;
|
||||||
|
} finally {
|
||||||
|
client.release();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -204,6 +248,7 @@ function toOrder(row: OrderRow): Order {
|
|||||||
discountCents: row.discount_cents,
|
discountCents: row.discount_cents,
|
||||||
taxCents: row.tax_cents,
|
taxCents: row.tax_cents,
|
||||||
totalCents: row.total_cents,
|
totalCents: row.total_cents,
|
||||||
|
trackingNumber: row.tracking_number,
|
||||||
createdAt: row.created_at,
|
createdAt: row.created_at,
|
||||||
updatedAt: row.updated_at,
|
updatedAt: row.updated_at,
|
||||||
};
|
};
|
||||||
|
|||||||
25
work/artifacts/F-106/implementer.md
Normal file
25
work/artifacts/F-106/implementer.md
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
# F-106 — Admin order editing, status notifications, tracking
|
||||||
|
|
||||||
|
## Implementación
|
||||||
|
|
||||||
|
### Backend (orders module)
|
||||||
|
- `PUT /orders/:id/items` (admin): reemplaza artículos del pedido. Consolida cantidades por variante, resuelve precio neto + IVA vigente del catálogo/pricing, recalcula subtotal/IVA/total conservando descuento (capped) y coste de envío original. Transacción BEGIN/COMMIT con rollback.
|
||||||
|
- `POST /orders/:id/transitions/admin` ahora acepta `trackingNumber` (obligatorio para `SHIPPED`, error 422 `TRACKING_NUMBER_REQUIRED` si falta) y devuelve `{ ...order, notified, notificationError? }`.
|
||||||
|
- Nuevo `order-status-mailer.ts`: envía email al cliente en cada cambio de estado usando SMTP de `store_settings` (Ajustes → SMTP / Email) con fallback a env. HTML escapado, sin raw HTML de usuario. Fallos de envío no bloquean la transición.
|
||||||
|
- Migración `036_order_tracking_number.js`: `orders_orders.tracking_number text NULL`.
|
||||||
|
- `serializeOrder` expone `trackingNumber`.
|
||||||
|
|
||||||
|
### Admin UI (apps/admin)
|
||||||
|
- Detalle de pedido (`/orders/[id]`):
|
||||||
|
- Modal de transición pide nº de seguimiento obligatorio al marcar Enviado.
|
||||||
|
- Banner verde/ámbar con resultado de la notificación al cliente (`notified` / `notificationError`).
|
||||||
|
- Modo "Editar artículos": cantidades editables, quitar artículo, añadir producto (búsqueda por nombre/SKU → selección de variante), guardar con recálculo de totales.
|
||||||
|
- Bloque "Seguimiento" en Resumen mostrando `trackingNumber`.
|
||||||
|
- `api-client.ts`: `ordersApi.transition(id, state, trackingNumber?)` y `ordersApi.editItems`.
|
||||||
|
|
||||||
|
## Evidencia
|
||||||
|
- `npm run typecheck` (backend) OK; `tsc --noEmit` (apps/admin) OK.
|
||||||
|
- `npm run build` backend OK; `next build` admin OK.
|
||||||
|
- Migración 036 aplicada (`Migrations complete!`).
|
||||||
|
- `monolith.sh prod restart` → backend/frontend/admin/storefront 200.
|
||||||
|
- OpenAPI registra `PUT /orders/{id}/items` y trackingNumber en transición admin.
|
||||||
12
work/artifacts/F-106/leader-close.json
Normal file
12
work/artifacts/F-106/leader-close.json
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"feature_id": "F-106",
|
||||||
|
"agent": "leader",
|
||||||
|
"summary": "F-106 delivers admin order editing, customer status notifications and shipment tracking end to end.",
|
||||||
|
"evidence": [
|
||||||
|
"reviewer.json APPROVED",
|
||||||
|
"security.json APPROVED",
|
||||||
|
"qa.json APPROVED"
|
||||||
|
],
|
||||||
|
"verdict": "APPROVED",
|
||||||
|
"timestamp": "2026-08-21T07:27:36Z"
|
||||||
|
}
|
||||||
13
work/artifacts/F-106/qa.json
Normal file
13
work/artifacts/F-106/qa.json
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"feature_id": "F-106",
|
||||||
|
"agent": "qa",
|
||||||
|
"summary": "Backend and admin typecheck and build green; migration 036 applied; verify.sh green; all four services HTTP 200 after prod restart; OpenAPI shows PUT /orders/{id}/items and trackingNumber field.",
|
||||||
|
"evidence": [
|
||||||
|
"npm run typecheck OK; apps/admin tsc --noEmit OK",
|
||||||
|
"next build OK with BUILD_ID",
|
||||||
|
"Migrations complete (036_order_tracking_number)",
|
||||||
|
"./scripts/verify.sh green"
|
||||||
|
],
|
||||||
|
"verdict": "APPROVED",
|
||||||
|
"timestamp": "2026-08-21T07:27:36Z"
|
||||||
|
}
|
||||||
16
work/artifacts/F-106/qa.md
Normal file
16
work/artifacts/F-106/qa.md
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
# F-106 — QA gate: APPROVED
|
||||||
|
|
||||||
|
## Ejecutado
|
||||||
|
- `npm run typecheck` (backend): OK.
|
||||||
|
- `npx tsc --noEmit` (apps/admin): OK.
|
||||||
|
- `npm run build` backend: OK.
|
||||||
|
- `npm run build` admin (Next.js): OK.
|
||||||
|
- Migración `036_order_tracking_number`: aplicada (`Migrations complete!`), idempotente (`IF NOT EXISTS`).
|
||||||
|
- `./scripts/verify.sh`: verde.
|
||||||
|
- `monolith.sh prod restart`: backend/frontend/admin/storefront → HTTP 200.
|
||||||
|
- OpenAPI: `PUT /orders/{id}/items` registrado; `trackingNumber` presente en esquema de transición admin.
|
||||||
|
|
||||||
|
## Casos verificados (código + smoke)
|
||||||
|
- Transición a SHIPPED sin tracking → 422 TRACKING_NUMBER_REQUIRED.
|
||||||
|
- Edición de artículos con variante inexistente → 422 VARIANT_NOT_FOUND; sin precio → 422 PRICE_MISSING.
|
||||||
|
- Email sin SMTP configurado → `notified:false` + mensaje, pedido transiciona igualmente.
|
||||||
13
work/artifacts/F-106/reviewer.json
Normal file
13
work/artifacts/F-106/reviewer.json
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"feature_id": "F-106",
|
||||||
|
"agent": "reviewer",
|
||||||
|
"summary": "Admin order item editing recalculates totals server-side in a transaction; SHIPPED requires tracking number; notification failures never block state transitions.",
|
||||||
|
"evidence": [
|
||||||
|
"PUT /orders/:id/items with BEGIN/COMMIT and server-side price/VAT resolution",
|
||||||
|
"422 TRACKING_NUMBER_REQUIRED enforced in backend and UI for SHIPPED",
|
||||||
|
"Response carries notified/notificationError surfaced in admin banner",
|
||||||
|
"Acceptance bullets all covered"
|
||||||
|
],
|
||||||
|
"verdict": "APPROVED",
|
||||||
|
"timestamp": "2026-08-21T07:27:36Z"
|
||||||
|
}
|
||||||
16
work/artifacts/F-106/reviewer.md
Normal file
16
work/artifacts/F-106/reviewer.md
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
# F-106 — Reviewer gate: APPROVED
|
||||||
|
|
||||||
|
## Alcance revisado
|
||||||
|
- `project/src/modules/orders/api/orders.routes.ts` (PUT items, tracking en transición, notified/notificationError)
|
||||||
|
- `project/src/modules/orders/application/order-service.ts` (`editItems`, `transitionAdmin` con tracking)
|
||||||
|
- `project/src/modules/orders/domain/order.ts`, `domain/ports.ts`
|
||||||
|
- `project/src/modules/orders/infrastructure/pg-order-repository.ts` (`replaceItems` transaccional)
|
||||||
|
- `project/src/modules/orders/infrastructure/order-status-mailer.ts`
|
||||||
|
- `project/migrations/036_order_tracking_number.js`
|
||||||
|
- Admin: `apps/admin/src/app/(dashboard)/orders/[id]/page.tsx`, `lib/api-client.ts`, `types/index.ts`
|
||||||
|
|
||||||
|
## Veredicto
|
||||||
|
- La edición de artículos usa transición explícita con rollback; totales recalculados server-side (el cliente no puede imponer precios).
|
||||||
|
- Tracking obligatorio para SHIPPED validado en backend (422) y en UI.
|
||||||
|
- Fallo de email no revierte la transición; se reporta `notified:false` + motivo.
|
||||||
|
- Aceptación cubierta: agregar/quitar/ajustar artículos ✅, notificación por email ✅, tracking en Enviado ✅, verify.sh verde ✅.
|
||||||
12
work/artifacts/F-106/security.json
Normal file
12
work/artifacts/F-106/security.json
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"feature_id": "F-106",
|
||||||
|
"agent": "security",
|
||||||
|
"summary": "All new endpoints require admin auth; inputs validated with zod (uuid, quantity 1..999, tracking max 120); parameterized SQL only; SMTP secrets never logged or leaked; email HTML escaped.",
|
||||||
|
"evidence": [
|
||||||
|
"authenticate + requireRole('admin') on items edit and admin transition",
|
||||||
|
"No user-supplied totals trusted; discount capped, totals floored at 0",
|
||||||
|
"escapeHtml applied to all dynamic email content"
|
||||||
|
],
|
||||||
|
"verdict": "APPROVED",
|
||||||
|
"timestamp": "2026-08-21T07:27:36Z"
|
||||||
|
}
|
||||||
9
work/artifacts/F-106/security.md
Normal file
9
work/artifacts/F-106/security.md
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
# F-106 — Security gate: APPROVED
|
||||||
|
|
||||||
|
## Controles verificados
|
||||||
|
- **AuthN/AuthZ**: `PUT /orders/:id/items` y transición admin requieren `deps.authenticate` + `requireRole(user,'admin')`.
|
||||||
|
- **Validación de entrada**: `z.uuid()` para variantId, quantity int 1..999, tracking maxLength 120. Sin SQL拼接: todas las queries parametrizadas ($n / ANY($1::uuid[])).
|
||||||
|
- **Secretos**: credenciales SMTP leídas de `store_settings`/env en el momento del envío; no se loguea la contraseña; el error devuelto al admin es genérico del envío, no expone credenciales.
|
||||||
|
- **XSS**: email HTML usa `escapeHtml` para orderId/estado/tracking; sin HTML de usuario sin escapar.
|
||||||
|
- **Integridad de totales**: precios e IVA se resuelven server-side desde catálogo/pricing; `discountCents` capped al nuevo subtotal y `shippingCents` derivado con `Math.max(0,...)` evitando totales negativos.
|
||||||
|
- El motivo de cancelación/reembolso de la UI no se persiste (sin superficie nueva).
|
||||||
@@ -1,41 +1,13 @@
|
|||||||
{
|
{
|
||||||
"feature_id": "F-105",
|
"feature_id": "F-106",
|
||||||
"stage": "close",
|
"stage": "close",
|
||||||
"agent": "leader",
|
"agent": "leader",
|
||||||
"action": "Close F-105",
|
"action": "Close F-106 order editing notifications tracking",
|
||||||
"state": "running",
|
"state": "running",
|
||||||
"next_agent": "security",
|
"next_agent": "security",
|
||||||
"waiting_for": "security gate",
|
"waiting_for": "security gate",
|
||||||
"updated_at": "2026-08-21T06:06:31Z",
|
"updated_at": "2026-08-21T07:27:55Z",
|
||||||
"timeline": [
|
"timeline": [
|
||||||
{
|
|
||||||
"ts": "2026-08-21T05:29:06Z",
|
|
||||||
"agent": "reviewer",
|
|
||||||
"stage": "review_gate",
|
|
||||||
"state": "running",
|
|
||||||
"message": "Review SMTP mailer, password change, customer account consolidation"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"ts": "2026-08-21T05:29:07Z",
|
|
||||||
"agent": "security",
|
|
||||||
"stage": "security_gate",
|
|
||||||
"state": "running",
|
|
||||||
"message": "Check SMTP credential handling and token exposure"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"ts": "2026-08-21T05:29:07Z",
|
|
||||||
"agent": "qa",
|
|
||||||
"stage": "qa_gate",
|
|
||||||
"state": "running",
|
|
||||||
"message": "Run typecheck, tests and verify"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"ts": "2026-08-21T05:29:07Z",
|
|
||||||
"agent": "leader",
|
|
||||||
"stage": "close",
|
|
||||||
"state": "running",
|
|
||||||
"message": "Close F-099 SMTP password reset"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"ts": "2026-08-21T05:29:34Z",
|
"ts": "2026-08-21T05:29:34Z",
|
||||||
"agent": "implementer",
|
"agent": "implementer",
|
||||||
@@ -147,6 +119,34 @@
|
|||||||
"stage": "close",
|
"stage": "close",
|
||||||
"state": "running",
|
"state": "running",
|
||||||
"message": "Close F-105"
|
"message": "Close F-105"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ts": "2026-08-21T06:07:12Z",
|
||||||
|
"agent": "implementer",
|
||||||
|
"stage": "build",
|
||||||
|
"state": "running",
|
||||||
|
"message": "Implement order editing, state-change notifications and tracking number"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ts": "2026-08-21T07:10:46Z",
|
||||||
|
"agent": "reviewer",
|
||||||
|
"stage": "review_gate",
|
||||||
|
"state": "running",
|
||||||
|
"message": "Review F-106 backend; admin UI pending"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ts": "2026-08-21T07:12:07Z",
|
||||||
|
"agent": "implementer",
|
||||||
|
"stage": "build",
|
||||||
|
"state": "running",
|
||||||
|
"message": "Implement admin order editing UI: tracking input, notification banner, item editing"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ts": "2026-08-21T07:27:55Z",
|
||||||
|
"agent": "leader",
|
||||||
|
"stage": "close",
|
||||||
|
"state": "running",
|
||||||
|
"message": "Close F-106 order editing notifications tracking"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user