A free open source IT asset/license management system
Merge more into contact card
snipea38c8a023504
diff --git a/resources/views/blade/box/contact.blade.php b/resources/views/blade/box/contact.blade.phpindex 2f8f2ac022..1972a164f3 100644--- a/resources/views/blade/box/contact.blade.php+++ b/resources/views/blade/box/contact.blade.php@@ -6,18 +6,86 @@<div class="box-body box-profile"><h3 class="profile-username">- @if (($contact->image) && ($img_path))+ @if (($contact->image) && ($img_path))<a href="{{ Storage::disk('public')->url($img_path.e($contact->image)) }}" data-toggle="lightbox" data-type="image"><img src="{{ Storage::disk('public')->url($img_path.e($contact->image)) }}" class="profile-user-img img-responsive img-thumbnail" alt="{{ $contact->name }}"></a>- @endif+ @endif++{{ $contact->display_name }}</h3>+ @if ($contact->present()->displayAddress)+ {!! nl2br($contact->present()->displayAddress) !!}+ <br><br>+ @endif+++ @if (isset($before_list))+ {{ $before_list }}+ @endif+<ul class="list-group list-group-unbordered">{{ $slot }}+ @if ($contact->company)+ <x-info-element icon_type="company">+ {{ $contact->company->display_name }}+ </x-info-element>+ @endif+++ <x-info-element icon_type="contact-card">+ {{ $contact->contact }}+ </x-info-element>++ @if ($contact->manager)+ <x-info-element icon_type="manager">+ {{ $contact->manager->display_name }}+ </x-info-element>+ @endif++ @if ($contact->parent)+ <x-info-element icon_type="parent">+ {{ $contact->parent->display_name }}+ </x-info-element>+ @endif++ <x-info-element icon_type="email">+ <x-info-element.email>+ {{ $contact->email }}+ </x-info-element.email>+ </x-info-element>++ @if ($contact->phone)+ <x-info-element icon_type="phone">+ <x-info-element.phone>+ {{ $contact->phone }}+ </x-info-element.phone>+ </x-info-element>+ @endif++ @if ($contact->fax)+ <x-info-element icon_type="fax">+ <x-info-element.phone>+ {{ $contact->fax }}+ </x-info-element.phone>+ </x-info-element>+ @endif++ <x-info-element icon_type="external-link">+ <x-info-element.url>+ {{ $contact->url }}+ </x-info-element.url>+ </x-info-element>++ <x-info-element icon_type="external-link">+ <x-info-element.url>+ {{ $contact->support_url }}+ </x-info-element.url>+ </x-info-element>@if ($contact->notes)<x-info-element>@@ -26,6 +94,28 @@</x-info-element>@endif+ @if (($contact->present()->displayAddress) && (config('services.google.maps_api_key')))++ <x-info-element>+ <div class="text-center">+ <img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($contact->address.','.$contact->city.' '.$contact->state.' '.$contact->country.' '.$contact->zip) }}&size=500x300&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-thumbnail img-responsive" style="width: 100%" alt="Map">+ </div>+ </x-info-element>+ @endif++ @if ((($contact->address!='') && ($contact->city!='')) || ($contact->state!='') || ($contact->country!=''))+ <x-info-element>+ <a class="btn btn-sm btn-theme" href="https://maps.google.com/?q={{ urlencode($contact->address.','. $contact->city.','.$contact->state.','.$contact->country.','.$contact->zip) }}" target="_blank">+ {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '<i class="fa-brands fa-google" aria-hidden="true"></i>']) !!}+ <x-icon type="external-link"/>+ </a>++ <a class="btn btn-sm btn-theme" href="https://maps.apple.com/?q={{ urlencode($contact->address.','. $contact->city.','.$contact->state.','.$contact->country.','.$contact->zip) }}" target="_blank">+ {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '<i class="fa-brands fa-apple" aria-hidden="true"></i>']) !!}+ <x-icon type="external-link"/>+ </a>+ </x-info-element>+ @endif@if ($contact->created_by)<x-info-element>@@ -57,12 +147,11 @@</span></x-info-element>@endif- </ul>- @if (($contact->address!='') && ($contact->state!='') && ($contact->country!='') && (config('services.google.maps_api_key')))- <x-info-element>- <img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($contact->address.','.$contact->city.' '.$contact->state.' '.$contact->country.' '.$contact->zip) }}&size=500x300&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-responsive" alt="Map">- </x-info-element>++ </ul>+ @if (isset($after_list))+ {{ $after_list }}@endif</div>diff --git a/resources/views/blade/info-element/index.blade.php b/resources/views/blade/info-element/index.blade.phpindex 03ab379bdc..ec9e27aded 100644--- a/resources/views/blade/info-element/index.blade.php+++ b/resources/views/blade/info-element/index.blade.php@@ -2,15 +2,13 @@'icon' => null,'icon_type' => null,])-@aware(['contact' => null])@if (!$slot->isEmpty())<li {{ $attributes->merge(['class' => 'list-group-item']) }}>-@if ($icon_type)<x-icon type="{{ $icon_type }}" class="fa-fw" />@elseif ($icon)- <i class="{{ $icon }}"></i>+ <i class="{{ $icon }}"></i>@endif{{ $slot }}</li>diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.phpindex 6dfdac449b..0772a07837 100644--- a/resources/views/locations/view.blade.php+++ b/resources/views/locations/view.blade.php@@ -369,132 +369,76 @@</x-page-column><x-page-column class="col-md-3">- @if ($location->image!='')- <div class="col-md-12 text-center" style="padding-bottom: 17px;">- <img src="{{ Storage::disk('public')->url('locations/'.e($location->image)) }}" class="img-responsive img-thumbnail" style="width:100%" alt="{{ $location->name }}">- </div>- @endif-- @if (($location->state!='') && ($location->country!='') && (config('services.google.maps_api_key')))- <div class="col-md-12 text-center" style="padding-bottom: 10px;">- <img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($location->address.','.$location->city.' '.$location->state.' '.$location->country.' '.$location->zip) }}&size=700x500&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-thumbnail" style="width:100%" alt="Map">- </div>- @endif-- <div class="col-md-12">-- <ul class="list-unstyled" style="line-height: 22px; padding-bottom: 20px;">-- @if ($location->notes)- <li>- <strong>{{ trans('general.notes') }}</strong>:- {!! nl2br(Helper::parseEscapedMarkedownInline($location->notes)) !!}- </li>- @endif-- @if ($location->address!='')- <li>{{ $location->address }}</li>- @endif- @if ($location->address2!='')- <li>{{ $location->address2 }}</li>- @endif- @if (($location->city!='') || ($location->state!='') || ($location->zip!=''))- <li>{{ $location->city }} {{ $location->state }} {{ $location->zip }}</li>- @endif- @if ($location->manager)- <li><strong>{{ trans('admin/users/table.manager') }}</strong>: {!! $location->manager->present()->nameUrl() !!}</li>- @endif- @if ($location->company)- <li><strong>{{ trans('admin/companies/table.name') }}</strong>: {!! $location->company->present()->nameUrl() !!}</li>- @endif- @if ($location->parent)- <li><strong>{{ trans('admin/locations/table.parent') }}</strong>: {!! $location->parent->present()->nameUrl() !!}</li>- @endif- @if ($location->ldap_ou)- <li><strong>{{ trans('admin/locations/table.ldap_ou') }}</strong>: {{ $location->ldap_ou }}</li>- @endif--- @if ((($location->address!='') && ($location->city!='')) || ($location->state!='') || ($location->country!=''))- <li>- <a href="https://maps.google.com/?q={{ urlencode($location->address.','. $location->city.','.$location->state.','.$location->country.','.$location->zip) }}" target="_blank">- {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '<i class="fa-brands fa-google" aria-hidden="true"></i>']) !!}- <x-icon type="external-link"/>- </a>- </li>- <li>- <a href="https://maps.apple.com/?q={{ urlencode($location->address.','. $location->city.','.$location->state.','.$location->country.','.$location->zip) }}" target="_blank">- {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '<i class="fa-brands fa-apple" aria-hidden="true" style="font-size: 18px"></i>']) !!}- <x-icon type="external-link"/></a>- </li>- @endif-- </ul>- </div>-- @can('update', $location)- @if ($location->deleted_at=='')- <div class="col-md-12">- <a href="{{ route('locations.edit', ['location' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-warning btn-social">- <x-icon type="edit" />- {{ trans('admin/locations/table.update') }}- </a>- </div>- @else- <div class="col-md-12">- <a style="width: 100%;" class="btn btn-sm btn-warning btn-social disabled">- <x-icon type="edit" />- {{ trans('admin/locations/table.update') }}- </a>- </div>- @endif- @endcan-- @if ($location->deleted_at=='')- <div class="col-md-12" style="padding-top: 5px;">- <a href="{{ route('locations.print_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-theme btn-social hidden-print">- <x-icon type="print" />- {{ trans('admin/locations/table.print_inventory') }}- </a>- </div>- <div class="col-md-12" style="padding-top: 5px;">- <a href="{{ route('locations.print_all_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-theme btn-social hidden-print">- <x-icon type="print" />- {{ trans('admin/locations/table.print_all_assigned') }}- </a>- </div>- @endif-- @can('delete', $location)- <div class="col-md-12 hidden-print" style="padding-top: 10px;">-- @if ($location->deleted_at=='')-- @if ($location->isDeletable())- <button class="btn btn-sm btn-block btn-danger btn-social delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $location->name]) }}" data-target="#dataConfirmModal">- <x-icon type="delete" />- {{ trans('general.delete') }}- </button>- @else- <span data-placement="top" data-tooltip="true" data-title="{{ trans('admin/locations/message.assoc_users') }}">- <a href="#" class="btn btn-block btn-sm btn-danger btn-social hidden-print disabled" data-tooltip="true">- <x-icon type="delete" />- {{ trans('general.delete') }}- </a>- </span>- @endif-- @else- <form method="POST" action="{{ route('locations.restore', ['location' => $location->id]) }}">- @csrf- <button class="btn btn-sm btn-block btn-warning btn-social">- <x-icon type="restore" />- {{ trans('general.restore') }}- </button>- </form>- @endif- </div>- @endcan+ <x-box>+ <x-box.contact :contact="$location" img_path="{{ app('locations_upload_url') }}">++ <x-slot:before_list>+ @can('update', $location)+ @if ($location->deleted_at=='')+ <a href="{{ route('locations.edit', ['location' => $location->id]) }}" class="btn btn-block btn-sm btn-warning btn-social">+ <x-icon type="edit" />+ {{ trans('admin/locations/table.update') }}+ </a>+ @else+ <a class="btn btn-block btn-sm btn-warning btn-social disabled">+ <x-icon type="edit" />+ {{ trans('admin/locations/table.update') }}+ </a>+ @endif+ @endcan++ @if ($location->deleted_at=='')+ <a href="{{ route('locations.print_assigned', ['locationId' => $location->id]) }}" class="btn btn-block btn-sm btn-theme btn-social hidden-print">+ <x-icon type="print" />+ {{ trans('admin/locations/table.print_inventory') }}+ </a>++ <a href="{{ route('locations.print_all_assigned', ['locationId' => $location->id]) }}" class="btn btn-block btn-sm btn-theme btn-social hidden-print">+ <x-icon type="print" />+ {{ trans('admin/locations/table.print_all_assigned') }}+ </a>++ @endif++ @can('delete', $location)++ @if ($location->deleted_at=='')+ @if ($location->isDeletable())+ <button class="btn btn-sm btn-block btn-danger btn-social delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $location->name]) }}" data-target="#dataConfirmModal">+ <x-icon type="delete" /> {{ trans('general.delete') }}+ </button>+ @else+ <div data-placement="top" data-tooltip="true" data-title="{{ trans('admin/locations/message.assoc_users') }}" style="padding-top: 5px; padding-bottom: 5px;">+ <a href="#" class="btn btn-block btn-sm btn-danger btn-social hidden-print disabled" data-tooltip="true">+ <x-icon type="delete" /> {{ trans('general.delete') }}+ </a>+ </div>+ @endif++ @else+ <form method="POST" action="{{ route('locations.restore', ['location' => $location->id]) }}">+ @csrf+ <button class="btn btn-sm btn-block btn-warning btn-social">+ <x-icon type="restore" />+ {{ trans('general.restore') }}+ </button>+ </form>+ @endif+ </div>+ @endcan++ </x-slot:before_list>+++ @if ($location->ldap_ou)+ <x-info-element icon_type="ldap">+ {{ $location->ldap_ou }}+ </x-info-element>+ @endif+++ </x-box.contact>+ </x-box></x-page-column></x-container>diff --git a/resources/views/manufacturers/view.blade.php b/resources/views/manufacturers/view.blade.phpindex 8f6ad8c4da..569eb37c2e 100644--- a/resources/views/manufacturers/view.blade.php+++ b/resources/views/manufacturers/view.blade.php@@ -193,42 +193,6 @@<x-box><x-box.contact :contact="$manufacturer" img_path="{{ app('manufacturers_upload_url') }}">- <x-info-element icon_type="contact-card">- {{ $manufacturer->contact }}- </x-info-element>-- <x-info-element icon_type="phone">- <x-info-element.phone>- {{ $manufacturer->support_phone }}- </x-info-element.phone>- </x-info-element>-- <x-info-element icon_type="fax">- <x-info-element.phone>- {{ $manufacturer->fax }}- </x-info-element.phone>- </x-info-element>-- <x-info-element icon_type="email">- <x-info-element.email>- {{ $manufacturer->email }}- </x-info-element.email>- </x-info-element>-- <x-info-element icon_type="external-link">- <x-info-element.url>- {{ $manufacturer->url }}- </x-info-element.url>- </x-info-element>-- <x-info-element icon_type="external-link">- <x-info-element.url>- {{ $manufacturer->support_url }}- </x-info-element.url>- </x-info-element>---</x-box.contact></x-box></x-page-column>diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.phpindex 9c88200407..51b69c4ccb 100755--- a/resources/views/suppliers/view.blade.php+++ b/resources/views/suppliers/view.blade.php@@ -233,39 +233,6 @@<x-box><x-box.contact :contact="$supplier" img_path="{{ app('suppliers_upload_url') }}">-- <x-info-element icon_type="contact-card">- {{ $supplier->contact }}- </x-info-element>-- <x-info-element>- {!! nl2br($supplier->present()->displayAddress) !!}- </x-info-element>-- <x-info-element icon_type="phone">- <x-info-element.phone>- {{ $supplier->phone }}- </x-info-element.phone>- </x-info-element>-- <x-info-element icon_type="fax">- <x-info-element.phone>- {{ $supplier->fax }}- </x-info-element.phone>- </x-info-element>-- <x-info-element icon_type="email">- <x-info-element.email>- {{ $supplier->email }}- </x-info-element.email>- </x-info-element>-- <x-info-element icon_type="external-link">- <x-info-element.url>- {{ $supplier->url }}- </x-info-element.url>- </x-info-element>-</x-box.contact></x-box></x-page-column>