Unallocated owner for models

Author: andrewdrake

resources/views/clients/partials/card-index.blade.php

@@ -37,7 +37,7 @@
  'labels' => $client->labels,
  'limit' => 3
  ])</td>
- <td>{{ $client->ownerUser->name ?? null }}</td>
+ <td>{{ $client->ownerUser->name ?? "Unallocated" }}</td>
  <td class="disable-link text-right">
  @hasleadsenabled
  @can('create crm leads')

resources/views/clients/partials/card-show.blade.php

@@ -64,7 +64,9 @@
  <hr />
  <dl class="row">
  <dt class="col-sm-3 text-right">{{ ucfirst(__('laravel-crm::lang.name')) }}</dt>
- <dd class="col-sm-9"><a href="{{ route('laravel-crm.users.show', $client->ownerUser) }}">{{ $client->ownerUser->name }}</a></dd>
+ <dd class="col-sm-9">
+ @if($client->ownerUser)<a href="{{ route('laravel-crm.users.show', $client->ownerUser) }}">{{ $client->ownerUser->name ?? null }}</a> @else {{ ucfirst(__('laravel-crm::lang.unallocated')) }} @endif
+ </dd>
  </dl>
  @livewire('related-contact-people',[
  'model' => $client

resources/views/clients/partials/fields.blade.php

@@ -15,8 +15,8 @@
  @include('laravel-crm::partials.form.select',[
  'name' => 'user_owner_id',
  'label' => ucfirst(__('laravel-crm::lang.owner')),
- 'options' => \VentureDrake\LaravelCrm\Http\Helpers\SelectOptions\users(false),
- 'value' => old('user_owner_id', $client->user_owner_id ?? auth()->user()->id),
+ 'options' => ['' => ucfirst(__('laravel-crm::lang.unallocated'))] + \VentureDrake\LaravelCrm\Http\Helpers\SelectOptions\users(false),
+ 'value' => old('user_owner_id', (isset($client)) ? $client->user_owner_id ?? '' : auth()->user()->id),
  'required' => true
  ])
  @include('laravel-crm::fields.partials.model', ['model' => $client ?? new \VentureDrake\LaravelCrm\Models\Client()])

resources/views/deals/partials/card-index.blade.php

@@ -56,7 +56,7 @@
  <td>{{ $deal->organisation->name ?? null }}</td>
  <td>{{ $deal->person->name ?? null }}</td>
  <td>{{ ($deal->expected_close) ? $deal->expected_close->format($dateFormat) : null }}</td>
- <td>{{ $deal->ownerUser->name ?? null }}</td>
+ <td>{{ $deal->ownerUser->name ?? ucfirst(__('laravel-crm::lang.unallocated')) }}</td>
  <td class="disable-link text-right">
  @can('edit crm deals')
  @if(!$deal->closed_at)

resources/views/deals/partials/card-show.blade.php

@@ -47,7 +47,7 @@
  ])</p>
  <p><span class="fa fa-dollar" aria-hidden="true"></span> {{ money($deal->amount, $deal->currency) }}</p>
  <p><span class="fa fa-info" aria-hidden="true"></span> {{ $deal->description }}</p>
- <p><span class="fa fa-user-circle" aria-hidden="true"></span> <a href="{{ route('laravel-crm.users.show', $deal->ownerUser) }}">{{ $deal->ownerUser->name ?? null }}</a></p>
+ <p><span class="fa fa-user-circle" aria-hidden="true"></span> @if($deal->ownerUser)<a href="{{ route('laravel-crm.users.show', $deal->ownerUser) }}">{{ $deal->ownerUser->name ?? null }}</a> @else {{ ucfirst(__('laravel-crm::lang.unallocated')) }} @endif</p>
  <h6 class="mt-4 text-uppercase">{{ ucfirst(__('laravel-crm::lang.client')) }}</h6>
  <hr />
  <p><span class="fa fa-address-card" aria-hidden="true"></span> @if($deal->client)<a href="{{ route('laravel-crm.clients.show',$deal->client) }}">{{ $deal->client->name }}</a>@endif </p>

resources/views/deals/partials/fields.blade.php

@@ -71,8 +71,8 @@
  @include('laravel-crm::partials.form.select',[
  'name' => 'user_owner_id',
  'label' => ucfirst(__('laravel-crm::lang.owner')),
- 'options' => \VentureDrake\LaravelCrm\Http\Helpers\SelectOptions\users(false),
- 'value' => old('user_owner_id', $deal->user_owner_id ?? auth()->user()->id),
+ 'options' => ['' => ucfirst(__('laravel-crm::lang.unallocated'))] + \VentureDrake\LaravelCrm\Http\Helpers\SelectOptions\users(false),
+ 'value' => old('user_owner_id', (isset($deal)) ? $deal->user_owner_id ?? '' : auth()->user()->id),
  ])
 
  @include('laravel-crm::fields.partials.model', ['model' => $deal ?? new \VentureDrake\LaravelCrm\Models\Deal()])

resources/views/deliveries/partials/card-index.blade.php

@@ -87,7 +87,7 @@
  <td>
  {{ $delivery->delivered_on ?? null }}
  </td>
- <td>{{ $delivery->ownerUser->name ?? null }}</td>
+ <td>{{ $delivery->ownerUser->name ?? ucfirst(__('laravel-crm::lang.unallocated')) }}</td>
  <td class="disable-link text-right">
  @can('view crm deliveries')
  <a class="btn btn-outline-secondary btn-sm" href="{{ route('laravel-crm.deliveries.download', $delivery) }}"><span class="fa fa-download" aria-hidden="true"></span></a>

resources/views/leads/partials/card-index.blade.php

@@ -55,7 +55,7 @@
  <td>{{ $lead->organisation->name ?? null}}</td>
  <td>{{ $lead->person->name ?? null }}</td>
  <td>{{ $lead->pipelineStage->name ?? null }}</td>
- <td>{{ $lead->ownerUser->name ?? "Unallocated" }}</td>
+ <td>{{ $lead->ownerUser->name ?? ucfirst(__('laravel-crm::lang.unallocated')) }}</td>
  <td class="disable-link text-right">
  @hasdealsenabled
  @can('edit crm leads')

resources/views/orders/partials/card-index.blade.php

@@ -106,7 +106,7 @@
  {{ money($order->total, $order->currency) }}
  @endif
  </td>
- <td>{{ $order->ownerUser->name ?? null }}</td>
+ <td>{{ $order->ownerUser->name ?? ucfirst(__('laravel-crm::lang.unallocated')) }}</td>
  <td class="disable-link text-right">
  @can('edit crm orders')
  @if($subTotalError || $taxError || $totalError)

resources/views/orders/partials/card-show.blade.php

@@ -89,7 +89,7 @@
  'labels' => $order->labels
  ])</dd>
  <dt class="col-sm-4 text-right">Owner</dt>
- <dd class="col-sm-8">{{ $order->ownerUser->name ?? null }}</dd>
+ <dd class="col-sm-8">@if($order->ownerUser)<a href="{{ route('laravel-crm.users.show', $order->ownerUser) }}">{{ $order->ownerUser->name ?? null }}</a> @else {{ ucfirst(__('laravel-crm::lang.unallocated')) }} @endif</dd>
  </dl>
  <h6 class="mt-4 text-uppercase">{{ ucfirst(__('laravel-crm::lang.client')) }}</h6>
  <hr />