|
|
@@ -50,7 +50,6 @@
|
|
|
@if(str_contains($headerName, '-'))
|
|
|
@php
|
|
|
list($rel, $field) = explode('-', $headerName);
|
|
|
-
|
|
|
@endphp
|
|
|
{!! $string->$rel->$field !!}
|
|
|
@elseif(str_ends_with($headerName, '_id'))
|
|
|
@@ -58,7 +57,7 @@
|
|
|
$relation = \Illuminate\Support\Str::camel(str_replace('_id', '', $headerName));
|
|
|
@endphp
|
|
|
{!! $string->$relation?->name; !!}
|
|
|
- @elseif(str_ends_with($headerName, '_date'))
|
|
|
+ @elseif(str_ends_with($headerName, '_date') && ($string->$headerName))
|
|
|
{{ \App\Helpers\DateHelper::getHumanDate($string->$headerName, true) }}
|
|
|
@else
|
|
|
{!! $string->$headerName !!}
|
