Skip to content
This repository was archived by the owner on Oct 24, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions src/customer/accept.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
@csrf
@if ($acceptable->isNotEmpty())
@foreach ($acceptable as $accept)
<div class="form-group row">
<div class="col-md-1">
<input id="accept_{{ $accept->id }}" type="checkbox" class="form-control"
<div class="form-group bg-white shadow-sm rounded py-2 px-3">
<div class="form-group d-flex align-items-center form-group--gapped mb-0">
<div>
<input id="accept_{{ $accept->id }}" type="checkbox" class="form-control d-flex align-items-center"
name="accept_{{ $accept->id }}" value="true">
</div>

<label for="accept_{{ $accept->id }}"
class="col-md-11 col-form-label">{!! __('interface.misc.accept_notice', [
class="col-form-label p-0">{!! __('interface.misc.accept_notice', [
'link' =>
'<a href="' .
(Route::has($accept->route) ? route($accept->route) : $accept->route) .
Expand All @@ -25,6 +26,7 @@ class="col-md-11 col-form-label">{!! __('interface.misc.accept_notice', [
'date' => $accept->latest->created_at->format('d.m.Y, H:i'),
]) !!}</label>
</div>
</div>
@endforeach
<button type="submit" class="btn btn-primary"><i class="bi bi-check-circle"></i>
{{ __('interface.actions.accept_and_continue') }}</button>
Expand Down
11 changes: 9 additions & 2 deletions src/customer/shop/category.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@section('content')
<div class="container-fluid my-4">
@if (! empty($category))
<div class="row">
<div class="row mb-4">
<div class="col-md-12">
<div class="row">
<div class="col-md-12">
Expand All @@ -20,7 +20,7 @@
</div>
</div>
@else
<div class="row">
<div class="row mb-4">
<div class="col-md-12">
<div class="row">
<div class="col-md-12">
Expand Down Expand Up @@ -57,6 +57,13 @@
<i class="bi bi-exclamation-triangle"></i>
@if ($user->role == 'customer')
{{ __('interface.misc.missing_data_notice') }}
@if (Request::route()?->getName() !== 'customer.profile')
<br>
<br>
<a href="{{ route('customer.profile') }}"
class="btn btn-primary"><i class="bi bi-pencil-square"></i>
{{ __('interface.actions.complete_now') }}</a>
@endif
@else
{{ __('interface.misc.order_role_missing_hint') }}
@endif
Expand Down
6 changes: 3 additions & 3 deletions src/customer/shop/form.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,9 @@
<div class="row">
<div class="col-md-12">
<div class="form-group bg-white border rounded py-2 px-3">
<div class="row">
<div class="col-md-2">
<input id="accept_{{ $accept->id }}" type="checkbox" class="form-control" name="accept_{{ $accept->id }}" value="true">
<div class="form-group d-flex align-items-center form-group--gapped mb-0">
<div>
<input id="accept_{{ $accept->id }}" type="checkbox" class="form-control d-flex align-items-center" name="accept_{{ $accept->id }}" value="true">
</div>

<label for="accept_{{ $accept->id }}" class="col-md-10 col-form-label">{!! __('interface.misc.accept_notice', ['link' => '<a href="' . (Route::has($accept->route) ? route($accept->route) : $accept->route) . '" target="_blank">' . __($accept->title) . '</a>', 'date' => $accept->latest->created_at->format('d.m.Y, H:i')]) !!} *</label>
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/admin.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt
</a>
</li>
</ul>
@if (!empty(request()->get('service_products')))
@if (!empty(request()->get('service_products')) && request()->get('service_products')->isNotEmpty())
<h6
class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb-2 mt-3 text-primary">
<span>{{ __('interface.misc.products') }}</span>
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/customer.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.or
</a>
</li>
</ul>
@if (!empty(request()->get('service_products')))
@if (!empty(request()->get('service_products')) && request()->get('service_products')->isNotEmpty())
<h6
class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb-2 mt-3 text-primary">
<span>{{ __('interface.misc.products') }}</span>
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/public.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ class="nav-item {{ str_contains(Request::route()?->getName() ?? '', 'customer.or
</a>
</li>
</ul>
@if (!empty(request()->get('service_products')))
@if (!empty(request()->get('service_products')) && request()->get('service_products')->isNotEmpty())
<h6
class="sidebar-heading d-flex justify-content-between align-items-center px-3 mb-2 {{ !empty(Auth::user()) ? 'mt-3' : '' }} text-primary">
<span>{{ __('interface.misc.products') }}</span>
Expand Down