diff --git a/app/Http/Requests/Order/StoreOrderRequest.php b/app/Http/Requests/Order/StoreOrderRequest.php index dbe67ff..aed252d 100644 --- a/app/Http/Requests/Order/StoreOrderRequest.php +++ b/app/Http/Requests/Order/StoreOrderRequest.php @@ -54,6 +54,7 @@ public function rules(): array 'options.receiver_contact' => 'nullable|string|max:100', 'options.shipping_address' => 'nullable|string|max:500', 'options.shipping_address_detail' => 'nullable|string|max:500', + 'options.manager_name' => 'nullable|string|max:100', // 품목 배열 'items' => 'nullable|array', diff --git a/app/Http/Requests/Order/UpdateOrderRequest.php b/app/Http/Requests/Order/UpdateOrderRequest.php index a865312..59a2518 100644 --- a/app/Http/Requests/Order/UpdateOrderRequest.php +++ b/app/Http/Requests/Order/UpdateOrderRequest.php @@ -48,6 +48,7 @@ public function rules(): array 'options.receiver_contact' => 'nullable|string|max:100', 'options.shipping_address' => 'nullable|string|max:500', 'options.shipping_address_detail' => 'nullable|string|max:500', + 'options.manager_name' => 'nullable|string|max:100', // 품목 배열 (전체 교체) 'items' => 'nullable|array', diff --git a/app/Models/Orders/Order.php b/app/Models/Orders/Order.php index 647ea4b..426aece 100644 --- a/app/Models/Orders/Order.php +++ b/app/Models/Orders/Order.php @@ -325,15 +325,17 @@ public static function createFromQuote(Quote $quote, string $orderNo): self 'status_code' => self::STATUS_DRAFT, 'client_id' => $quote->client_id, 'client_name' => $quote->client?->name, - 'client_contact' => $quote->contact_person, + 'client_contact' => $quote->contact, 'site_name' => $quote->site_name, 'quantity' => $quote->items->sum('calculated_quantity'), 'supply_amount' => $quote->total_amount, 'tax_amount' => round($quote->total_amount * 0.1, 2), 'total_amount' => round($quote->total_amount * 1.1, 2), - 'delivery_date' => $quote->delivery_date, + 'delivery_date' => $quote->completion_date, 'memo' => $quote->remarks, - 'remarks' => $quote->internal_notes, + 'options' => [ + 'manager_name' => $quote->manager, + ], ]); } } diff --git a/app/Services/WorkOrderService.php b/app/Services/WorkOrderService.php index 02b3a85..18e0f05 100644 --- a/app/Services/WorkOrderService.php +++ b/app/Services/WorkOrderService.php @@ -210,7 +210,7 @@ public function show(int $id) 'assignee:id,name', 'assignees.user:id,name', 'team:id,name', - 'salesOrder' => fn ($q) => $q->select('id', 'order_no', 'site_name', 'client_id', 'client_contact', 'received_at', 'writer_id', 'created_at', 'quantity')->withCount('rootNodes'), + 'salesOrder' => fn ($q) => $q->select('id', 'order_no', 'site_name', 'client_id', 'client_contact', 'received_at', 'writer_id', 'created_at', 'quantity', 'options')->withCount('rootNodes'), 'salesOrder.client:id,name', 'salesOrder.writer:id,name', 'process:id,process_name,process_code,work_steps,department,options',