Return to search results button and browser back button supported

andrewdrake · andrewdrake · commit a690c5713b40 · 2022-12-10T20:42:14.000+11:00
diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
@@ -299,4 +299,5 @@
     'accepted' => 'accepted',
     'rejected' => 'rejected',
     'note_deleted' => 'note deleted',
+    'back_to_search_results' => 'back to search results',
 ];
diff --git a/resources/views/deals/partials/card-create.blade.php b/resources/views/deals/partials/card-create.blade.php
@@ -9,7 +9,10 @@
             @endslot
 
             @slot('actions')
-                <span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.deals.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_deals')) }}</a></span>
+                @include('laravel-crm::partials.return-button',[
+                    'model' => new \VentureDrake\LaravelCrm\Models\Deal(),
+                    'route' => 'deals'
+                ])
             @endslot
 
         @endcomponent
diff --git a/resources/views/deals/partials/card-edit.blade.php b/resources/views/deals/partials/card-edit.blade.php
@@ -10,7 +10,10 @@
             @endslot
 
             @slot('actions')
-                <span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.deals.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_deals')) }}</a></span>
+                @include('laravel-crm::partials.return-button',[
+                    'model' => $deal,
+                    'route' => 'deals'
+                ])
             @endslot
 
         @endcomponent
diff --git a/resources/views/deals/partials/card-show.blade.php b/resources/views/deals/partials/card-show.blade.php
@@ -8,7 +8,10 @@
 
         @slot('actions')
             <span class="float-right">
-                <a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.deals.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_deals')) }}</a> | 
+                @include('laravel-crm::partials.return-button',[
+                    'model' => $deal,
+                    'route' => 'deals'
+                ]) | 
                 @can('edit crm deals')
                 @if(!$deal->closed_at)
                     <a href="{{  route('laravel-crm.deals.won',$deal) }}" class="btn btn-success btn-sm">{{ ucfirst(__('laravel-crm::lang.won')) }}</a>
diff --git a/resources/views/layouts/partials/search.blade.php b/resources/views/layouts/partials/search.blade.php
@@ -1,4 +1,4 @@
-<form role="search" method="post" action="@php
+<form role="search" method="get" action="@php
 
      if(strpos(Route::currentRouteName(), 'laravel-crm.leads') === 0 && auth()->user()->can('view crm leads')){
         echo url(route('laravel-crm.leads.search'));
@@ -52,7 +52,7 @@
     @csrf
     <input type="hidden" name="type" value="{!! Route::current()->getName() !!}">
     <div class="input-group">
-        <input type="text" class="form-control" name="search" aria-label="Search" value="{{ old('search') ?? Request::input('search') }}">
+        <input type="text" class="form-control" name="search" aria-label="Search" value="{{ old('search') ?? Request::input('search') ?? $searchValue ?? null }}">
         <div class="input-group-append">
             <button class="btn btn-outline-secondary" type="submit"><i class="fa fa-search"></i> <span class="action-current">{{ $currentAction ?? ucfirst(__('laravel-crm::lang.leads')) }}</span></button>
             <button class="btn btn-outline-secondary dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
diff --git a/resources/views/leads/partials/card-create.blade.php b/resources/views/leads/partials/card-create.blade.php
@@ -9,7 +9,10 @@
             @endslot
 
             @slot('actions')
-                <span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.leads.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_leads')) }}</a></span>
+                @include('laravel-crm::partials.return-button',[
+                    'model' => new \VentureDrake\LaravelCrm\Models\Lead(),
+                    'route' => 'leads'
+                ])
             @endslot
 
         @endcomponent
diff --git a/resources/views/leads/partials/card-edit.blade.php b/resources/views/leads/partials/card-edit.blade.php
@@ -10,7 +10,10 @@
             @endslot
 
             @slot('actions')
-                <span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.leads.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_leads')) }}</a></span>
+                @include('laravel-crm::partials.return-button',[
+                   'model' => $lead,
+                   'route' => 'leads'
+               ])
             @endslot
 
         @endcomponent
diff --git a/resources/views/leads/partials/card-show.blade.php b/resources/views/leads/partials/card-show.blade.php
@@ -8,7 +8,10 @@
 
         @slot('actions')
             <span class="float-right">
-                <a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.leads.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_leads')) }}</a> | 
+                @include('laravel-crm::partials.return-button',[
+                    'model' => $lead,
+                    'route' => 'leads'
+                ]) | 
                 @can('edit crm leads')
                 <a href="{{ route('laravel-crm.leads.convert-to-deal',$lead) }}" class="btn btn-success btn-sm">{{ ucfirst(__('laravel-crm::lang.convert')) }}</a>
                 @endcan
diff --git a/resources/views/orders/partials/card-create.blade.php b/resources/views/orders/partials/card-create.blade.php
@@ -9,7 +9,10 @@
             @endslot
 
             @slot('actions')
-                <span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.orders.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_orders')) }}</a></span>
+                @include('laravel-crm::partials.return-button',[
+                    'model' => new \VentureDrake\LaravelCrm\Models\Order(),
+                    'route' => 'orders'
+                ])
             @endslot
 
         @endcomponent
diff --git a/resources/views/orders/partials/card-edit.blade.php b/resources/views/orders/partials/card-edit.blade.php
@@ -10,7 +10,10 @@
             @endslot
 
             @slot('actions')
-                <span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.orders.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_orders')) }}</a></span>
+                @include('laravel-crm::partials.return-button',[
+                    'model' => $order,
+                    'route' => 'orders'
+                ])
             @endslot
 
         @endcomponent
diff --git a/resources/views/orders/partials/card-show.blade.php b/resources/views/orders/partials/card-show.blade.php
@@ -8,13 +8,16 @@
 
         @slot('actions')
             <span class="float-right">
-                <a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.orders.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_orders')) }}</a> | 
+                @include('laravel-crm::partials.return-button',[
+                    'model' => $order,
+                    'route' => 'orders'
+                ]) | 
                 @can('edit crm orders')
                 @if(!$order->closed_at)
-                    <a href="{{  route('laravel-crm.orders.won',$order) }}" class="btn btn-success btn-sm">{{ ucfirst(__('laravel-crm::lang.won')) }}</a>
-                    <a href="{{  route('laravel-crm.orders.lost',$order) }}" class="btn btn-danger btn-sm">{{ ucfirst(__('laravel-crm::lang.lost')) }}</a>
+                    <a href="{{ route('laravel-crm.orders.won',$order) }}" class="btn btn-success btn-sm">{{ ucfirst(__('laravel-crm::lang.won')) }}</a>
+                    <a href="{{ route('laravel-crm.orders.lost',$order) }}" class="btn btn-danger btn-sm">{{ ucfirst(__('laravel-crm::lang.lost')) }}</a>
                 @else
-                    <a href="{{  route('laravel-crm.orders.reopen',$order) }}" class="btn btn-outline-secondary btn-sm">{{ ucfirst(__('laravel-crm::lang.reopen')) }}</a>
+                    <a href="{{ route('laravel-crm.orders.reopen',$order) }}" class="btn btn-outline-secondary btn-sm">{{ ucfirst(__('laravel-crm::lang.reopen')) }}</a>
                 @endif
                 @endcan
                 @include('laravel-crm::partials.navs.activities') |
diff --git a/resources/views/organisations/partials/card-create.blade.php b/resources/views/organisations/partials/card-create.blade.php
@@ -9,7 +9,10 @@
             @endslot
 
             @slot('actions')
-                <span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.organisations.index')) }}"><span class="fa fa-angle-double-left"></span>  {{ ucfirst(__('laravel-crm::lang.back_to_organizations')) }}</a></span>
+                @include('laravel-crm::partials.return-button',[
+                    'model' => new \VentureDrake\LaravelCrm\Models\Organisation(),
+                    'route' => 'organisations'
+                ])
             @endslot
 
         @endcomponent
diff --git a/resources/views/organisations/partials/card-edit.blade.php b/resources/views/organisations/partials/card-edit.blade.php
@@ -10,7 +10,10 @@
             @endslot
 
             @slot('actions')
-                <span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.organisations.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_organizations')) }}</a></span>
+                @include('laravel-crm::partials.return-button',[
+                    'model' => $organisation,
+                    'route' => 'organisations'
+                ])
             @endslot
 
         @endcomponent
diff --git a/resources/views/organisations/partials/card-show.blade.php b/resources/views/organisations/partials/card-show.blade.php
@@ -10,7 +10,10 @@
 
         @slot('actions')
             <span class="float-right">
-                <a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.organisations.index')) }}"><span class="fa fa-angle-double-left"></span>  {{ ucfirst(__('laravel-crm::lang.back_to_organizations')) }}</a> | 
+                @include('laravel-crm::partials.return-button',[
+                    'model' => $organisation,
+                    'route' => 'organisations'
+                ]) | 
                 @can('create crm deals')
                 <a href="{{ url(route('laravel-crm.deals.create',['model' => 'organisation', 'id' => $organisation->id])) }}" alt="Add deal" class="btn btn-success btn-sm"><span class="fa fa-plus" aria-hidden="true"></span> {{ ucfirst(__('laravel-crm::lang.add_new_deal')) }}</a>
                 @endcan
diff --git a/resources/views/partials/return-button.blade.php b/resources/views/partials/return-button.blade.php
@@ -0,0 +1,5 @@
+@if($model->searchValue(request()))
+<a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.'.$route.'.search')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_search_results')) }}</a>
+@else    
+<a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.'.$route.'.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_'.$route)) }}</a>
+@endif    
diff --git a/resources/views/people/partials/card-create.blade.php b/resources/views/people/partials/card-create.blade.php
@@ -9,7 +9,10 @@
             @endslot
 
             @slot('actions')
-                    <span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.people.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_people')) }}</a></span>
+                @include('laravel-crm::partials.return-button',[
+                    'model' => new \VentureDrake\LaravelCrm\Models\Person(),
+                    'route' => 'people'
+                ])
             @endslot
 
         @endcomponent
diff --git a/resources/views/people/partials/card-edit.blade.php b/resources/views/people/partials/card-edit.blade.php
@@ -10,7 +10,10 @@
             @endslot
 
             @slot('actions')
-                    <span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.people.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_people')) }}</a></span>
+                @include('laravel-crm::partials.return-button',[
+                    'model' => $person,
+                    'route' => 'people'
+                ])
             @endslot
 
         @endcomponent
diff --git a/resources/views/people/partials/card-show.blade.php b/resources/views/people/partials/card-show.blade.php
@@ -10,7 +10,10 @@
 
         @slot('actions')
             <span class="float-right">
-                <a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.people.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_people')) }}</a> | 
+                @include('laravel-crm::partials.return-button',[
+                    'model' => $person,
+                    'route' => 'people'
+                ]) | 
                 @can('create crm deals')
                 <a href="{{ url(route('laravel-crm.deals.create',['model' => 'person', 'id' => $person->id])) }}" alt="Add deal" class="btn btn-success btn-sm"><span class="fa fa-plus" aria-hidden="true"></span> {{ ucfirst(__('laravel-crm::lang.add_new_deal')) }}</a>
                 @endcan
diff --git a/resources/views/products/partials/card-create.blade.php b/resources/views/products/partials/card-create.blade.php
@@ -9,7 +9,10 @@
             @endslot
 
             @slot('actions')
-                    <span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.products.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_products')) }}</a></span>
+                @include('laravel-crm::partials.return-button',[
+                    'model' => new \VentureDrake\LaravelCrm\Models\Product(),
+                    'route' => 'products'
+                ])
             @endslot
 
         @endcomponent
diff --git a/resources/views/products/partials/card-edit.blade.php b/resources/views/products/partials/card-edit.blade.php
@@ -10,7 +10,10 @@
             @endslot
 
             @slot('actions')
-                    <span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.products.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_products')) }}</a></span>
+                @include('laravel-crm::partials.return-button',[
+                    'model' => $product,
+                    'route' => 'products'
+                ])
             @endslot
 
         @endcomponent
diff --git a/resources/views/products/partials/card-show.blade.php b/resources/views/products/partials/card-show.blade.php
@@ -9,7 +9,10 @@
         @slot('actions')
 
             <span class="float-right">
-                <a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.products.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_products')) }}</a> |
+                @include('laravel-crm::partials.return-button',[
+                    'model' => $product,
+                    'route' => 'products'
+                ]) | 
                 @can('edit crm products')
                 <a href="{{ url(route('laravel-crm.products.edit', $product)) }}" type="button" class="btn btn-outline-secondary btn-sm"><span class="fa fa-edit" aria-hidden="true"></span></a>
                 @endcan
diff --git a/resources/views/quotes/partials/card-create.blade.php b/resources/views/quotes/partials/card-create.blade.php
@@ -9,7 +9,10 @@
             @endslot
 
             @slot('actions')
-                <span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.quotes.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_quotes')) }}</a></span>
+                @include('laravel-crm::partials.return-button',[
+                    'model' => new \VentureDrake\LaravelCrm\Models\Quote(),
+                    'route' => 'quotes'
+                ])
             @endslot
 
         @endcomponent
diff --git a/resources/views/quotes/partials/card-edit.blade.php b/resources/views/quotes/partials/card-edit.blade.php
@@ -10,7 +10,10 @@
             @endslot
 
             @slot('actions')
-                <span class="float-right"><a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.quotes.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_quotes')) }}</a></span>
+                @include('laravel-crm::partials.return-button',[
+                    'model' => $quote,
+                    'route' => 'quotes'
+                ])
             @endslot
 
         @endcomponent
diff --git a/resources/views/quotes/partials/card-show.blade.php b/resources/views/quotes/partials/card-show.blade.php
@@ -8,8 +8,11 @@
 
         @slot('actions')
             <span class="float-right">
-                <a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.quotes.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_quotes')) }}</a> 
-                @can('edit crm quotes') |
+                @include('laravel-crm::partials.return-button',[
+                    'model' => $quote,
+                    'route' => 'quotes'
+                ]) | 
+                @can('edit crm quotes')
                     @livewire('send-quote',[
                     'quote' => $quote
                     ])
diff --git a/src/Http/Controllers/DealController.php b/src/Http/Controllers/DealController.php
@@ -45,6 +45,7 @@ public function __construct(DealService $dealService, PersonService $personServi
      */
     public function index(Request $request)
     {
+        Deal::resetSearchValue($request);
         $params = Deal::filters($request);
         
         if (Deal::filter($params)->get()->count() < 30) {
@@ -207,7 +208,7 @@ public function destroy(Deal $deal)
 
     public function search(Request $request)
     {
-        $searchValue = $request->search;
+        $searchValue = Deal::searchValue($request);
         
         if (! $searchValue || trim($searchValue) == '') {
             return redirect(route('laravel-crm.deals.index'));
@@ -246,6 +247,7 @@ public function search(Request $request)
 
         return view('laravel-crm::deals.index', [
             'deals' => $deals,
+            'searchValue' => $searchValue ?? null,
         ]);
     }
     
diff --git a/src/Http/Controllers/LeadController.php b/src/Http/Controllers/LeadController.php
@@ -52,6 +52,7 @@ public function __construct(LeadService $leadService, DealService $dealService,
      */
     public function index(Request $request)
     {
+        Lead::resetSearchValue($request);
         $params = Lead::filters($request);
         
         if (Lead::filter($params)->whereNull('converted_at')->get()->count() < 30) {
@@ -187,7 +188,7 @@ public function destroy(Lead $lead)
 
     public function search(Request $request)
     {
-        $searchValue = $request->search;
+        $searchValue = Lead::searchValue($request);
         
         if (! $searchValue || trim($searchValue) == '') {
             return redirect(route('laravel-crm.leads.index'));
@@ -226,6 +227,7 @@ public function search(Request $request)
 
         return view('laravel-crm::leads.index', [
             'leads' => $leads,
+            'searchValue' => $searchValue ?? null,
         ]);
     }
 
diff --git a/src/Http/Controllers/OrderController.php b/src/Http/Controllers/OrderController.php
@@ -45,6 +45,7 @@ public function __construct(OrderService $orderService, PersonService $personSer
      */
     public function index(Request $request)
     {
+        Order::resetSearchValue($request);
         /*$params = Order::filters($request);
 
         if (Order::filter($params)->get()->count() < 30) {
@@ -207,7 +208,7 @@ public function destroy(Order $order)
 
     public function search(Request $request)
     {
-        $searchValue = $request->search;
+        $searchValue = Order::searchValue($request);
         
         if (! $searchValue || trim($searchValue) == '') {
             return redirect(route('laravel-crm.orders.index'));
@@ -246,6 +247,7 @@ public function search(Request $request)
 
         return view('laravel-crm::orders.index', [
             'orders' => $orders,
+            'searchValue' => $searchValue ?? null,
         ]);
     }
     
diff --git a/src/Http/Controllers/OrganisationController.php b/src/Http/Controllers/OrganisationController.php
@@ -28,6 +28,7 @@ public function __construct(OrganisationService $organisationService)
      */
     public function index(Request $request)
     {
+        Organisation::resetSearchValue($request);
         $params = Organisation::filters($request);
         $organisations = Organisation::filter($params);
 
@@ -157,7 +158,7 @@ public function destroy(Organisation $organisation)
 
     public function search(Request $request)
     {
-        $searchValue = $request->search;
+        $searchValue = Organisation::searchValue($request);
 
         if (! $searchValue || trim($searchValue) == '') {
             return redirect(route('laravel-crm.organisations.index'));
@@ -175,6 +176,7 @@ public function search(Request $request)
 
         return view('laravel-crm::organisations.index', [
             'organisations' => $organisations,
+            'searchValue' => $searchValue ?? null,
         ]);
     }
 
diff --git a/src/Http/Controllers/PersonController.php b/src/Http/Controllers/PersonController.php
diff --git a/src/Http/Controllers/QuoteController.php b/src/Http/Controllers/QuoteController.php
diff --git a/src/Http/routes.php b/src/Http/routes.php
diff --git a/src/Traits/SearchFilters.php b/src/Traits/SearchFilters.php
