sifatbaho/sifatbaho-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uppercese category qoshildi

Browse Source
This commit is contained in:
husanjon
2026-04-06 20:23:17 +05:00
parent 551dcb390c
commit 4d0f9b6309
27 changed files with 236 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
resources/views/auto/edit.blade.php
View File

@@ -17,7 +17,7 @@
validate>
@csrf
@method('put')
<input type="hidden" name="status" value="{{ App\Enums\OrderStatusEnum::DRAFT->name }}">
<input type="hidden" name="status" value="{{ $order->status }}">
<div class="row">
<div class="col-lg-8">
<div class="card">
@@ -67,7 +67,7 @@
id="choices-purpose-input" tabindex="3">
@foreach($purposeCases as $purposeItem)
<option value="{{ $purposeItem->id }}"
@if(old('purpose_id') == $purposeItem->id)selected @endif>
@if((old('purpose_id') ?? $order->purpose_id) == $purposeItem->id)selected @endif>
{{ $purposeItem->{str_replace('_', '-', app()->getLocale())} }}
</option>
@endforeach
@@ -290,7 +290,7 @@
id="choose-order-car-category" name="car_category" tabindex="10">
@foreach ($concerns as $concern)
<option value="{{ $concern->id }}"
{{ $concern->car_category == $concern->id ? 'selected' : '' }}>
{{ (old('car_category') ?? $order->car_category) == $concern->id ? 'selected' : '' }}>
@lang($concern->{str_replace('_', '-', app()->getLocale())})
</option>
@endforeach
@@ -500,11 +500,11 @@
@lang('translation.select-diller')
</label>
<select data-choices data-choices-search-false data-choices-multiple-groups="false"
name="diller" class="form-select @error('diller') is-invalid @enderror"
name="diller_id" class="form-select @error('diller_id') is-invalid @enderror"
id="choices-diller-input"
tabindex="23">
@foreach($dillers as $diller)
<option value="{{ $diller->id}}" @if($order->diller== $diller->id) selected @endif>
<option value="{{ $diller->id}}" @if((old('diller_id') ?? $order->diller_id) == $diller->id) selected @endif>
{{ $diller->name }}
</option>
@endforeach

20
resources/views/auto/show.blade.php
View File

@@ -121,14 +121,22 @@
{{ __('translation.conclusions') }}
</h4>
<div class="flex-shrink-0">
@if(in_array($order->status,[\App\Enums\OrderStatusEnum::STARTED->name,\App\Enums\OrderStatusEnum::REJECTED->name])&& $isAppraisers)
@if(in_array($order->status,[\App\Enums\OrderStatusEnum::STARTED->name,\App\Enums\OrderStatusEnum::REJECTED->name, \App\Enums\OrderStatusEnum::FINISHED->name]) || in_array(Auth::user()?->role, ['admin', \App\Enums\RoleEnum::MANAGER->name]))
<a href="{{ route('auto.generate_pdf', $order->id) }}"
target="_blank"
class="btn btn-soft-success btn-sm me-1">
<i class="ri-download-2-line me-1 align-bottom"></i>
Tayyor xulosani yuklab olish
</a>
@endif
@if(in_array($order->status,[\App\Enums\OrderStatusEnum::STARTED->name,\App\Enums\OrderStatusEnum::REJECTED->name]) && ($isAppraisers || in_array(Auth::user()?->role, ['admin', \App\Enums\RoleEnum::MANAGER->name])))
<a href="{{ route('conclusion.add', ['id' => $order->id,'type'=>\App\Enums\OrderTypeEnum::AUTO->name]) }}"
type="button" class="btn btn-soft-info btn-sm">
<i class="ri-upload-2-fill me-1 align-bottom"></i>
{{ __('translation.upload') }}
</a>
@endif
@if($order->status == \App\Enums\OrderStatusEnum::FINISHED->name && in_array(Auth::user()->role,['admin',\App\Enums\RoleEnum::MANAGER->name]))
@if($order->status == \App\Enums\OrderStatusEnum::FINISHED->name && in_array(Auth::user()?->role,['admin',\App\Enums\RoleEnum::MANAGER->name]))
<button type="button" class="btn btn-soft-info btn-sm"
data-bs-toggle="modal"
data-bs-target="#givingBonusModal">
@@ -311,7 +319,7 @@
<div class="card">
<div class="card-header align-items-center d-flex border-bottom-dashed">
<h4 class="card-title mb-0 flex-grow-1"> @lang('translation.member-appraisers')</h4>
@if(in_array(Auth::user()->role,['admin',\App\Enums\RoleEnum::MANAGER->name]))
@if(in_array(Auth::user()?->role,['admin',\App\Enums\RoleEnum::MANAGER->name]))
<div class="flex-shrink-0">
<button type="button" class="btn btn-soft-danger btn-sm"
data-bs-toggle="modal"
@@ -343,7 +351,7 @@
</div>
<div class="flex-shrink-0">
<div class="d-flex align-items-center gap-1">
@if(in_array(Auth::user()->role,['admin',\App\Enums\RoleEnum::MANAGER->name]))
@if(in_array(Auth::user()?->role,['admin',\App\Enums\RoleEnum::MANAGER->name]))
<form name="order-member{{ $member->id }}"
action="{{ route('member.remove') }}"
method="post"
@@ -505,7 +513,7 @@
</div>
<!-- Page content end row -->
@if(Auth::user()->role!=\App\Enums\RoleEnum::USER->name)
@if(Auth::user()?->role!=\App\Enums\RoleEnum::USER->name)
<!-- Attachment adding Modal -->
<div class="modal fade" id="attachModal" tabindex="-1" aria-labelledby="attachModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
@@ -590,7 +598,7 @@
</div>
<!-- Attachment adding end modal -->
@endif
@if(in_array(Auth::user()->role,['admin',\App\Enums\RoleEnum::MANAGER->name]))
@if(in_array(Auth::user()?->role,['admin',\App\Enums\RoleEnum::MANAGER->name]))
<!-- Invite members Modal -->
<div class="modal fade" id="inviteMembersModal" tabindex="-1" aria-labelledby="inviteMembersModalLabel"
aria-hidden="true">

2
resources/views/conclusion/add.blade.php
View File

@@ -83,7 +83,7 @@
</div>
<div class="card-body">
<p class="text-muted mb-2"> @lang('translation.conclusion-file-pdf') </p>
<input type="file" class="form-control @error('file') is-invalid @enderror" name="file">
<input type="file" class="form-control @error('file') is-invalid @enderror" name="file" required accept="application/pdf">
@error('file')
<span class="invalid-feedback" role="alert">
<strong>@lang($message,['attribute'=>trans('translation.file')])</strong>

2
resources/views/estate/show.blade.php
View File

@@ -117,7 +117,7 @@
{{ __('translation.conclusions') }}
</h4>
<div class="flex-shrink-0">
@if(in_array($order->status,[\App\Enums\OrderStatusEnum::STARTED->name,\App\Enums\OrderStatusEnum::REJECTED->name]) && $isAppraisers)
@if(in_array($order->status,[\App\Enums\OrderStatusEnum::STARTED->name,\App\Enums\OrderStatusEnum::REJECTED->name]) && ($isAppraisers || in_array(Auth::user()?->role, ['admin', \App\Enums\RoleEnum::MANAGER->name])))
<a href="{{ route('conclusion.add', ['id' => $order->id,'type'=>\App\Enums\OrderTypeEnum::ESTATE->name]) }}"
type="button" class="btn btn-soft-info btn-sm">
<i class="ri-upload-2-fill me-1 align-bottom"></i>