Alexander Musikhin 8 сар өмнө
parent
commit
a9af41023b

+ 1 - 1
resources/views/layouts/menu.blade.php

@@ -1,4 +1,4 @@
-<li class="nav-item"><a class="nav-link" href="{{ route('order.index') }}">Заказы (площадки)</a></li>
+<li class="nav-item"><a class="nav-link" href="{{ route('order.index') }}">Площадки</a></li>
 
 
 <li class="nav-item"><a class="nav-link" href="{{ route('catalog.index') }}">Каталог</a></li>
 <li class="nav-item"><a class="nav-link" href="{{ route('catalog.index') }}">Каталог</a></li>
 
 

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

@@ -3,7 +3,7 @@
 @section('content')
 @section('content')
     <div class="row mb-3">
     <div class="row mb-3">
         <div class="col-6">
         <div class="col-6">
-            <h3>Заказы</h3>
+            <h3>Площадки</h3>
         </div>
         </div>
         <div class="col-6 text-end">
         <div class="col-6 text-end">
             <a href="{{ route('order.create') }}" class="btn btn-sm btn-primary">Создать</a>
             <a href="{{ route('order.create') }}" class="btn btn-sm btn-primary">Создать</a>

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

@@ -49,9 +49,11 @@
                     <td class="column_{{$headerName}}" @isset($routeName) onclick="location.href='{{ route($routeName, $string->id) }}'" @endisset>
                     <td class="column_{{$headerName}}" @isset($routeName) onclick="location.href='{{ route($routeName, $string->id) }}'" @endisset>
                         @if(str_ends_with($headerName, '_id'))
                         @if(str_ends_with($headerName, '_id'))
                             @php
                             @php
-                                $relation = str_replace('_id', '', $headerName);
+                                $relation = \Illuminate\Support\Str::camel(str_replace('_id', '', $headerName));
                             @endphp
                             @endphp
                             {!! $string->$relation?->name; !!}
                             {!! $string->$relation?->name; !!}
+                        @elseif(str_ends_with($headerName, '_date'))
+                            {{ \App\Helpers\DateHelper::getHumanDate($string->$headerName) }}
                         @else
                         @else
                             {!! $string->$headerName !!}
                             {!! $string->$headerName !!}
                         @endif
                         @endif