Merge branch 'trunk'

This commit is contained in:
Vincent BRIDIER 2022-12-14 07:48:35 +01:00
commit 262ea2871c
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
2 changed files with 4 additions and 3 deletions

View file

@ -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

View file

@ -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>