From 4873cd7fc2fb5187f9fa0614c38a36aa222d6d27 Mon Sep 17 00:00:00 2001
From: Olivier Legat <olivier.legat@ldc.fr>
Date: Tue, 13 Dec 2022 13:52:02 +0100
Subject: [PATCH] fix todays orders localise sorting to current route

---
 resources/views/bo/modules/sorter.blade.php | 4 ++--
 resources/views/bo/orders/index.blade.php   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/resources/views/bo/modules/sorter.blade.php b/resources/views/bo/modules/sorter.blade.php
index bcdad27..8b11cf6 100644
--- a/resources/views/bo/modules/sorter.blade.php
+++ b/resources/views/bo/modules/sorter.blade.php
@@ -1,6 +1,6 @@
 @if(!session($list.'.sort_way') or session($list.'.sort_col') !== $colname or (session($list.'.sort_way') === 'desc' and session($list.'.sort_col') === $colname))
-<a class="col_sort text-secondary lead asc" href="{{ route('bo.orders', ['sort_col' => $colname, 'sort_way' => 'asc']) }}">&nbsp;&darr;&nbsp;</a>
+<a class="col_sort text-secondary lead asc" href="{{ route(Route::currentRouteName(), ['sort_col' => $colname, 'sort_way' => 'asc']) }}">&nbsp;&darr;&nbsp;</a>
 @endif
 @if(!session($list.'.sort_way') or session($list.'.sort_col') !== $colname or (session($list.'.sort_way') === 'asc' and session($list.'.sort_col') === $colname))
-<a class="col_sort text-secondary lead desc" href="{{ route('bo.orders', ['sort_col' => $colname, 'sort_way' => 'desc']) }}">&nbsp;&uarr;&nbsp;</a>
+<a class="col_sort text-secondary lead desc" href="{{ route(Route::currentRouteName(), ['sort_col' => $colname, 'sort_way' => 'desc']) }}">&nbsp;&uarr;&nbsp;</a>
 @endif
diff --git a/resources/views/bo/orders/index.blade.php b/resources/views/bo/orders/index.blade.php
index e74b4ce..1a4d045 100644
--- a/resources/views/bo/orders/index.blade.php
+++ b/resources/views/bo/orders/index.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="d-flex flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
         <h1 class="h2 pe-5">{{ __('Commandes') }} @if (isset($today)) <br>{{ __('à retirer aujourd\'hui') }} @endif</h1>
-
+        @if (!isset($today))
         <form method="GET">
             <div class="row">
                 <div class="col-6">
@@ -47,6 +47,7 @@
                 </div>
             </div>
         </form>
+        @endif
 
         @if (session('success'))
             <span class="float-center text-success ms-3">{{ session('success') }}</span>