Merge remote-tracking branch 'origin/master'

This commit is contained in:
2026-01-26 15:07:50 +09:00
38 changed files with 927 additions and 443 deletions

View File

@@ -71,6 +71,7 @@ import {
type OrderStatus,
} from "@/components/orders";
import { sendSalesOrderNotification } from "@/lib/actions/fcm";
import { OrderSalesDetailEdit } from "@/components/orders/OrderSalesDetailEdit";
/**
* 수량 포맷 함수
@@ -844,6 +845,11 @@ export default function OrderDetailPage() {
);
}, [order, handleEdit, handleConfirmOrder, handleProductionOrder, handleViewProductionOrder, handleRevertProduction, handleRevertConfirmation, handleCancel, handleDelete]);
// V2 패턴: ?mode=edit일 때 수정 컴포넌트 렌더링
if (isEditMode) {
return <OrderSalesDetailEdit orderId={orderId} />;
}
return (
<>
<IntegratedDetailTemplate

View File

@@ -83,6 +83,7 @@ export default function AccountDetailPage() {
isLoading={isLoading}
onSubmit={handleSubmit}
onDelete={handleDelete}
stickyButtons={true}
/>
);
}

View File

@@ -20,6 +20,7 @@ export default function NewAccountPage() {
config={accountConfig}
mode="create"
onSubmit={handleSubmit}
stickyButtons={true}
/>
);
}