fix edit and show order

app/Http/Controllers/OrderController.php

@@ -229,15 +229,18 @@ class OrderController extends Controller
         $ret = [];
         $s = $request->get('s');
         $searchFields = $this->data['searchFields'];
+        $result = Order::query();
         if($s) {
-            $result = Order::query()->where(function ($query) use ($searchFields, $s) {
+            $result->where(function ($query) use ($searchFields, $s) {
                 foreach ($searchFields as $searchField) {
                     $query->orWhere($searchField, 'LIKE', '%' . $s . '%');
                 }
             });
-            foreach ($result->get() as $p) {
-                $ret[$p->id] = $p->common_name;
-            }
+        }
+
+        $result->orderBy('object_address');
+        foreach ($result->get() as $p) {
+            $ret[$p->id] = $p->common_name;
         }
         return $ret;
     }

app/Models/Order.php

@@ -143,7 +143,7 @@ class Order extends Model
     public function commonName(): Attribute
     {
         return Attribute::make(
-            get: fn($value) => (string) $this->district->shortname . ', ' . $this->area->name . ', ' . $this->object_address,
+            get: fn($value) => (string) $this->object_address . ', ' . $this->area->name . ', ' . $this->district->shortname,
         );
     }
 

resources/views/maf_orders/edit.blade.php

@@ -43,7 +43,7 @@
             <h3>Площадки, куда отгружен МАФ</h3>
             @foreach($maf_order->products_sku as $product_sku)
                 <div>
-                    <a href="{{ route('order.edit', $product_sku->order) }}">
+                    <a href="{{ route('order.show', $product_sku->order) }}">
                         {{ $product_sku->order->common_name }}
                     </a>
                 </div>

resources/views/orders/show.blade.php

@@ -8,11 +8,6 @@
                 <h3>Площадка {{ $order->object_address }}</h3>
             </div>
             <div class="col-6 text-end">
-                <a href="{{ route('order.get-maf', $order) }}"
-                   class="btn btn-primary @disabled($order->ready_to_mount == 'Нет' )">Привязать МАФы</a>
-
-                <a href="{{ route('order.revert-maf', $order) }}"
-                   class="btn btn-primary">Отвязать МАФы</a>
                 <a href="{{ route('order.edit', $order) }}" class="btn btn-primary">Редактировать</a>
                 @if(hasRole('admin') && ($order->order_status_id == App\Models\Order::STATUS_NEW))
                     <a href="#" onclick="if(confirm('Удалить площадку?')) $('form#destroy').submit();"
@@ -100,6 +95,8 @@
                             </tbody>
                         </table>
                         <div>
+                            <a href="{{ route('order.get-maf', $order) }}" class="btn btn-primary btn-sm @disabled($order->ready_to_mount == 'Нет' )">Привязать все МАФы</a>
+                            <a href="{{ route('order.revert-maf', $order) }}" class="btn btn-primary btn-sm">Отвязать все МАФы</a>
                             <button class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#moveModal">Перенести МАФы</button>
                         </div>
                     @endif
@@ -148,7 +145,7 @@
                     });
                 }
             );
-        });
+        }).trigger('keyup');