Updated ui to support lead board

Author: andrewdrake

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

@@ -9,6 +9,7 @@
         @slot('actions')
             @include('laravel-crm::partials.view-types', [
                 'model' => 'leads', 
+                'viewSetting' => $viewSetting ?? 'list'
             ])
             @include('laravel-crm::partials.filters', [
                 'action' => route('laravel-crm.leads.filter'),

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

@@ -3,7 +3,7 @@
     @component('laravel-crm::components.card-header')
 
         @slot('title')
-            {{ $lead->title }}
+            {{ $lead->title }} @if($lead->pipelineStage) <small><span class="badge badge-secondary">{{ $lead->pipelineStage->name }}</span> @endif</small>
         @endslot
 
         @slot('actions')

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

@@ -34,6 +34,20 @@
                 ])
             </div>
         </div>
+
+        @include('laravel-crm::partials.form.select',[
+                 'name' => 'pipeline_stage_id',
+                 'label' => ucfirst(__('laravel-crm::lang.stage')),
+                 'options' => $pipeline->pipelineStages()
+                                        ->orderBy('order')
+                                        ->orderBy('id')
+                                        ->pluck('name', 'id') ?? [],
+                 'value' =>  old('pipeline_stage_id', $lead->pipelineStage->id ?? $stage ?? $pipeline->pipelineStages()
+                                        ->orderBy('order')
+                                        ->orderBy('id')
+                                        ->first()->id ?? null),
+              ])
+        
         @include('laravel-crm::partials.form.multiselect',[
                     'name' => 'labels',
                     'label' => ucfirst(__('laravel-crm::lang.labels')),

resources/views/livewire/kanban-board/stage.blade.php

@@ -19,7 +19,7 @@
             @endforeach
         </div>
         <div class="card-footer">
-            <a href="{{ url(route('laravel-crm.leads.create')) }}" class="btn btn-primary btn-block">Add lead</a>
+            <a href="{{ url(route('laravel-crm.leads.create', ['stage' => $stage['id']])) }}" class="btn btn-primary btn-block">Add lead</a>
         </div>
     </div>
 </div>

resources/views/partials/view-types.blade.php

@@ -1,4 +1,4 @@
 <div class="btn-group" role="group" aria-label="Switch view">
-    <a href="{{ route('laravel-crm.leads.list') }}" type="button" class="btn btn-sm btn-outline-secondary" data-toggle="tooltip" data-placement="top" title="View {{ $model ?? null }} as list"><i class="fa fa-solid fa-list"></i></a>
-    <a href="{{ route('laravel-crm.leads.board') }}" type="button" class="btn btn-sm btn-outline-secondary" data-toggle="tooltip" data-placement="top" title="View {{ $model ?? null }} as board"><i class="fa fas fa-th"></i></a>
+    <a href="{{ route('laravel-crm.leads.list') }}" type="button" class="btn btn-sm btn-outline-secondary {{ ($viewSetting == 'list') ? 'active' : null }}" data-toggle="tooltip" data-placement="top" title="View {{ $model ?? null }} as list"><i class="fa fa-solid fa-list"></i></a>
+    <a href="{{ route('laravel-crm.leads.board') }}" type="button" class="btn btn-sm btn-outline-secondary {{ ($viewSetting == 'board') ? 'active' : null }}" data-toggle="tooltip" data-placement="top" title="View {{ $model ?? null }} as board"><i class="fa fas fa-th"></i></a>
 </div>

src/Console/LaravelCrmArchive.php

@@ -2,7 +2,6 @@
 
 namespace VentureDrake\LaravelCrm\Console;
 
-use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Support\Composer;
 use VentureDrake\LaravelCrm\Services\SettingService;
@@ -56,7 +55,7 @@ public function handle()
     {
         $this->info('Laravel CRM archiving...');
 
-        // 
+        //
 
         $this->info('Archive CRM archiving complete.');
     }

src/Http/Controllers/LeadController.php

@@ -11,6 +11,7 @@
 use VentureDrake\LaravelCrm\Models\Lead;
 use VentureDrake\LaravelCrm\Models\Organisation;
 use VentureDrake\LaravelCrm\Models\Person;
+use VentureDrake\LaravelCrm\Models\Pipeline;
 use VentureDrake\LaravelCrm\Services\DealService;
 use VentureDrake\LaravelCrm\Services\LeadService;
 use VentureDrake\LaravelCrm\Services\OrganisationService;
@@ -53,6 +54,17 @@ public function __construct(LeadService $leadService, DealService $dealService,
      */
     public function index(Request $request)
     {
+        $viewSetting = auth()->user()->crmSettings()->where('name', 'view_leads')->first();
+
+        if(! $viewSetting) {
+            auth()->user()->crmSettings()->create([
+                'name' => 'view_leads',
+                'value' => 'list',
+            ]);
+        } elseif($viewSetting->value == 'board') {
+            return redirect(route('laravel-crm.leads.board'));
+        }
+
         Lead::resetSearchValue($request);
         $params = Lead::filters($request);
 
@@ -62,8 +74,10 @@ public function index(Request $request)
             $leads = Lead::filter($params)->whereNull('converted_at')->latest()->paginate(30);
         }
 
+
         return view('laravel-crm::leads.index', [
             'leads' => $leads,
+            'viewSetting' => $viewSetting->value ?? null,
         ]);
     }
 
@@ -95,6 +109,8 @@ public function create(Request $request)
             'client' => $client ?? null,
             'organisation' => $organisation ?? null,
             'person' => $person ?? null,
+            'pipeline' => Pipeline::where('model', get_class(new Lead()))->first(),
+            'stage' => $request->stage ?? null
         ]);
     }
 
@@ -187,6 +203,7 @@ public function edit(Lead $lead)
             'email' => $email ?? null,
             'phone' => $phone ?? null,
             'address' => $address ?? null,
+            'pipeline' => Pipeline::where('model', get_class(new Lead()))->first()
         ]);
     }
 
@@ -355,13 +372,32 @@ public function storeAsDeal(StoreLeadRequest $request, Lead $lead)
         return redirect(route('laravel-crm.leads.index'));
     }
 
+    public function list(Request $request)
+    {
+        auth()->user()->crmSettings()->updateOrCreate([
+            'name' => 'view_leads',
+        ], [
+            'value' => 'list',
+        ]);
+
+        return redirect(route('laravel-crm.leads.index'));
+    }
+
     /**
      * Display a listing of the resource.
      *
      * @return \Illuminate\Http\Response
      */
     public function board(Request $request)
     {
+        $viewSetting = auth()->user()->crmSettings()->where('name', 'view_leads')->first();
+
+        auth()->user()->crmSettings()->updateOrCreate([
+            'name' => 'view_leads',
+        ], [
+            'value' => 'board',
+        ]);
+
         Lead::resetSearchValue($request);
         $params = Lead::filters($request);
 
@@ -373,6 +409,7 @@ public function board(Request $request)
 
         return view('laravel-crm::leads.board', [
             'leads' => $leads,
+            'viewSetting' => $viewSetting->value ?? null
         ]);
     }
 }

src/Http/routes.php

@@ -92,7 +92,7 @@
         ->name('laravel-crm.leads.index')
         ->middleware(['can:viewAny,VentureDrake\LaravelCrm\Models\Lead']);
 
-    Route::get('list', 'VentureDrake\LaravelCrm\Http\Controllers\LeadController@index')
+    Route::get('list', 'VentureDrake\LaravelCrm\Http\Controllers\LeadController@list')
         ->name('laravel-crm.leads.list')
         ->middleware(['can:viewAny,VentureDrake\LaravelCrm\Models\Lead']);
 

src/Models/Setting.php

@@ -41,6 +41,11 @@ public function getTable()
         return config('laravel-crm.db_table_prefix').'settings';
     }
 
+    public function user()
+    {
+        return $this->belongsTo(\App\Models\User::class);
+    }
+
     public function scopeCurrency($query)
     {
         return $query->where('name', 'currency')->first();

src/Services/LeadService.php

@@ -4,6 +4,7 @@
 
 use Ramsey\Uuid\Uuid;
 use VentureDrake\LaravelCrm\Models\Lead;
+use VentureDrake\LaravelCrm\Models\PipelineStage;
 use VentureDrake\LaravelCrm\Repositories\LeadRepository;
 
 class LeadService
@@ -35,6 +36,8 @@ public function create($request, $person = null, $organisation = null, $client =
             'currency' => $request->currency,
             'lead_status_id' => 1,
             'user_owner_id' => $request->user_owner_id,
+            'pipeline_id' => PipelineStage::find($request->pipeline_stage_id)->pipeline->id ?? null,
+            'pipeline_stage_id' => $request->pipeline_stage_id ?? null,
         ]);
 
         $lead->labels()->sync($request->labels ?? []);
@@ -53,6 +56,8 @@ public function update($request, Lead $lead, $person = null, $organisation = nul
             'amount' => $request->amount,
             'currency' => $request->currency,
             'user_owner_id' => $request->user_owner_id,
+            'pipeline_id' => PipelineStage::find($request->pipeline_stage_id)->pipeline->id ?? null,
+            'pipeline_stage_id' => $request->pipeline_stage_id ?? null,
         ]);
 
         $lead->labels()->sync($request->labels ?? []);