Parcourir la source

edit order (without goods), links in table rows

Alexander Musikhin il y a 8 mois
Parent
commit
830ade3497

+ 14 - 8
app/Http/Controllers/OrderController.php

@@ -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);
     }
 
     /**

+ 2 - 1
resources/views/orders/edit.blade.php

@@ -1,6 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
+
     <div class="px-3">
         <div class="col-xxl-6 offset-xxl-2">
             <form action="{{ route('order.store') }}" method="post">
@@ -10,7 +11,7 @@
                     <input type="hidden" name="id" value="{{ $order->id }}">
                 @endif
 
-                @include('partials.select', ['name' => 'district_id', 'title' => 'Округ', 'options' => $districts, 'value' => $order?->$district_id ?? old('district_id'), 'first_empty' => true, 'required' => true])
+                @include('partials.select', ['name' => 'district_id', 'title' => 'Округ', 'options' => $districts, 'value' => $order?->district_id ?? old('district_id'), 'first_empty' => true, 'required' => true])
 
                 @include('partials.select', ['name' => 'area_id', 'title' => 'Район', 'options' => $areas, 'value' => $order?->area_id ?? old('area_id'), 'required' => true, 'first_empty' => true])
 

+ 2 - 1
resources/views/orders/index.blade.php

@@ -14,7 +14,8 @@
     @include('partials.table', [
         'id'        => $id,
         'header'    => $header,
-        'strings'   => $orders
+        'strings'   => $orders,
+        'routeName' => 'order.show',
     ])
 
     <div class="row pt-3 px-3">

+ 1 - 1
resources/views/partials/table.blade.php

@@ -46,7 +46,7 @@
         @foreach($strings as $string)
             <tr>
                 @foreach($header as $headerName => $headerTitle)
-                    <td class="column_{{$headerName}}">
+                    <td class="column_{{$headerName}}" @isset($routeName) onclick="location.href='{{ route($routeName, $string->id) }}'" @endisset>
                         @if(str_ends_with($headerName, '_id'))
                             @php
                                 $relation = str_replace('_id', '', $headerName);

+ 3 - 2
todo.md

@@ -5,9 +5,10 @@
 - [x] каталог товаров: фильтры, поиск, сортировка
 - [x] каталог товаров: экспорт
 - [x] каталог товаров: импорт
-- [ ] складские остатки товаров
+- [x] складские остатки товаров - модель, таблица
 - [ ] Добавить ответственных и привязать к району: ФИО, телефон
-- [ ] заказы (площадки)
+- [x] заказы (площадки) - создание, отображение таблицы
+- [ ] просмотр заказа, добавление товаров в заказ
 - [ ] заказы поставщику
 - [ ] импорт площадок
 - [ ] рекламации (возможно создание рекламации на манагере, пока не скажу)