Alexander Musikhin 7 месяцев назад
Родитель
Сommit
571851a57f
2 измененных файлов с 15 добавлено и 6 удалено
  1. 10 5
      resources/views/orders/show.blade.php
  2. 5 1
      resources/views/partials/table.blade.php

+ 10 - 5
resources/views/orders/show.blade.php

@@ -9,7 +9,11 @@ use App\Models\Order;
     <div class="px-3">
         <div class="row mb-2">
             <div class="col-6">
-                <h3>Площадка {{ $order->object_address }}</h3>
+                <h3>
+                    Площадка {{ $order->object_address }}
+                    <div class="badge text-bg-{{ Order::STATUS_COLOR[$order->order_status_id] }}" >{{ $order->orderStatus->name }}</div>
+
+                </h3>
             </div>
             <div class="col-6 text-end">
                 <a href="{{ route('order.edit', $order) }}" class="btn btn-primary">Редактировать</a>
@@ -50,12 +54,13 @@ use App\Models\Order;
                 <div>Ссылка на группу в ТГ: {{ $order->tg_group_link }}</div>
                 <hr>
                 <div class="photo">
-                    Фотографии <button class="btn btn-sm text-success" onclick="$('#upl-photo').trigger('click');"><i class="bi bi-plus-circle-fill"></i> Загрузить</button>
+                    <a href="#photos" data-bs-toggle="collapse">Фотографии</a>
+                    <button class="btn btn-sm text-success" onclick="$('#upl-photo').trigger('click');"><i class="bi bi-plus-circle-fill"></i> Загрузить</button>
                     <form action="{{ route('order.upload-photo', $order) }}" enctype="multipart/form-data" method="post" class="visually-hidden">
                         @csrf
                         <input required type="file" id="upl-photo" onchange="$(this).parent().submit()" multiple name="photo[]" class="form-control form-control-sm" accept=".jpg,.jpeg,.png">
                     </form>
-                    <div class="row my-2 g-1">
+                    <div class="row my-2 g-1 collapse" id="photos">
                         @foreach($order->photos as $photo)
                             <div class="col-4">
                                 <a href="{{ $photo->link }}"
@@ -87,7 +92,7 @@ use App\Models\Order;
                     <div class="row my-2 g-1">
                         @foreach($order->documents as $document)
                             <div class="col-12">
-                                <a href="{{ $document->link }}">
+                                <a href="{{ $document->link }}" target="_blank">
                                     {{ $document->original_name }}
                                 </a>
                                 @if(hasRole('admin'))
@@ -113,7 +118,7 @@ use App\Models\Order;
                     <div class="row my-2 g-1">
                         @foreach($order->statements as $statement)
                             <div class="col-12">
-                                <a href="{{ $statement->link }}">
+                                <a href="{{ $statement->link }}" target="_blank">
                                     {{ $statement->original_name }}
                                 </a>
                                 @if(hasRole('admin'))

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

@@ -83,7 +83,11 @@
                             @php
                                 $relation = \Illuminate\Support\Str::camel(str_replace('_id', '', $headerName));
                             @endphp
-                            {!! $string->$relation?->name; !!}
+                            @if($headerName == 'order_status_id')
+                                <div class="badge fs-5 text-bg-{{ App\Models\Order::STATUS_COLOR[$string->order_status_id] }}" >{{ $string->$relation?->name }}</div>
+                            @else
+                                {!! $string->$relation?->name; !!}
+                            @endif
                         @elseif(str_ends_with($headerName, '_date') && ($string->$headerName))
                             {{ \App\Helpers\DateHelper::getHumanDate($string->$headerName, true) }}
                         @elseif(str_contains($headerName, 'image') && $string->$headerName)