Updates to browsing filters

andrewdrake · andrewdrake · commit 45e9df6f4c3a · 2021-11-05T11:05:36.000+11:00
diff --git a/resources/assets/css/app.css b/resources/assets/css/app.css
diff --git a/resources/sass/_custom.scss b/resources/sass/_custom.scss
@@ -164,3 +164,8 @@ dt {
   align-items: flex-start !important;
   justify-content: left !important;
 }
+
+.filter-active .custom-select{
+  color: #28a745 !important;
+  border-color: #28a745 !important;
+}
diff --git a/resources/views/deals/partials/card-index.blade.php b/resources/views/deals/partials/card-index.blade.php
@@ -3,7 +3,7 @@
     @component('laravel-crm::components.card-header')
 
         @slot('title')
-            {{ ucfirst(__('laravel-crm::lang.deals')) }} @include('laravel-crm::partials.filters')
+            {{ ucfirst(__('laravel-crm::lang.deals')) }}  @include('laravel-crm::partials.filters', ['action' => route('laravel-crm.deals.filter')])
         @endslot
 
         @slot('actions')
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -16,7 +16,7 @@
     <link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
 
     <!-- Styles -->
-    <link href="{{ asset('vendor/laravel-crm/css/app.css') }}?v=56754675676" rel="stylesheet">
+    <link href="{{ asset('vendor/laravel-crm/css/app.css') }}?v=2456456456" rel="stylesheet">
 
     @livewireStyles
 </head>
diff --git a/resources/views/leads/partials/card-index.blade.php b/resources/views/leads/partials/card-index.blade.php
@@ -3,7 +3,7 @@
     @component('laravel-crm::components.card-header')
 
         @slot('title')
-            {{ ucfirst(__('laravel-crm::lang.leads')) }} @include('laravel-crm::partials.filters')
+            {{ ucfirst(__('laravel-crm::lang.leads')) }}  @include('laravel-crm::partials.filters', ['action' => route('laravel-crm.leads.filter')])
         @endslot
 
         @slot('actions')
diff --git a/resources/views/organisations/partials/card-index.blade.php b/resources/views/organisations/partials/card-index.blade.php
@@ -3,7 +3,7 @@
     @component('laravel-crm::components.card-header')
 
         @slot('title')
-            {{ ucfirst(__('laravel-crm::lang.organizations')) }} @include('laravel-crm::partials.filters')
+            {{ ucfirst(__('laravel-crm::lang.organizations')) }} @include('laravel-crm::partials.filters', ['action' => route('laravel-crm.organisations.filter')])
         @endslot
 
         @slot('actions')
diff --git a/resources/views/partials/filters.blade.php b/resources/views/partials/filters.blade.php
@@ -1,21 +1,22 @@
-<form method="get" action="{{ url()->current() }}" class="form-inline float-right ml-3">
+<form method="post" action="{{ $action }}" class="form-inline float-right ml-3">
+    @csrf
     <div class="form-row">
-        <div class="col">
+        <div class="col {{ (\VentureDrake\LaravelCrm\Models\Person::filterActive('user_owner_id', \VentureDrake\LaravelCrm\Http\Helpers\SelectOptions\users(false) + [0 => '(Blank)'])) ? 'filter-active' : null }}">
             @include('laravel-crm::partials.filter',[
                 'filter' => $owners ?? null,
                 'name' => 'user_owner_id',
                 'label' => 'owner',
                 'options' => \VentureDrake\LaravelCrm\Http\Helpers\SelectOptions\users(false) + [0 => '(Blank)'],
-                'value' => request()->input('user_owner_id') ?? array_keys(\VentureDrake\LaravelCrm\Http\Helpers\SelectOptions\users(false) + [0 => '(Blank)'])
+                'value' => request()->input('user_owner_id') ?? \VentureDrake\LaravelCrm\Models\Person::filterValue('user_owner_id') ?? array_keys(\VentureDrake\LaravelCrm\Http\Helpers\SelectOptions\optionsFromModel(\VentureDrake\LaravelCrm\Models\Label::all(), false) + [0 => '(Blank)'])
             ])
         </div>
-        <div class="col">
+        <div class="col {{ (\VentureDrake\LaravelCrm\Models\Person::filterActive('label_id', \VentureDrake\LaravelCrm\Http\Helpers\SelectOptions\optionsFromModel(\VentureDrake\LaravelCrm\Models\Label::all(), false) + [0 => '(Blank)'])) ? 'filter-active' : null }}">
             @include('laravel-crm::partials.filter',[
                 'filter' => $labels ?? null,
                 'name' => 'label_id',
                 'label' => 'label',
                 'options' => \VentureDrake\LaravelCrm\Http\Helpers\SelectOptions\optionsFromModel(\VentureDrake\LaravelCrm\Models\Label::all(), false) + [0 => '(Blank)'],
-                'value' => request()->input('label_id') ?? array_keys(\VentureDrake\LaravelCrm\Http\Helpers\SelectOptions\optionsFromModel(\VentureDrake\LaravelCrm\Models\Label::all(), false) + [0 => '(Blank)'])
+                'value' => request()->input('label_id') ?? \VentureDrake\LaravelCrm\Models\Person::filterValue('label_id')  ?? array_keys(\VentureDrake\LaravelCrm\Http\Helpers\SelectOptions\optionsFromModel(\VentureDrake\LaravelCrm\Models\Label::all(), false) + [0 => '(Blank)'])
             ])
         </div>
         <div class="col">
diff --git a/resources/views/people/partials/card-index.blade.php b/resources/views/people/partials/card-index.blade.php
@@ -3,7 +3,7 @@
     @component('laravel-crm::components.card-header')
 
         @slot('title')
-            {{ ucfirst(__('laravel-crm::lang.people')) }} @include('laravel-crm::partials.filters')
+            {{ ucfirst(__('laravel-crm::lang.people')) }} @include('laravel-crm::partials.filters', ['action' => route('laravel-crm.people.filter')])
         @endslot
     
         @slot('actions')
diff --git a/src/Console/LaravelCrmAddressTypes.php b/src/Console/LaravelCrmAddressTypes.php
@@ -6,7 +6,6 @@
 use DB;
 use Illuminate\Console\Command;
 use Illuminate\Support\Composer;
-use Ramsey\Uuid\Uuid;
 
 class LaravelCrmAddressTypes extends Command
 {
diff --git a/src/Http/Controllers/DealController.php b/src/Http/Controllers/DealController.php
@@ -45,7 +45,7 @@ public function __construct(DealService $dealService, PersonService $personServi
      */
     public function index(Request $request)
     {
-        $params = $request->except('_token');
+        $params = Deal::filters($request);
         
         if (Deal::filter($params)->get()->count() < 30) {
             $deals = Deal::filter($params)->latest()->get();
diff --git a/src/Http/Controllers/LeadController.php b/src/Http/Controllers/LeadController.php
@@ -52,7 +52,7 @@ public function __construct(LeadService $leadService, DealService $dealService,
      */
     public function index(Request $request)
     {
-        $params = $request->except('_token');
+        $params = Lead::filters($request);
         
         if (Lead::filter($params)->whereNull('converted_at')->get()->count() < 30) {
             $leads = Lead::filter($params)->whereNull('converted_at')->latest()->get();
diff --git a/src/Http/Controllers/OrganisationController.php b/src/Http/Controllers/OrganisationController.php
@@ -28,7 +28,7 @@ public function __construct(OrganisationService $organisationService)
      */
     public function index(Request $request)
     {
-        $params = $request->except('_token');
+        $params = Organisation::filters($request);
         
         if (Organisation::filter($params)->get()->count() < 30) {
             $organisations = Organisation::filter($params)->latest()->get();
diff --git a/src/Http/Controllers/PersonController.php b/src/Http/Controllers/PersonController.php
@@ -29,7 +29,7 @@ public function __construct(PersonService $personService)
      */
     public function index(Request $request)
     {
-        $params = $request->except('_token');
+        $params = Person::filters($request);
         
         if (Person::filter($params)->get()->count() < 30) {
             $people = Person::filter($params)->latest()->get();
diff --git a/src/Http/routes.php b/src/Http/routes.php
@@ -62,6 +62,10 @@
 /* Leads */
 
 Route::group(['prefix' => 'leads','middleware' => 'auth.laravel-crm'], function () {
+    Route::any('filter', 'VentureDrake\LaravelCrm\Http\Controllers\LeadController@index')
+        ->name('laravel-crm.leads.filter')
+        ->middleware(['can:viewAny,VentureDrake\LaravelCrm\Models\Lead']);
+    
     Route::get('', 'VentureDrake\LaravelCrm\Http\Controllers\LeadController@index')
         ->name('laravel-crm.leads.index')
         ->middleware(['can:viewAny,VentureDrake\LaravelCrm\Models\Lead']);
@@ -108,6 +112,10 @@
 Route::group(['prefix' => 'deals', 'middleware' => 'auth.laravel-crm'], function () {
     Route::get('create-product', 'VentureDrake\LaravelCrm\Http\Controllers\DealProductController@createProduct')
         ->name('laravel-crm.deal-products.create-product');
+
+    Route::any('filter', 'VentureDrake\LaravelCrm\Http\Controllers\DealController@index')
+        ->name('laravel-crm.deals.filter')
+        ->middleware(['can:viewAny,VentureDrake\LaravelCrm\Models\Deal']);
     
     Route::get('', 'VentureDrake\LaravelCrm\Http\Controllers\DealController@index')
         ->name('laravel-crm.deals.index')
@@ -232,6 +240,10 @@
 /* People */
 
 Route::group(['prefix' => 'people', 'middleware' => 'auth.laravel-crm'], function () {
+    Route::any('filter', 'VentureDrake\LaravelCrm\Http\Controllers\PersonController@index')
+        ->name('laravel-crm.people.filter')
+        ->middleware(['can:viewAny,VentureDrake\LaravelCrm\Models\Person']);
+    
     Route::get('', 'VentureDrake\LaravelCrm\Http\Controllers\PersonController@index')
         ->name('laravel-crm.people.index')
         ->middleware(['can:viewAny,VentureDrake\LaravelCrm\Models\Person']);
@@ -263,7 +275,7 @@
     Route::post('search', 'VentureDrake\LaravelCrm\Http\Controllers\PersonController@search')
         ->name('laravel-crm.people.search')
         ->middleware(['can:viewAny,VentureDrake\LaravelCrm\Models\Person']);
-
+    
     Route::get('{person}/autocomplete', 'VentureDrake\LaravelCrm\Http\Controllers\PersonController@autocomplete')
         ->name('laravel-crm.people.autocomplete')
         ->middleware(['can:viewAny,VentureDrake\LaravelCrm\Models\Person']);
@@ -272,6 +284,10 @@
 /* Organisations */
 
 Route::group(['prefix' => 'organisations', 'middleware' => 'auth.laravel-crm'], function () {
+    Route::any('filter', 'VentureDrake\LaravelCrm\Http\Controllers\OrganisationController@index')
+        ->name('laravel-crm.organisations.filter')
+        ->middleware(['can:viewAny,VentureDrake\LaravelCrm\Models\Organisation']);
+    
     Route::get('', 'VentureDrake\LaravelCrm\Http\Controllers\OrganisationController@index')
         ->name('laravel-crm.organisations.index')
         ->middleware(['can:viewAny,VentureDrake\LaravelCrm\Models\Organisation']);
diff --git a/src/LaravelCrmServiceProvider.php b/src/LaravelCrmServiceProvider.php
@@ -208,7 +208,7 @@ function ($perPage = 30, $page = null, $options = []) {
                 LaravelCrmInstall::class,
                 LaravelCrmPermissions::class,
                 LaravelCrmLabels::class,
-                LaravelCrmAddressTypes::class
+                LaravelCrmAddressTypes::class,
             ]);
 
             // Register the model factories
diff --git a/src/Traits/SearchFilters.php b/src/Traits/SearchFilters.php
@@ -10,6 +10,35 @@
  */
 trait SearchFilters
 {
+    public static function filters($request)
+    {
+        if ($request->isMethod('post')) {
+            $request->session()->put(class_basename($request->route()->getAction()['controller']).'.params', $request->except('_token'));
+
+            return $request->except('_token');
+        } elseif ($request->session()->has(class_basename($request->route()->getAction()['controller']).'.params')) {
+            return $request->session()->get(class_basename($request->route()->getAction()['controller']).'.params');
+        }
+        
+        return $request->except('_token');
+    }
+    
+    public static function filterValue($key)
+    {
+        if ($params = request()->session()->get(class_basename(request()->route()->getAction()['controller']).'.params')) {
+            return $params[$key] ?? null;
+        }
+    }
+    
+    public static function filterActive($key, $options)
+    {
+        if ($params = request()->session()->get(class_basename(request()->route()->getAction()['controller']).'.params')) {
+            if (isset($params[$key]) && count($params[$key]) < count($options)) {
+                return true;
+            }
+        }
+    }
+    
     public function scopeFilter($query, $params)
     {
         foreach ($this->filterable as $field) {

Original file line number	Diff line number	Diff line change
`@@ -164,3 +164,8 @@ dt {`
`164`	`164`	`align-items: flex-start !important;`
`165`	`165`	`justify-content: left !important;`
`166`	`166`	`}`
	`167`	`+`
	`168`	`+.filter-active .custom-select{`
	`169`	`+ color: #28a745 !important;`
	`170`	`+ border-color: #28a745 !important;`
	`171`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`use DB;`
`7`	`7`	`use Illuminate\Console\Command;`
`8`	`8`	`use Illuminate\Support\Composer;`
`9`		`-use Ramsey\Uuid\Uuid;`
`10`	`9`
`11`	`10`	`class LaravelCrmAddressTypes extends Command`
`12`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function __construct(DealService $dealService, PersonService $personServi`
`45`	`45`	`*/`
`46`	`46`	`public function index(Request $request)`
`47`	`47`	`{`
`48`		`- $params = $request->except('_token');`
	`48`	`+ $params = Deal::filters($request);`
`49`	`49`
`50`	`50`	`if (Deal::filter($params)->get()->count() < 30) {`
`51`	`51`	`$deals = Deal::filter($params)->latest()->get();`