diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index 2d40c82..5987fa8 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -191,7 +191,11 @@ class OrdersController extends CommonController public function getOrder($id) { $model = $this->_getOrderModel(); - $order = $model->find($id); + $order = $model->with([ + "orderItems" => function($query) { + + } + ])->find($id); $order = $order->refreshTotal(); $order->balance = $order->customer->balance; @@ -210,6 +214,8 @@ class OrdersController extends CommonController "orders.patient_id", "orders.project_id", "orders.product_id", + "orders.product_item_id", + "orders.product_paramedic_level_id", "orders.from_date", "orders.to_date", "orders.status", @@ -224,6 +230,12 @@ class OrdersController extends CommonController "orders.created_at" ) ->with([ + "productItem" => function ($query) { + $query->select("id", "name"); + }, + "paramedicLevel" => function ($query) { + $query->select("paramedic_level.id", "paramedic_level.name"); + }, "project" => function ($query) { $query->select("id", "name"); }, @@ -241,7 +253,9 @@ class OrdersController extends CommonController $query->select("id", "name", "sex", "age", "mobile"); }, "paramedic" => function ($query) { - $query->select("id", "name", "mobile"); + $query->select("paramedic.id", "paramedic.name", "paramedic.mobile") + ->leftJoin("paramedic_level", "paramedic_level.id", "=", "paramedic.paramedic_level_id") + ->addSelect("paramedic_level.name as paramedic_level_name"); } ]); return $model;