Alexander Musikhin 7 місяців тому
батько
коміт
382beb50c5

+ 5 - 1
app/Http/Controllers/ProductSKUController.php

@@ -18,7 +18,10 @@ class ProductSKUController extends Controller
         'header'    => [
             'id'                                => 'ID',
 
-            'order-common_name'                 => 'Площадка',
+            'order-district_id'                 => 'Округ',
+            'order-area_id'                     => 'Район',
+            'order-object_address'              => 'Адрес площадки',
+            'maf_order-order_number'            => 'Номер заказа МАФ',
 
             'status'                            => 'Статус',
             'rfid'                              => 'RFID',
@@ -42,6 +45,7 @@ class ProductSKUController extends Controller
             'rfid',
             'factory_number',
             'certificate_number',
+            'order-object_address',
             'product-nomenclature_number',
             'product-article',
         ],

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

@@ -56,7 +56,14 @@
 //                                var_dump($string->$rel);die();
                             @endphp
                             @if(isset($string->$rel->$field))
-                                {!! $string->$rel->$field !!}
+                                @if(str_ends_with($field, '_id'))
+                                @php
+                                    $relation = \Illuminate\Support\Str::camel(str_replace('_id', '', $field));
+                                @endphp
+                                    {!! $string->$rel->$relation?->name; !!}
+                                @else
+                                    {!! $string->$rel->$field !!}
+                                @endif
                             @else
                                 <ul class="small mb-0">
                                     @foreach($string->$rel ?? [] as $item)