Skip to content
This repository was archived by the owner on Oct 24, 2025. It is now read-only.

fix: str_contains haystack value fallback #11

Merged
me-marcel merged 1 commit into from
Sep 2, 2025
Merged

fix: str_contains haystack value fallback #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions src/layouts/admin.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb
</h6>
<ul class="nav flex-column">
<li
class="nav-item dropdown show {{ str_contains(Request::route()?->getName(), 'admin.support') ? 'active' : '' }}">
class="nav-item dropdown show {{ str_contains(Request::route()?->getName() ?? '', 'admin.support') ? 'active' : '' }}">
<a class="nav-link dropdown-toggle" href="#" id="dropdown04" data-toggle="dropdown"
aria-expanded="false" title="{{ __('interface.misc.support') }}">
<div>
Expand Down Expand Up @@ -159,15 +159,15 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb
</h6>
<ul class="nav flex-column">
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.customers') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'admin.customers') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('admin.customers') }}"
title="{{ __('interface.misc.customers') }}" data-toggle="tooltip">
<i class="bi bi-person"></i>
<span>{{ __('interface.misc.customers') }}</span>
</a>
</li>
<li
class="nav-item dropdown show {{ str_contains(Request::route()?->getName(), 'admin.invoices.customers') ? 'active' : '' }}">
class="nav-item dropdown show {{ str_contains(Request::route()?->getName() ?? '', 'admin.invoices.customers') ? 'active' : '' }}">
<a class="nav-link dropdown-toggle" href="#" id="dropdown04" data-toggle="dropdown"
aria-expanded="false" title="{{ __('interface.misc.invoices') }}">
<div>
Expand All @@ -194,7 +194,7 @@ class="nav-item dropdown show {{ str_contains(Request::route()?->getName(), 'adm
</div>
</li>
<li
class="nav-item dropdown show {{ (str_contains(Request::route()?->getName(), 'admin.contracts') ? 'active' : '') || (str_contains(Request::route()?->getName(), 'admin.discounts') ? 'active' : '') }}">
class="nav-item dropdown show {{ (str_contains(Request::route()?->getName() ?? '', 'admin.contracts') ? 'active' : '') || (str_contains(Request::route()?->getName() ?? '', 'admin.discounts') ? 'active' : '') }}">
<a class="nav-link dropdown-toggle" href="#" id="dropdown04" data-toggle="dropdown"
aria-expanded="false" title="{{ __('interface.misc.contracts') }}">
<div>
Expand All @@ -218,7 +218,7 @@ class="nav-item dropdown show {{ (str_contains(Request::route()?->getName(), 'ad
</div>
</li>
<li
class="nav-item dropdown show {{ str_contains(Request::route()?->getName(), 'admin.shop') ? 'active' : '' }}">
class="nav-item dropdown show {{ str_contains(Request::route()?->getName() ?? '', 'admin.shop') ? 'active' : '' }}">
<a class="nav-link dropdown-toggle" href="#" id="dropdown04" data-toggle="dropdown"
aria-expanded="false" title="{{ __('interface.misc.shop') }}">
<div>
Expand Down Expand Up @@ -257,15 +257,15 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb
</h6>
<ul class="nav flex-column">
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.suppliers') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'admin.suppliers') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('admin.suppliers') }}"
title="{{ __('interface.misc.suppliers') }}" data-toggle="tooltip">
<i class="bi bi-person"></i>
<span>{{ __('interface.misc.suppliers') }}</span>
</a>
</li>
<li
class="nav-item dropdown show {{ str_contains(Request::route()?->getName(), 'admin.invoices.suppliers') ? 'active' : '' }}">
class="nav-item dropdown show {{ str_contains(Request::route()?->getName() ?? '', 'admin.invoices.suppliers') ? 'active' : '' }}">
<a class="nav-link dropdown-toggle" href="#" id="dropdown04" data-toggle="dropdown"
aria-expanded="false" title="{{ __('interface.misc.invoices') }}">
<div>
Expand Down Expand Up @@ -299,7 +299,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb
<ul class="nav flex-column">
@if (Auth::user()->role == 'admin')
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.employees') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'admin.employees') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('admin.employees') }}"
title="{{ __('interface.misc.employees') }}" data-toggle="tooltip">
<i class="bi bi-person"></i>
Expand All @@ -308,15 +308,15 @@ class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.employees')
</li>
@endif
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.pages') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'admin.pages') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('admin.pages') }}"
title="{{ __('interface.misc.custom_pages') }}" data-toggle="tooltip">
<i class="bi bi-list"></i>
<span>{{ __('interface.misc.custom_pages') }}</span>
</a>
</li>
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.filemanager') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'admin.filemanager') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('admin.filemanager') }}"
title="{{ __('interface.misc.file_manager') }}" data-toggle="tooltip">
<i class="bi bi-folder"></i>
Expand All @@ -332,23 +332,23 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb
<ul class="nav flex-column">
@if (Auth::user()->role == 'admin')
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.settings') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'admin.settings') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('admin.settings') }}"
title="{{ __('interface.misc.parameters') }}" data-toggle="tooltip">
<i class="bi bi-gear-wide-connected"></i>
<span>{{ __('interface.misc.parameters') }}</span>
</a>
</li>
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.paymentgateways') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'admin.paymentgateways') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('admin.paymentgateways') }}"
title="{{ __('interface.misc.payment_gateways') }}" data-toggle="tooltip">
<i class="bi bi-currency-euro"></i>
<span>{{ __('interface.misc.payment_gateways') }}</span>
</a>
</li>
<li
class="nav-item dropdown show {{ str_contains(Request::route()?->getName(), 'admin.api.users') ? 'active' : '' }}">
class="nav-item dropdown show {{ str_contains(Request::route()?->getName() ?? '', 'admin.api.users') ? 'active' : '' }}">
<a class="nav-link dropdown-toggle" href="#" id="dropdown04"
data-toggle="dropdown" aria-expanded="false"
title="{{ __('interface.misc.api') }}">
Expand All @@ -369,7 +369,7 @@ class="nav-item dropdown show {{ str_contains(Request::route()?->getName(), 'adm
</li>
@if (empty(request()->get('tenant')))
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'admin.tenants') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'admin.tenants') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('admin.tenants') }}"
title="{{ __('interface.misc.tenants') }}" data-toggle="tooltip">
<i class="bi bi-people"></i>
Expand Down
10 changes: 5 additions & 5 deletions src/layouts/customer.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt
<span>{{ __('interface.misc.dashboard') }}</span>
</a>
</li>
<li class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.support') ? 'active' : '' }}"
<li class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.support') ? 'active' : '' }}"
data-toggle="tooltip">
<a class="nav-link" href="{{ route('customer.support') }}"
title="{{ __('interface.misc.tickets') }}">
Expand All @@ -114,15 +114,15 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt
</a>
</li>
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.contracts') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.contracts') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('customer.contracts') }}"
title="{{ __('interface.misc.contracts') }}" data-toggle="tooltip">
<i class="bi bi-file-earmark-text-fill"></i>
<span>{{ __('interface.misc.contracts') }}</span>
</a>
</li>
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.invoices') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.invoices') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('customer.invoices') }}"
title="{{ __('interface.misc.invoices') }}" data-toggle="tooltip">
<i class="bi bi-file-earmark-text">
Expand All @@ -136,7 +136,7 @@ class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.invoices
</a>
</li>
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.orders') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.orders') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('customer.shop.orders') }}"
title="{{ __('interface.misc.orders') }}" data-toggle="tooltip">
<i class="bi bi-cart-fill"></i>
Expand Down Expand Up @@ -168,7 +168,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt
</h6>
<ul class="nav flex-column">
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'public.shop') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'public.shop') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('public.shop') }}"
title="{{ __('interface.actions.browse') }}" data-toggle="tooltip">
<i class="bi bi-arrow-right"></i>
Expand Down
10 changes: 5 additions & 5 deletions src/layouts/public.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt
</a>
</li>
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.support') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.support') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('customer.support') }}"
title="{{ __('interface.misc.tickets') }}" data-toggle="tooltip">
<i class="bi bi-ticket-fill">
Expand All @@ -123,15 +123,15 @@ class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.support'
</a>
</li>
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.contracts') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.contracts') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('customer.contracts') }}"
title="{{ __('interface.misc.contracts') }}" data-toggle="tooltip">
<i class="bi bi-file-earmark-text-fill"></i>
<span>{{ __('interface.misc.contracts') }}</span>
</a>
</li>
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.invoices') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.invoices') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('customer.invoices') }}"
title="{{ __('interface.misc.invoices') }}" data-toggle="tooltip">
<i class="bi bi-file-earmark-text">
Expand All @@ -145,7 +145,7 @@ class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.invoices
</a>
</li>
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'customer.orders') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.orders') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('customer.shop.orders') }}"
title="{{ __('interface.misc.orders') }}" data-toggle="tooltip">
<i class="bi bi-cart-fill"></i>
Expand Down Expand Up @@ -178,7 +178,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb
</h6>
<ul class="nav flex-column">
<li
class="nav-item {{ str_contains(Request::route()?->getName(), 'public.shop') ? 'active' : '' }}">
class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'public.shop') ? 'active' : '' }}">
<a class="nav-link" href="{{ route('public.shop') }}"
title="{{ __('interface.actions.browse') }}" data-toggle="tooltip">
<i class="bi bi-arrow-right"></i>
Expand Down