diff --git a/app/Models/Orders/Order.php b/app/Models/Orders/Order.php index 6329f38..eedeb89 100644 --- a/app/Models/Orders/Order.php +++ b/app/Models/Orders/Order.php @@ -149,6 +149,7 @@ class Order extends Model */ protected $appends = [ 'delivery_method_label', + 'shipping_cost_label', ]; /** @@ -255,6 +256,16 @@ public function getDeliveryMethodLabelAttribute(): string return CommonCode::getLabel('delivery_method', $this->delivery_method_code); } + /** + * 운임비용 라벨 (common_codes 테이블에서 조회) + */ + public function getShippingCostLabelAttribute(): string + { + $shippingCostCode = $this->options['shipping_cost_code'] ?? null; + + return $shippingCostCode ? CommonCode::getLabel('shipping_cost', $shippingCostCode) : ''; + } + /** * 수주확정 시 매출 생성 여부 */ diff --git a/app/Services/OrderService.php b/app/Services/OrderService.php index 6b63900..e42ef24 100644 --- a/app/Services/OrderService.php +++ b/app/Services/OrderService.php @@ -31,7 +31,7 @@ public function index(array $params) $query = Order::query() ->where('tenant_id', $tenantId) - ->with(['client:id,name', 'items', 'quote:id,quote_number']); + ->with(['client:id,name,manager_name', 'items', 'quote:id,quote_number']); // 작업지시 생성 가능한 수주만 필터링 if ($forWorkOrder) {