Unallocated owner for models

andrewdrake · andrewdrake · commit f1efe06dcb22 · 2024-08-31T00:26:58.000+10:00
diff --git a/resources/views/clients/partials/card-index.blade.php b/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')
diff --git a/resources/views/clients/partials/card-show.blade.php b/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
diff --git a/resources/views/clients/partials/fields.blade.php b/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()])
diff --git a/resources/views/deals/partials/card-index.blade.php b/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)
diff --git a/resources/views/deals/partials/card-show.blade.php b/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>
diff --git a/resources/views/deals/partials/fields.blade.php b/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()])
diff --git a/resources/views/deliveries/partials/card-index.blade.php b/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>
diff --git a/resources/views/leads/partials/card-index.blade.php b/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')
diff --git a/resources/views/orders/partials/card-index.blade.php b/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)
diff --git a/resources/views/orders/partials/card-show.blade.php b/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 />
diff --git a/resources/views/orders/partials/fields.blade.php b/resources/views/orders/partials/fields.blade.php
@@ -84,8 +84,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', $order->user_owner_id ?? $quote->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($order)) ? $order->user_owner_id ?? '' : auth()->user()->id), 
           ])
 
         @include('laravel-crm::fields.partials.model', ['model' => $order ?? new \VentureDrake\LaravelCrm\Models\Order()])
diff --git a/resources/views/organisations/partials/card-index.blade.php b/resources/views/organisations/partials/card-index.blade.php
@@ -48,7 +48,7 @@
                     <td>{{ $organisation->deals->where('closed_status', 'lost')->count() }}</td>
                     <td>{{ $organisation->deals->where('closed_status', 'won')->count() }}</td>
                     <td></td>
-                    <td>{{ $organisation->ownerUser->name ?? null }}</td>
+                    <td>{{ $organisation->ownerUser->name ?? ucfirst(__('laravel-crm::lang.unallocated')) }}</td>
                     <td class="disable-link text-right">
                         @hasleadsenabled
                         @can('create crm leads')
diff --git a/resources/views/organisations/partials/card-show.blade.php b/resources/views/organisations/partials/card-show.blade.php
@@ -100,7 +100,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', $organisation->ownerUser) }}">{{ $organisation->ownerUser->name }}</a></dd>
+                    <dd class="col-sm-9">
+                        @if($organisation->ownerUser)<a href="{{ route('laravel-crm.users.show', $organisation->ownerUser) }}">{{ $organisation->ownerUser->name ?? null }}</a> @else  {{ ucfirst(__('laravel-crm::lang.unallocated')) }} @endif
+                    </dd>
                 </dl>
                 @livewire('related-contact-people',[
                     'model' => $organisation
diff --git a/resources/views/organisations/partials/fields.blade.php b/resources/views/organisations/partials/fields.blade.php
@@ -83,8 +83,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', $organisation->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($organisation)) ? $organisation->user_owner_id ?? '' : auth()->user()->id),
         ])
 
         @include('laravel-crm::fields.partials.model', ['model' => $organisation ?? new \VentureDrake\LaravelCrm\Models\Organisation()])
diff --git a/resources/views/people/partials/card-index.blade.php b/resources/views/people/partials/card-index.blade.php
@@ -49,7 +49,7 @@
                     <td>{{ $person->deals->where('closed_status', 'lost')->count() }}</td>
                     <td>{{ $person->deals->where('closed_status', 'won')->count() }}</td>
                     <td></td>
-                    <td>{{ $person->ownerUser->name ?? null }}</td>
+                    <td>{{ $person->ownerUser->name ?? ucfirst(__('laravel-crm::lang.unallocated')) }}</td>
                     <td class="disable-link text-right">
                         @hasleadsenabled
                         @can('create crm leads')
diff --git a/resources/views/people/partials/card-show.blade.php b/resources/views/people/partials/card-show.blade.php
@@ -92,7 +92,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', $person->ownerUser) }}">{{ $person->ownerUser->name }}</a></dd>
+                    <dd class="col-sm-9">
+                        @if($person->ownerUser)<a href="{{ route('laravel-crm.users.show', $person->ownerUser) }}">{{ $person->ownerUser->name ?? null }}</a> @else  {{ ucfirst(__('laravel-crm::lang.unallocated')) }} @endif
+                    </dd>
                 </dl>
                 @livewire('related-contact-people',[
                     'model' => $person
diff --git a/resources/views/people/partials/fields.blade.php b/resources/views/people/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', $person->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($person)) ? $person->user_owner_id ?? '' : auth()->user()->id),
        ])
         @include('laravel-crm::fields.partials.model', ['model' => $person ?? new \VentureDrake\LaravelCrm\Models\Person()])
     </div>
diff --git a/resources/views/products/partials/card-index.blade.php b/resources/views/products/partials/card-index.blade.php
@@ -43,7 +43,7 @@
                     <td>{{ $product->taxRate->name ?? null }}</td>
                     <td>{{ $product->tax_rate ?? $product->taxRate->rate ?? 0 }}%</td>
                     <td>{{ ($product->active == 1) ? 'YES' : 'NO' }}</td>
-                    <td>{{ $product->ownerUser->name ?? null }}</td>
+                    <td>{{ $product->ownerUser->name ?? ucfirst(__('laravel-crm::lang.unallocated')) }}</td>
                     <td class="disable-link text-right">
                         @can('view crm products')
                         <a href="{{  route('laravel-crm.products.show',$product) }}" class="btn btn-outline-secondary btn-sm"><span class="fa fa-eye" aria-hidden="true"></span></a>
diff --git a/resources/views/products/partials/card-show.blade.php b/resources/views/products/partials/card-show.blade.php
@@ -61,7 +61,9 @@
                 <hr />
                 <dl class="row">
                     <dt class="col-sm-3 text-right">{{ ucfirst(__('laravel-crm::lang.name')) }}</dt>
-                    <dd class="col-sm-9">{{ $product->ownerUser->name }}</dd>
+                    <dd class="col-sm-9">
+                        @if($product->ownerUser)<a href="{{ route('laravel-crm.users.show', $product->ownerUser) }}">{{ $product->ownerUser->name ?? null }}</a> @else  {{ ucfirst(__('laravel-crm::lang.unallocated')) }} @endif
+                    </dd>
                 </dl>
             </div>
             <div class="col-sm-6">
diff --git a/resources/views/products/partials/fields.blade.php b/resources/views/products/partials/fields.blade.php
@@ -88,8 +88,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', $product->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($product)) ? $product->user_owner_id ?? '' : auth()->user()->id),
              ])
             </div>
         </div>
diff --git a/resources/views/quotes/partials/card-index.blade.php b/resources/views/quotes/partials/card-index.blade.php
@@ -92,7 +92,7 @@
                    </td>
                    <td>{{ ($quote->issue_at) ? $quote->issue_at->format($dateFormat) : null }}</td>
                    <td>{{ ($quote->expire_at) ? $quote->expire_at->format($dateFormat) : null }}</td>
-                   <td>{{ $quote->ownerUser->name ?? null }}</td>
+                   <td>{{ $quote->ownerUser->name ?? ucfirst(__('laravel-crm::lang.unallocated')) }}</td>
                    <td class="disable-link text-right">
                        @if(! $quote->order && !$quoteError)
                            @livewire('send-quote',[
diff --git a/resources/views/quotes/partials/card-show.blade.php b/resources/views/quotes/partials/card-show.blade.php
@@ -88,7 +88,9 @@
                             'labels' => $quote->labels
                     ])</dd>
                     <dt class="col-sm-3 text-right">Owner</dt>
-                    <dd class="col-sm-9">{{ $quote->ownerUser->name ?? null }}</dd>
+                    <dd class="col-sm-9">
+                        @if($quote->ownerUser)<a href="{{ route('laravel-crm.users.show', $quote->ownerUser) }}">{{ $quote->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 />
diff --git a/resources/views/quotes/partials/fields.blade.php b/resources/views/quotes/partials/fields.blade.php
@@ -90,11 +90,11 @@
         ])
 
         @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', $quote->user_owner_id ?? auth()->user()->id),
-              ])
+             'name' => 'user_owner_id',
+             'label' => ucfirst(__('laravel-crm::lang.owner')),
+             'options' => ['' => ucfirst(__('laravel-crm::lang.unallocated'))] + \VentureDrake\LaravelCrm\Http\Helpers\SelectOptions\users(false),
+             'value' =>  old('user_owner_id', (isset($quote)) ? $quote->user_owner_id ?? '' : auth()->user()->id),
+        ])
 
         @include('laravel-crm::fields.partials.model', ['model' => $quote ?? new \VentureDrake\LaravelCrm\Models\Quote()])
 
diff --git a/src/Http/Requests/StoreClientRequest.php b/src/Http/Requests/StoreClientRequest.php
@@ -25,7 +25,6 @@ public function rules()
     {
         return [
             'name' => 'required|max:255',
-            'user_owner_id' => 'required',
         ];
     }
 }
diff --git a/src/Http/Requests/StoreDealRequest.php b/src/Http/Requests/StoreDealRequest.php
@@ -30,7 +30,6 @@ public function rules()
             'organisation_id' => 'required_without_all:person_name,person_id,organisation_name|max:255',
             'title' => 'required|max:255',
             'amount' => 'nullable|numeric',
-            'user_owner_id' => 'required',
         ];
     }
 
diff --git a/src/Http/Requests/StoreOrderRequest.php b/src/Http/Requests/StoreOrderRequest.php
@@ -24,12 +24,10 @@ public function authorize()
     public function rules()
     {
         return [
-            /*'client_name' => 'required|max:255',*/
             'person_name' => 'required_without_all:organisation_name,organisation_id|max:255',
             'person_id' => 'required_without_all:organisation_name,organisation_id,person_name|max:255',
             'organisation_name' => 'required_without_all:person_name,person_id|max:255',
             'organisation_id' => 'required_without_all:person_name,person_id,organisation_name|max:255',
-            'user_owner_id' => 'required',
         ];
     }
 
diff --git a/src/Http/Requests/StoreOrganisationRequest.php b/src/Http/Requests/StoreOrganisationRequest.php
@@ -25,7 +25,6 @@ public function rules()
     {
         return [
             'name' => 'required|max:255',
-            'user_owner_id' => 'required',
             'phones.*.type' => 'required_with:phones.*.number',
             'emails.*.type' => 'required_with:emails.*.address'
         ];
diff --git a/src/Http/Requests/StorePersonRequest.php b/src/Http/Requests/StorePersonRequest.php
@@ -25,7 +25,6 @@ public function rules()
     {
         return [
             'first_name' => 'required|max:255',
-            'user_owner_id' => 'required',
             'phones.*.type' => 'required_with:phones.*.number',
             'emails.*.type' => 'required_with:emails.*.address'
         ];
diff --git a/src/Http/Requests/StoreProductRequest.php b/src/Http/Requests/StoreProductRequest.php
@@ -25,7 +25,6 @@ public function rules()
     {
         return [
             'name' => 'required|max:255',
-            'user_owner_id' => 'required',
         ];
     }
 }
diff --git a/src/Http/Requests/StoreQuoteRequest.php b/src/Http/Requests/StoreQuoteRequest.php
@@ -29,7 +29,6 @@ public function rules()
             'organisation_name' => 'required_without_all:person_name,person_id|max:255',
             'organisation_id' => 'required_without_all:person_name,person_id,organisation_name|max:255',
             'title' => 'required|max:255',
-            'user_owner_id' => 'required',
         ];
     }
 
diff --git a/src/Http/Requests/UpdateClientRequest.php b/src/Http/Requests/UpdateClientRequest.php
@@ -25,7 +25,6 @@ public function rules()
     {
         return [
             'name' => 'required|max:255',
-            'user_owner_id' => 'required',
         ];
     }
 }
diff --git a/src/Http/Requests/UpdateDealRequest.php b/src/Http/Requests/UpdateDealRequest.php
@@ -30,7 +30,6 @@ public function rules()
             'organisation_id' => 'required_without_all:person_name,person_id,organisation_name|max:255',
             'title' => 'required|max:255',
             'amount' => 'nullable|numeric',
-            'user_owner_id' => 'required',
         ];
     }
 
diff --git a/src/Http/Requests/UpdateOrderRequest.php b/src/Http/Requests/UpdateOrderRequest.php
@@ -24,12 +24,10 @@ public function authorize()
     public function rules()
     {
         return [
-            /*'client_name' => 'required|max:255',*/
             'person_name' => 'required_without_all:organisation_name,organisation_id|max:255',
             'person_id' => 'required_without_all:organisation_name,organisation_id,person_name|max:255',
             'organisation_name' => 'required_without_all:person_name,person_id|max:255',
             'organisation_id' => 'required_without_all:person_name,person_id,organisation_name|max:255',
-            'user_owner_id' => 'required',
         ];
     }
 
diff --git a/src/Http/Requests/UpdateOrganisationRequest.php b/src/Http/Requests/UpdateOrganisationRequest.php
@@ -25,7 +25,6 @@ public function rules()
     {
         return [
             'name' => 'required|max:255',
-            'user_owner_id' => 'required',
             'phones.*.type' => 'required_with:phones.*.number',
             'emails.*.type' => 'required_with:emails.*.address'
         ];
diff --git a/src/Http/Requests/UpdatePersonRequest.php b/src/Http/Requests/UpdatePersonRequest.php
@@ -25,7 +25,6 @@ public function rules()
     {
         return [
             'first_name' => 'required|max:255',
-            'user_owner_id' => 'required',
             'phones.*.type' => 'required_with:phones.*.number',
             'emails.*.type' => 'required_with:emails.*.address'
         ];
diff --git a/src/Http/Requests/UpdateProductRequest.php b/src/Http/Requests/UpdateProductRequest.php
@@ -25,7 +25,6 @@ public function rules()
     {
         return [
             'name' => 'required|max:255',
-            'user_owner_id' => 'required',
         ];
     }
 }
diff --git a/src/Http/Requests/UpdateQuoteRequest.php b/src/Http/Requests/UpdateQuoteRequest.php
