@if ($consumable->deleted_at!='')
| {{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }} |
- @else
- {{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }}
+ @else
+ {{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }}
+ @endif
+
+ {{ ($consumable->category) ? $consumable->category->name : ' invalid/deleted category' }} |
+
+ {{ Helper::getFormattedDateObject($consumable->pivot->created_at, 'datetime', false) }}
+ |
+
+ @if ($consumable->getLatestSignedAcceptance($show_user))
+
@endif
- |
- {{ ($consumable->category) ? $consumable->category->name : ' invalid/deleted category' }} |
-
- {{ Helper::getFormattedDateObject($consumable->pivot->created_at, 'datetime', false) }}
- |
-
- @if ($consumable->getLatestSignedAcceptance($show_user))
-
- @endif
- |
+
@php
$ccounter++
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 58b0cd3402..c48dcaaca6 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -808,21 +808,11 @@
$user->id]) }}"
@@ -1112,21 +1055,11 @@