|
|
@@ -39,6 +39,17 @@ class OrderController extends Controller
|
|
|
]
|
|
|
];
|
|
|
|
|
|
+ public function __construct()
|
|
|
+ {
|
|
|
+ $this->data['districts'] = District::query()->get()->pluck('name', 'id');
|
|
|
+ $this->data['areas'] = Area::query()->get()->pluck('name', 'id');
|
|
|
+ $this->data['objectTypes'] = ObjectType::query()->get()->pluck('name', 'id');
|
|
|
+ $this->data['orderStatuses'] =OrderStatus::query()->get()->pluck('name', 'id');
|
|
|
+ $this->data['brigadiers'] = Brigadier::query()->get()->pluck('name', 'id');
|
|
|
+ $this->data['users'] = User::query()->get()->pluck('name', 'id');
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* Display a listing of the resource.
|
|
|
*/
|
|
|
@@ -147,12 +158,6 @@ class OrderController extends Controller
|
|
|
*/
|
|
|
public function create()
|
|
|
{
|
|
|
- $this->data['districts'] = District::query()->get()->pluck('name', 'id');
|
|
|
- $this->data['areas'] = Area::query()->get()->pluck('name', 'id');
|
|
|
- $this->data['objectTypes'] = ObjectType::query()->get()->pluck('name', 'id');
|
|
|
- $this->data['orderStatuses'] =OrderStatus::query()->get()->pluck('name', 'id');
|
|
|
- $this->data['brigadiers'] = Brigadier::query()->get()->pluck('name', 'id');
|
|
|
- $this->data['users'] = User::query()->get()->pluck('name', 'id');
|
|
|
return view('orders.edit', $this->data);
|
|
|
}
|
|
|
|
|
|
@@ -173,9 +178,10 @@ class OrderController extends Controller
|
|
|
/**
|
|
|
* Display the specified resource.
|
|
|
*/
|
|
|
- public function show(string $id)
|
|
|
+ public function show(Order $order)
|
|
|
{
|
|
|
- //
|
|
|
+ $this->data['order'] = $order;
|
|
|
+ return view('orders.edit', $this->data);
|
|
|
}
|
|
|
|
|
|
/**
|