From 3d7fd5cf04e91a341653884b6ff43d66c780630a Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 28 Oct 2017 07:29:32 -0700 Subject: [PATCH] Fixed references to assetLoc in hardware view --- resources/views/hardware/view.blade.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 9e40dc1c84..8c1f85f7c6 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -416,19 +416,19 @@
  • {{ $asset->assignedTo->phone }}
  • @endif - @if (isset($asset->assetLoc)) -
  • {{ $asset->assetLoc->name }}
  • -
  • {{ $asset->assetLoc->address }} - @if ($asset->assetLoc->address2!='') - {{ $asset->assetLoc->address2 }} + @if (isset($asset->location)) +
  • {{ $asset->location->name }}
  • +
  • {{ $asset->location->address }} + @if ($asset->location->address2!='') + {{ $asset->location->address2 }} @endif
  • -
  • {{ $asset->assetLoc->city }} - @if (($asset->assetLoc->city!='') && ($asset->assetLoc->state!='')) +
  • {{ $asset->location->city }} + @if (($asset->location->city!='') && ($asset->location->state!='')) , @endif - {{ $asset->assetLoc->state }} {{ $asset->assetLoc->zip }} + {{ $asset->location->state }} {{ $asset->location->zip }}
  • @endif