mina-esn/airline-agency
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(enums): reorganize namespaces and update flight/tour/user imports

Browse Source
This commit is contained in:
mina-esn
2026-08-20 13:01:03 +03:30
parent a45dc7b0fb
commit 8d0cd16384
20 changed files with 237 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Enums/Admin/Tour/TourType.php → app/Enums/Flight/TourType.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php <?php
namespace App\Enums\Admin\Tour; namespace App\Enums\Flight;
enum TourType:int enum TourType:int
{ {
app/Enums/Admin/Tour/TourMode.php → app/Enums/Tour/TourMode.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php <?php
namespace App\Enums\Admin\Tour; namespace App\Enums\Tour;
enum TourMode:int enum TourMode:int
{ {
app/Enums/Admin/Tour/TourScope.php → app/Enums/Tour/TourScope.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php <?php
namespace App\Enums\Admin\Tour; namespace App\Enums\Tour;
enum TourScope:int enum TourScope:int
{ {
app/Enums/UserGender.php → app/Enums/User/UserGender.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php <?php
namespace App\Enums; namespace App\Enums\User;
enum UserGender: int enum UserGender: int
{ {
app/Enums/UserMarital.php → app/Enums/User/UserMarital.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php <?php
namespace App\Enums; namespace App\Enums\User;
enum UserMarital:int enum UserMarital:int
{ {
app/Enums/UserStatus.php → app/Enums/User/UserStatus.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php <?php
namespace App\Enums; namespace App\Enums\User;
enum UserStatus: int enum UserStatus: int
{ {
app/Http/Controllers/Admin/TourController.php
+1 -2
View File
@@ -2,7 +2,7 @@
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use App\Enums\Admin\Tour\TourScope; use App\Enums\Tour\TourScope;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\Tour\TourStoreRequest; use App\Http\Requests\Admin\Tour\TourStoreRequest;
use App\Http\Requests\Admin\Tour\TourUpdateRequest; use App\Http\Requests\Admin\Tour\TourUpdateRequest;
@@ -14,7 +14,6 @@ use App\Models\TourDeparture;
use App\Models\TourImage; use App\Models\TourImage;
use Hekmatinasser\Verta\Verta; use Hekmatinasser\Verta\Verta;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
app/Http/Controllers/Auth/RegisterController.php
+2 -3
View File
@@ -2,15 +2,14 @@
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Enums\UserStatus; use App\Enums\User\UserStatus;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\Auth\RegisterPostRequest; use App\Http\Requests\Auth\RegisterPostRequest;
use App\Models\File; use App\Models\File;
use App\Models\Province; use App\Models\Province;
use App\Models\User; use App\Models\User;
use Illuminate\Support\Facades\DB;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
app/Http/Requests/Admin/Tour/TourStoreRequest.php
+3 -3
View File
@@ -2,9 +2,9 @@
namespace App\Http\Requests\Admin\Tour; namespace App\Http\Requests\Admin\Tour;
use App\Enums\Admin\Tour\TourMode; use App\Enums\Flight\TourType;
use App\Enums\Admin\Tour\TourScope; use App\Enums\Tour\TourMode;
use App\Enums\Admin\Tour\TourType; use App\Enums\Tour\TourScope;
use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
app/Http/Requests/Admin/Tour/TourUpdateRequest.php
+3 -3
View File
@@ -2,9 +2,9 @@
namespace App\Http\Requests\Admin\Tour; namespace App\Http\Requests\Admin\Tour;
use App\Enums\Admin\Tour\TourMode; use App\Enums\Flight\TourType;
use App\Enums\Admin\Tour\TourScope; use App\Enums\Tour\TourMode;
use App\Enums\Admin\Tour\TourType; use App\Enums\Tour\TourScope;
use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
app/Http/Requests/Auth/RegisterPostRequest.php
+2 -2
View File
@@ -2,8 +2,8 @@
namespace App\Http\Requests\Auth; namespace App\Http\Requests\Auth;
use App\Enums\UserGender; use App\Enums\User\UserGender;
use App\Enums\UserMarital; use App\Enums\User\UserMarital;
use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
app/Models/Tour.php
+4 -3
View File
@@ -6,9 +6,10 @@
namespace App\Models; namespace App\Models;
use App\Enums\Admin\Tour\TourMode;
use App\Enums\Admin\Tour\TourScope; use App\Enums\Flight\TourType;
use App\Enums\Admin\Tour\TourType; use App\Enums\Tour\TourMode;
use App\Enums\Tour\TourScope;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Database\Eloquent\Attributes\Scope; use Illuminate\Database\Eloquent\Attributes\Scope;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
app/Models/User.php
+4 -4
View File
@@ -6,13 +6,13 @@
namespace App\Models; namespace App\Models;
use App\Enums\UserGender; use App\Enums\User\UserGender;
use App\Enums\UserMarital; use App\Enums\User\UserMarital;
use App\Enums\UserStatus; use App\Enums\User\UserStatus;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Collection;
use Illuminate\Foundation\Auth\User as Authenticate;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Foundation\Auth\User as Authenticate;
/** /**
* Class User * Class User
resources/views/admin/tours/create.blade.php
+27 -15
View File
@@ -51,8 +51,9 @@
<label class="form-label">گستره تور <span class="text-danger">*</span></label> <label class="form-label">گستره تور <span class="text-danger">*</span></label>
<select class="form-control" name="tour_scope"> <select class="form-control" name="tour_scope">
<option value="">یک مورد را انتخاب کنید</option> <option value="">یک مورد را انتخاب کنید</option>
@foreach(\App\Enums\Admin\Tour\TourScope::cases() as $scope) @foreach(\App\Enums\Tour\TourScope::cases() as $scope)
<option value="{{ $scope->value }}" {{ old('tour_scope') == $scope->value ? 'selected' : '' }}> <option
value="{{ $scope->value }}" {{ old('tour_scope') == $scope->value ? 'selected' : '' }}>
{{ method_exists($scope, 'label') ? $scope->label() : $scope->name }} {{ method_exists($scope, 'label') ? $scope->label() : $scope->name }}
</option> </option>
@endforeach @endforeach
@@ -73,11 +74,13 @@
</div> </div>
<div class="col-xl-6"> <div class="col-xl-6">
<label class="form-label">نوع حمل و نقل / سفر <span class="text-danger">*</span></label> <label class="form-label">نوع حمل و نقل / سفر <span
class="text-danger">*</span></label>
<select class="form-control" name="tour_mode"> <select class="form-control" name="tour_mode">
<option value="">یک مورد را انتخاب کنید</option> <option value="">یک مورد را انتخاب کنید</option>
@foreach(\App\Enums\Admin\Tour\TourMode::cases() as $mode) @foreach(\App\Enums\Tour\TourMode::cases() as $mode)
<option value="{{ $mode->value }}" {{ old('tour_mode') == $mode->value ? 'selected' : '' }}> <option
value="{{ $mode->value }}" {{ old('tour_mode') == $mode->value ? 'selected' : '' }}>
{{ method_exists($mode, 'label') ? $mode->label() : $mode->name }} {{ method_exists($mode, 'label') ? $mode->label() : $mode->name }}
</option> </option>
@endforeach @endforeach
@@ -92,8 +95,9 @@
<label class="form-label">سبک تور <span class="text-danger">*</span></label> <label class="form-label">سبک تور <span class="text-danger">*</span></label>
<select class="form-control" name="tour_type"> <select class="form-control" name="tour_type">
<option value="">یک مورد را انتخاب کنید</option> <option value="">یک مورد را انتخاب کنید</option>
@foreach(\App\Enums\Admin\Tour\TourType::cases() as $type) @foreach(\App\Enums\Flight\TourType::cases() as $type)
<option value="{{ $type->value }}" {{ old('tour_type') == $type->value ? 'selected' : '' }}> <option
value="{{ $type->value }}" {{ old('tour_type') == $type->value ? 'selected' : '' }}>
{{ method_exists($type, 'label') ? $type->label() : $type->name }} {{ method_exists($type, 'label') ? $type->label() : $type->name }}
</option> </option>
@endforeach @endforeach
@@ -109,7 +113,8 @@
<select class="form-control select2" name="origin_city_id"> <select class="form-control select2" name="origin_city_id">
<option value="">شهر مبدا را انتخاب کنید</option> <option value="">شهر مبدا را انتخاب کنید</option>
@foreach($cities as $city) @foreach($cities as $city)
<option value="{{ $city->id }}" {{ old('origin_city_id') == $city->id ? 'selected' : '' }}> <option
value="{{ $city->id }}" {{ old('origin_city_id') == $city->id ? 'selected' : '' }}>
{{ $city->name }} {{ $city->name }}
</option> </option>
@endforeach @endforeach
@@ -125,7 +130,8 @@
<select class="form-control select2" name="destination_city_id"> <select class="form-control select2" name="destination_city_id">
<option value="">شهر مقصد را انتخاب کنید</option> <option value="">شهر مقصد را انتخاب کنید</option>
@foreach($cities as $city) @foreach($cities as $city)
<option value="{{ $city->id }}" {{ old('destination_city_id') == $city->id ? 'selected' : '' }}> <option
value="{{ $city->id }}" {{ old('destination_city_id') == $city->id ? 'selected' : '' }}>
{{ $city->name }} {{ $city->name }}
</option> </option>
@endforeach @endforeach
@@ -138,7 +144,8 @@
<div class="col-xl-12"> <div class="col-xl-12">
<label class="form-label">خلاصه تور</label> <label class="form-label">خلاصه تور</label>
<textarea class="form-control" name="summary" rows="2" placeholder="توضیح کوتاه و جذاب در مورد تور...">{{ old('summary') }}</textarea> <textarea class="form-control" name="summary" rows="2"
placeholder="توضیح کوتاه و جذاب در مورد تور...">{{ old('summary') }}</textarea>
@error('summary') @error('summary')
<span class="text-danger small">{{ $message }}</span> <span class="text-danger small">{{ $message }}</span>
@enderror @enderror
@@ -146,7 +153,8 @@
<div class="col-xl-12"> <div class="col-xl-12">
<label class="form-label">توضیحات کامل و برنامه سفر</label> <label class="form-label">توضیحات کامل و برنامه سفر</label>
<textarea class="form-control" name="description" rows="5" placeholder="جزئیات برنامه سفر، خدمات تور و توضیحات تکمیلی...">{{ old('description') }}</textarea> <textarea class="form-control" name="description" rows="5"
placeholder="جزئیات برنامه سفر، خدمات تور و توضیحات تکمیلی...">{{ old('description') }}</textarea>
@error('description') @error('description')
<span class="text-danger small">{{ $message }}</span> <span class="text-danger small">{{ $message }}</span>
@enderror @enderror
@@ -159,7 +167,8 @@
<div class="row gy-3"> <div class="row gy-3">
<div class="col-xl-3"> <div class="col-xl-3">
<label class="form-label">تاریخ رفت (شروع)</label> <label class="form-label">تاریخ رفت (شروع)</label>
<input type="text" id="startDateInput" class="form-control" name="start_date" placeholder="تاریخ رفت را وارد کنید" value="{{ old('start_date') }}"> <input type="text" id="startDateInput" class="form-control" name="start_date"
placeholder="تاریخ رفت را وارد کنید" value="{{ old('start_date') }}">
@error('start_date') @error('start_date')
<span class="text-danger small">{{ $message }}</span> <span class="text-danger small">{{ $message }}</span>
@enderror @enderror
@@ -167,7 +176,8 @@
<div class="col-xl-3"> <div class="col-xl-3">
<label class="form-label">تاریخ برگشت (پایان)</label> <label class="form-label">تاریخ برگشت (پایان)</label>
<input type="text" id="endDateInput" class="form-control" name="end_date" placeholder="تاریخ برگشت را وارد کنید" value="{{ old('end_date') }}"> <input type="text" id="endDateInput" class="form-control" name="end_date"
placeholder="تاریخ برگشت را وارد کنید" value="{{ old('end_date') }}">
@error('end_date') @error('end_date')
<span class="text-danger small">{{ $message }}</span> <span class="text-danger small">{{ $message }}</span>
@enderror @enderror
@@ -175,7 +185,8 @@
<div class="col-xl-3"> <div class="col-xl-3">
<label class="form-label">قیمت (تومان)</label> <label class="form-label">قیمت (تومان)</label>
<input type="text" class="form-control" name="price" placeholder="مثال: ۱۵۰۰۰۰۰۰" value="{{ old('price') }}"> <input type="text" class="form-control" name="price" placeholder="مثال: ۱۵۰۰۰۰۰۰"
value="{{ old('price') }}">
@error('price') @error('price')
<span class="text-danger small">{{ $message }}</span> <span class="text-danger small">{{ $message }}</span>
@enderror @enderror
@@ -183,7 +194,8 @@
<div class="col-xl-3"> <div class="col-xl-3">
<label class="form-label">ظرفیت مسافر</label> <label class="form-label">ظرفیت مسافر</label>
<input type="number" class="form-control" name="capacity" placeholder="مثال: ۳۰" value="{{ old('capacity') }}"> <input type="number" class="form-control" name="capacity" placeholder="مثال: ۳۰"
value="{{ old('capacity') }}">
@error('capacity') @error('capacity')
<span class="text-danger small">{{ $message }}</span> <span class="text-danger small">{{ $message }}</span>
@enderror @enderror
resources/views/admin/tours/edit.blade.php
+5 -5
View File
@@ -54,7 +54,7 @@
<label class="form-label">گستره تور <span class="text-danger">*</span></label> <label class="form-label">گستره تور <span class="text-danger">*</span></label>
<select class="form-control" name="tour_scope" id="tourScopeSelect"> <select class="form-control" name="tour_scope" id="tourScopeSelect">
<option value="">یک مورد را انتخاب کنید</option> <option value="">یک مورد را انتخاب کنید</option>
@foreach(\App\Enums\Admin\Tour\TourScope::cases() as $scope) @foreach(\App\Enums\Tour\TourScope::cases() as $scope)
<option value="{{ $scope->value }}" <option value="{{ $scope->value }}"
{{ old('tour_scope', $tour->tour_scope?->value) == $scope->value ? 'selected' : '' }}> {{ old('tour_scope', $tour->tour_scope?->value) == $scope->value ? 'selected' : '' }}>
{{ $scope->label() }} {{ $scope->label() }}
@@ -71,7 +71,7 @@
class="text-danger">*</span></label> class="text-danger">*</span></label>
<select class="form-control" name="tour_mode"> <select class="form-control" name="tour_mode">
<option value="">یک مورد را انتخاب کنید</option> <option value="">یک مورد را انتخاب کنید</option>
@foreach(\App\Enums\Admin\Tour\TourMode::cases() as $mode) @foreach(\App\Enums\Tour\TourMode::cases() as $mode)
<option value="{{ $mode->value }}" <option value="{{ $mode->value }}"
{{ old('tour_mode', $tour->tour_mode?->value) == $mode->value ? 'selected' : '' }}> {{ old('tour_mode', $tour->tour_mode?->value) == $mode->value ? 'selected' : '' }}>
{{ $mode->label() }} {{ $mode->label() }}
@@ -87,7 +87,7 @@
<label class="form-label">سبک تور <span class="text-danger">*</span></label> <label class="form-label">سبک تور <span class="text-danger">*</span></label>
<select class="form-control" name="tour_type"> <select class="form-control" name="tour_type">
<option value="">یک مورد را انتخاب کنید</option> <option value="">یک مورد را انتخاب کنید</option>
@foreach(\App\Enums\Admin\Tour\TourType::cases() as $type) @foreach(\App\Enums\Flight\TourType::cases() as $type)
<option value="{{ $type->value }}" <option value="{{ $type->value }}"
{{ old('tour_type', $tour->tour_type?->value) == $type->value ? 'selected' : '' }}> {{ old('tour_type', $tour->tour_type?->value) == $type->value ? 'selected' : '' }}>
{{ $type->label() }} {{ $type->label() }}
@@ -116,10 +116,10 @@
</div> </div>
<div class="col-xl-6" id="countryWrapper" <div class="col-xl-6" id="countryWrapper"
style="{{ $tour->tour_scope === \App\Enums\Admin\Tour\TourScope::INTERNATIONAL ? '' : 'display:none;' }}"> style="{{ $tour->tour_scope === \App\Enums\Tour\TourScope::INTERNATIONAL ? '' : 'display:none;' }}">
<label class="form-label">کشور مقصد</label> <label class="form-label">کشور مقصد</label>
<select class="form-control" id="country_id" <select class="form-control" id="country_id"
{{ $tour->tour_scope === \App\Enums\Admin\Tour\TourScope::INTERNATIONAL ? '' : 'disabled' }}> {{ $tour->tour_scope === \App\Enums\Tour\TourScope::INTERNATIONAL ? '' : 'disabled' }}>
<option value="">یک مورد را انتخاب کنید</option> <option value="">یک مورد را انتخاب کنید</option>
@foreach($countries as $country) @foreach($countries as $country)
<option value="{{ $country->id }}" <option value="{{ $country->id }}"
resources/views/auth/register.blade.php
+56 -23
View File
@@ -39,7 +39,8 @@
<div class="form-group"> <div class="form-group">
<label for="first_name">نام <span style="color: red">*</span></label> <label for="first_name">نام <span style="color: red">*</span></label>
<div class="form-group-icon"> <div class="form-group-icon">
<input type="text" id="first_name" name="first_name" class="form-control" placeholder="نام" value="{{ old('first_name') }}"> <input type="text" id="first_name" name="first_name" class="form-control"
placeholder="نام" value="{{ old('first_name') }}">
<i class="far fa-user"></i> <i class="far fa-user"></i>
</div> </div>
@error('first_name') @error('first_name')
@@ -52,7 +53,8 @@
<div class="form-group"> <div class="form-group">
<label for="last_name">نام خانوادگی<span style="color: red">*</span></label> <label for="last_name">نام خانوادگی<span style="color: red">*</span></label>
<div class="form-group-icon"> <div class="form-group-icon">
<input type="text" id="last_name" name="last_name" class="form-control" placeholder="نام خانوادگی" value="{{ old('last_name') }}"> <input type="text" id="last_name" name="last_name" class="form-control"
placeholder="نام خانوادگی" value="{{ old('last_name') }}">
<i class="far fa-user"></i> <i class="far fa-user"></i>
</div> </div>
@error('last_name') @error('last_name')
@@ -68,7 +70,9 @@
<div class="form-group"> <div class="form-group">
<label for="national_code">کد ملی<span style="color: red">*</span></label> <label for="national_code">کد ملی<span style="color: red">*</span></label>
<div class="form-group-icon"> <div class="form-group-icon">
<input type="text" id="national_code" name="national_code" class="form-control" placeholder="کد ملی" value="{{ old('national_code') }}"> <input type="text" id="national_code" name="national_code"
class="form-control" placeholder="کد ملی"
value="{{ old('national_code') }}">
<i class="far fa-id-card"></i> <i class="far fa-id-card"></i>
</div> </div>
@error('national_code') @error('national_code')
@@ -82,10 +86,22 @@
<label for="gender">جنسیت<span style="color: red">*</span></label> <label for="gender">جنسیت<span style="color: red">*</span></label>
<div class="form-group-icon"> <div class="form-group-icon">
<select id="gender" name="gender" class="form-control"> <select id="gender" name="gender" class="form-control">
<option value="" @selected(old('gender') === null || old('gender') === '')>انتخاب کنید</option> <option
<option value="{{ \App\Enums\UserGender::UNKNOWN->value }}" @selected(old('gender') !== null && old('gender') !== '' && old('gender') == \App\Enums\UserGender::UNKNOWN->value)>نامشخص</option> value="" @selected(old('gender') === null || old('gender') === '')>
<option value="{{ \App\Enums\UserGender::MALE->value }}" @selected(old('gender') !== null && old('gender') !== '' && old('gender') == \App\Enums\UserGender::MALE->value)>آقا</option> انتخاب کنید
<option value="{{ \App\Enums\UserGender::FEMALE->value }}" @selected(old('gender') !== null && old('gender') !== '' && old('gender') == \App\Enums\UserGender::FEMALE->value)>خانم</option> </option>
<option
value="{{ \App\Enums\User\UserGender::UNKNOWN->value }}" @selected(old('gender') !== null && old('gender') !== '' && old('gender') == \App\Enums\User\UserGender::UNKNOWN->value)>
نامشخص
</option>
<option
value="{{ \App\Enums\User\UserGender::MALE->value }}" @selected(old('gender') !== null && old('gender') !== '' && old('gender') == \App\Enums\User\UserGender::MALE->value)>
آقا
</option>
<option
value="{{ \App\Enums\User\UserGender::FEMALE->value }}" @selected(old('gender') !== null && old('gender') !== '' && old('gender') == \App\Enums\User\UserGender::FEMALE->value)>
خانم
</option>
</select> </select>
<i class="far fa-venus-mars"></i> <i class="far fa-venus-mars"></i>
</div> </div>
@@ -103,10 +119,22 @@
<label for="marital_status">وضعیت تاهل<span style="color: red">*</span></label> <label for="marital_status">وضعیت تاهل<span style="color: red">*</span></label>
<div class="form-group-icon"> <div class="form-group-icon">
<select id="marital_status" name="marital_status" class="form-control"> <select id="marital_status" name="marital_status" class="form-control">
<option value="" @selected(old('marital_status') === null || old('marital_status') === '')>انتخاب کنید</option> <option
<option value="{{ \App\Enums\UserMarital::SINGLE->value }}" @selected(old('marital_status') !== null && old('marital_status') !== '' && old('marital_status') == \App\Enums\UserMarital::SINGLE->value)>مجرد</option> value="" @selected(old('marital_status') === null || old('marital_status') === '')>
<option value="{{ \App\Enums\UserMarital::MARRIED->value }}" @selected(old('marital_status') !== null && old('marital_status') !== '' && old('marital_status') == \App\Enums\UserMarital::MARRIED->value)>متأهل</option> انتخاب کنید
<option value="{{ \App\Enums\UserMarital::DIVORCED->value }}" @selected(old('marital_status') !== null && old('marital_status') !== '' && old('marital_status') == \App\Enums\UserMarital::DIVORCED->value)>جدا شده</option> </option>
<option
value="{{ \App\Enums\User\UserMarital::SINGLE->value }}" @selected(old('marital_status') !== null && old('marital_status') !== '' && old('marital_status') == \App\Enums\User\UserMarital::SINGLE->value)>
مجرد
</option>
<option
value="{{ \App\Enums\User\UserMarital::MARRIED->value }}" @selected(old('marital_status') !== null && old('marital_status') !== '' && old('marital_status') == \App\Enums\User\UserMarital::MARRIED->value)>
متأهل
</option>
<option
value="{{ \App\Enums\User\UserMarital::DIVORCED->value }}" @selected(old('marital_status') !== null && old('marital_status') !== '' && old('marital_status') == \App\Enums\User\UserMarital::DIVORCED->value)>
جدا شده
</option>
</select> </select>
<i class="fas fa-ring"></i> <i class="fas fa-ring"></i>
</div> </div>
@@ -120,7 +148,8 @@
<div class="form-group"> <div class="form-group">
<label for="spouse_name">نام و نام خانوادگی همسر</label> <label for="spouse_name">نام و نام خانوادگی همسر</label>
<div class="form-group-icon"> <div class="form-group-icon">
<input type="text" id="spouse_name" name="spouse_name" class="form-control" placeholder="نام همسر" value="{{ old('spouse_name') }}"> <input type="text" id="spouse_name" name="spouse_name" class="form-control"
placeholder="نام همسر" value="{{ old('spouse_name') }}">
<i class="far fa-user-friends"></i> <i class="far fa-user-friends"></i>
</div> </div>
@error('spouse_name') @error('spouse_name')
@@ -136,7 +165,8 @@
<div class="form-group"> <div class="form-group">
<label for="mobile">شماره همراه<span style="color: red">*</span></label> <label for="mobile">شماره همراه<span style="color: red">*</span></label>
<div class="form-group-icon"> <div class="form-group-icon">
<input type="text" id="mobile" name="mobile" class="form-control" placeholder="0912..." value="{{ old('mobile') }}"> <input type="text" id="mobile" name="mobile" class="form-control"
placeholder="0912..." value="{{ old('mobile') }}">
<i class="fas fa-phone"></i> <i class="fas fa-phone"></i>
</div> </div>
@error('mobile') @error('mobile')
@@ -149,7 +179,8 @@
<div class="form-group"> <div class="form-group">
<label for="email">آدرس ایمیل<span style="color: red">*</span></label> <label for="email">آدرس ایمیل<span style="color: red">*</span></label>
<div class="form-group-icon"> <div class="form-group-icon">
<input type="email" id="email" name="email" class="form-control" placeholder="ایمیل خود را وارد کنید" value="{{ old('email') }}"> <input type="email" id="email" name="email" class="form-control"
placeholder="ایمیل خود را وارد کنید" value="{{ old('email') }}">
<i class="far fa-envelope"></i> <i class="far fa-envelope"></i>
</div> </div>
@error('email') @error('email')
@@ -165,7 +196,8 @@
<div class="form-group"> <div class="form-group">
<label for="username">نام کاربری<span style="color: red">*</span></label> <label for="username">نام کاربری<span style="color: red">*</span></label>
<div class="form-group-icon"> <div class="form-group-icon">
<input type="text" id="username" name="username" class="form-control" placeholder="Username" value="{{ old('username') }}"> <input type="text" id="username" name="username" class="form-control"
placeholder="Username" value="{{ old('username') }}">
<i class="far fa-user-circle"></i> <i class="far fa-user-circle"></i>
</div> </div>
@error('username') @error('username')
@@ -194,7 +226,8 @@
<div class="form-group"> <div class="form-group">
<label for="password">رمز عبور<span style="color: red">*</span></label> <label for="password">رمز عبور<span style="color: red">*</span></label>
<div class="form-group-icon"> <div class="form-group-icon">
<input type="password" id="password" name="password" class="form-control" placeholder="رمز عبور"> <input type="password" id="password" name="password" class="form-control"
placeholder="رمز عبور">
<i class="far fa-lock"></i> <i class="far fa-lock"></i>
</div> </div>
@error('password') @error('password')
@@ -207,7 +240,9 @@
<div class="form-group"> <div class="form-group">
<label for="password_confirmation">تایید رمز عبور</label> <label for="password_confirmation">تایید رمز عبور</label>
<div class="form-group-icon"> <div class="form-group-icon">
<input type="password" id="password_confirmation" name="password_confirmation" class="form-control" placeholder="تکرار رمز عبور"> <input type="password" id="password_confirmation"
name="password_confirmation" class="form-control"
placeholder="تکرار رمز عبور">
<i class="far fa-check-circle"></i> <i class="far fa-check-circle"></i>
</div> </div>
@error('password_confirmation') @error('password_confirmation')
@@ -250,14 +285,16 @@
<div class="form-check form-group mt-3"> <div class="form-check form-group mt-3">
<input class="form-check-input" type="checkbox" name="terms" value="1" id="agree" required> <input class="form-check-input" type="checkbox" name="terms" value="1" id="agree"
required>
<label class="form-check-label" for="agree"> <label class="form-check-label" for="agree">
من موافقم با <a href="#">شرایط استفاده از خدمات.</a> من موافقم با <a href="#">شرایط استفاده از خدمات.</a>
</label> </label>
</div> </div>
<div class="d-flex align-items-center mt-4"> <div class="d-flex align-items-center mt-4">
<button type="submit" class="theme-btn"><i class="far fa-paper-plane"></i> ثبت نام</button> <button type="submit" class="theme-btn"><i class="far fa-paper-plane"></i> ثبت نام
</button>
</div> </div>
</form> </form>
@@ -331,8 +368,4 @@
</script> </script>
@endpush @endpush
@endsection @endsection
resources/views/components/flight-card.blade.php
+1 -2
View File
@@ -1,4 +1,3 @@
<div class="col-md-6 col-lg-3"> <div class="col-md-6 col-lg-3">
<div class="activity-item wow fadeInUp" data-wow-duration="1s" data-wow-delay=".25s"> <div class="activity-item wow fadeInUp" data-wow-duration="1s" data-wow-delay=".25s">
<div class="activity-img"> <div class="activity-img">
@@ -31,7 +30,7 @@
<p><i class="far fa-location-dot"></i> <p><i class="far fa-location-dot"></i>
{{ $flight->origin_airport?->city->name ?? 'مبدأ' }} {{ $flight->origin_airport?->city->name ?? 'مبدأ' }}
@if ($flight->trip_type === \App\Enums\FlightTripType::ONEWAY) @if ($flight->trip_type === \App\Enums\Flight\FlightTripType::ONEWAY)
<i class="fas fa-arrow-right-long"></i> <i class="fas fa-arrow-right-long"></i>
@else @else
<i class="fas fa-right-left"></i> <i class="fas fa-right-left"></i>
routes/admin.php
+4 -2
View File
@@ -86,8 +86,8 @@ Route::prefix('admin')->name('admin.')->group(function () {
Route::get('create', 'create')->name('create'); Route::get('create', 'create')->name('create');
Route::post('store', 'store')->name('store'); Route::post('store', 'store')->name('store');
Route::prefix('trash')->group(function () { Route::prefix('trash')->name('trash.')->group(function () {
Route::get('/', 'trash')->name('trash'); Route::get('/', 'trash')->name('index');
Route::prefix('{id}')->group(function () { Route::prefix('{id}')->group(function () {
Route::post('restore', 'restore')->name('restore'); Route::post('restore', 'restore')->name('restore');
@@ -102,6 +102,8 @@ Route::prefix('admin')->name('admin.')->group(function () {
Route::delete('destroy', 'destroy')->name('destroy'); Route::delete('destroy', 'destroy')->name('destroy');
}); });
}); });
Route::prefix('tours')->name('tours.')->middleware('admin.permission:manage-tours')->controller(TourController::class)->group(function () { Route::prefix('tours')->name('tours.')->middleware('admin.permission:manage-tours')->controller(TourController::class)->group(function () {
Route::get('/', 'index')->name('index'); Route::get('/', 'index')->name('index');
storage/framework/views/6e84530c00e25f2ca870d5440b8da444.php
+1 -2
View File
@@ -1,4 +1,3 @@
<div class="col-md-6 col-lg-3"> <div class="col-md-6 col-lg-3">
<div class="activity-item wow fadeInUp" data-wow-duration="1s" data-wow-delay=".25s"> <div class="activity-item wow fadeInUp" data-wow-duration="1s" data-wow-delay=".25s">
<div class="activity-img"> <div class="activity-img">
@@ -32,7 +31,7 @@
<p><i class="far fa-location-dot"></i> <p><i class="far fa-location-dot"></i>
<?php echo e($flight->origin_airport?->city->name ?? 'مبدأ'); ?> <?php echo e($flight->origin_airport?->city->name ?? 'مبدأ'); ?>
<?php if($flight->trip_type === \App\Enums\FlightTripType::ONEWAY): ?> <?php if($flight->trip_type === \App\Enums\Flight\FlightTripType::ONEWAY): ?>
<i class="fas fa-arrow-right-long"></i> <i class="fas fa-arrow-right-long"></i>
<?php else: ?> <?php else: ?>
<i class="fas fa-right-left"></i> <i class="fas fa-right-left"></i>
storage/framework/views/c0862dfa874f43235690340041aae4b8.php
+27 -15
View File
@@ -56,8 +56,9 @@ unset($__errorArgs, $__bag); ?>
<label class="form-label">گستره تور <span class="text-danger">*</span></label> <label class="form-label">گستره تور <span class="text-danger">*</span></label>
<select class="form-control" name="tour_scope"> <select class="form-control" name="tour_scope">
<option value="">یک مورد را انتخاب کنید</option> <option value="">یک مورد را انتخاب کنید</option>
<?php $__currentLoopData = \App\Enums\Admin\Tour\TourScope::cases(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $scope): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?> <?php $__currentLoopData = \App\Enums\Tour\TourScope::cases(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $scope): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
<option value="<?php echo e($scope->value); ?>" <?php echo e(old('tour_scope') == $scope->value ? 'selected' : ''); ?>> <option
value="<?php echo e($scope->value); ?>" <?php echo e(old('tour_scope') == $scope->value ? 'selected' : ''); ?>>
<?php echo e(method_exists($scope, 'label') ? $scope->label() : $scope->name); ?> <?php echo e(method_exists($scope, 'label') ? $scope->label() : $scope->name); ?>
</option> </option>
@@ -86,11 +87,13 @@ unset($__errorArgs, $__bag); ?>
</div> </div>
<div class="col-xl-6"> <div class="col-xl-6">
<label class="form-label">نوع حمل و نقل / سفر <span class="text-danger">*</span></label> <label class="form-label">نوع حمل و نقل / سفر <span
class="text-danger">*</span></label>
<select class="form-control" name="tour_mode"> <select class="form-control" name="tour_mode">
<option value="">یک مورد را انتخاب کنید</option> <option value="">یک مورد را انتخاب کنید</option>
<?php $__currentLoopData = \App\Enums\Admin\Tour\TourMode::cases(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $mode): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?> <?php $__currentLoopData = \App\Enums\Tour\TourMode::cases(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $mode): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
<option value="<?php echo e($mode->value); ?>" <?php echo e(old('tour_mode') == $mode->value ? 'selected' : ''); ?>> <option
value="<?php echo e($mode->value); ?>" <?php echo e(old('tour_mode') == $mode->value ? 'selected' : ''); ?>>
<?php echo e(method_exists($mode, 'label') ? $mode->label() : $mode->name); ?> <?php echo e(method_exists($mode, 'label') ? $mode->label() : $mode->name); ?>
</option> </option>
@@ -113,8 +116,9 @@ unset($__errorArgs, $__bag); ?>
<label class="form-label">سبک تور <span class="text-danger">*</span></label> <label class="form-label">سبک تور <span class="text-danger">*</span></label>
<select class="form-control" name="tour_type"> <select class="form-control" name="tour_type">
<option value="">یک مورد را انتخاب کنید</option> <option value="">یک مورد را انتخاب کنید</option>
<?php $__currentLoopData = \App\Enums\Admin\Tour\TourType::cases(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $type): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?> <?php $__currentLoopData = \App\Enums\Flight\TourType::cases(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $type): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
<option value="<?php echo e($type->value); ?>" <?php echo e(old('tour_type') == $type->value ? 'selected' : ''); ?>> <option
value="<?php echo e($type->value); ?>" <?php echo e(old('tour_type') == $type->value ? 'selected' : ''); ?>>
<?php echo e(method_exists($type, 'label') ? $type->label() : $type->name); ?> <?php echo e(method_exists($type, 'label') ? $type->label() : $type->name); ?>
</option> </option>
@@ -138,7 +142,8 @@ unset($__errorArgs, $__bag); ?>
<select class="form-control select2" name="origin_city_id"> <select class="form-control select2" name="origin_city_id">
<option value="">شهر مبدا را انتخاب کنید</option> <option value="">شهر مبدا را انتخاب کنید</option>
<?php $__currentLoopData = $cities; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $city): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?> <?php $__currentLoopData = $cities; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $city): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
<option value="<?php echo e($city->id); ?>" <?php echo e(old('origin_city_id') == $city->id ? 'selected' : ''); ?>> <option
value="<?php echo e($city->id); ?>" <?php echo e(old('origin_city_id') == $city->id ? 'selected' : ''); ?>>
<?php echo e($city->name); ?> <?php echo e($city->name); ?>
</option> </option>
@@ -162,7 +167,8 @@ unset($__errorArgs, $__bag); ?>
<select class="form-control select2" name="destination_city_id"> <select class="form-control select2" name="destination_city_id">
<option value="">شهر مقصد را انتخاب کنید</option> <option value="">شهر مقصد را انتخاب کنید</option>
<?php $__currentLoopData = $cities; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $city): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?> <?php $__currentLoopData = $cities; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $city): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
<option value="<?php echo e($city->id); ?>" <?php echo e(old('destination_city_id') == $city->id ? 'selected' : ''); ?>> <option
value="<?php echo e($city->id); ?>" <?php echo e(old('destination_city_id') == $city->id ? 'selected' : ''); ?>>
<?php echo e($city->name); ?> <?php echo e($city->name); ?>
</option> </option>
@@ -183,7 +189,8 @@ unset($__errorArgs, $__bag); ?>
<div class="col-xl-12"> <div class="col-xl-12">
<label class="form-label">خلاصه تور</label> <label class="form-label">خلاصه تور</label>
<textarea class="form-control" name="summary" rows="2" placeholder="توضیح کوتاه و جذاب در مورد تور..."><?php echo e(old('summary')); ?></textarea> <textarea class="form-control" name="summary" rows="2"
placeholder="توضیح کوتاه و جذاب در مورد تور..."><?php echo e(old('summary')); ?></textarea>
<?php $__errorArgs = ['summary']; <?php $__errorArgs = ['summary'];
$__bag = $errors->getBag($__errorArgs[1] ?? 'default'); $__bag = $errors->getBag($__errorArgs[1] ?? 'default');
if ($__bag->has($__errorArgs[0])) : if ($__bag->has($__errorArgs[0])) :
@@ -198,7 +205,8 @@ unset($__errorArgs, $__bag); ?>
<div class="col-xl-12"> <div class="col-xl-12">
<label class="form-label">توضیحات کامل و برنامه سفر</label> <label class="form-label">توضیحات کامل و برنامه سفر</label>
<textarea class="form-control" name="description" rows="5" placeholder="جزئیات برنامه سفر، خدمات تور و توضیحات تکمیلی..."><?php echo e(old('description')); ?></textarea> <textarea class="form-control" name="description" rows="5"
placeholder="جزئیات برنامه سفر، خدمات تور و توضیحات تکمیلی..."><?php echo e(old('description')); ?></textarea>
<?php $__errorArgs = ['description']; <?php $__errorArgs = ['description'];
$__bag = $errors->getBag($__errorArgs[1] ?? 'default'); $__bag = $errors->getBag($__errorArgs[1] ?? 'default');
if ($__bag->has($__errorArgs[0])) : if ($__bag->has($__errorArgs[0])) :
@@ -218,7 +226,8 @@ unset($__errorArgs, $__bag); ?>
<div class="row gy-3"> <div class="row gy-3">
<div class="col-xl-3"> <div class="col-xl-3">
<label class="form-label">تاریخ رفت (شروع)</label> <label class="form-label">تاریخ رفت (شروع)</label>
<input type="text" id="startDateInput" class="form-control" name="start_date" placeholder="تاریخ رفت را وارد کنید" value="<?php echo e(old('start_date')); ?>"> <input type="text" id="startDateInput" class="form-control" name="start_date"
placeholder="تاریخ رفت را وارد کنید" value="<?php echo e(old('start_date')); ?>">
<?php $__errorArgs = ['start_date']; <?php $__errorArgs = ['start_date'];
$__bag = $errors->getBag($__errorArgs[1] ?? 'default'); $__bag = $errors->getBag($__errorArgs[1] ?? 'default');
if ($__bag->has($__errorArgs[0])) : if ($__bag->has($__errorArgs[0])) :
@@ -233,7 +242,8 @@ unset($__errorArgs, $__bag); ?>
<div class="col-xl-3"> <div class="col-xl-3">
<label class="form-label">تاریخ برگشت (پایان)</label> <label class="form-label">تاریخ برگشت (پایان)</label>
<input type="text" id="endDateInput" class="form-control" name="end_date" placeholder="تاریخ برگشت را وارد کنید" value="<?php echo e(old('end_date')); ?>"> <input type="text" id="endDateInput" class="form-control" name="end_date"
placeholder="تاریخ برگشت را وارد کنید" value="<?php echo e(old('end_date')); ?>">
<?php $__errorArgs = ['end_date']; <?php $__errorArgs = ['end_date'];
$__bag = $errors->getBag($__errorArgs[1] ?? 'default'); $__bag = $errors->getBag($__errorArgs[1] ?? 'default');
if ($__bag->has($__errorArgs[0])) : if ($__bag->has($__errorArgs[0])) :
@@ -248,7 +258,8 @@ unset($__errorArgs, $__bag); ?>
<div class="col-xl-3"> <div class="col-xl-3">
<label class="form-label">قیمت (تومان)</label> <label class="form-label">قیمت (تومان)</label>
<input type="text" class="form-control" name="price" placeholder="مثال: ۱۵۰۰۰۰۰۰" value="<?php echo e(old('price')); ?>"> <input type="text" class="form-control" name="price" placeholder="مثال: ۱۵۰۰۰۰۰۰"
value="<?php echo e(old('price')); ?>">
<?php $__errorArgs = ['price']; <?php $__errorArgs = ['price'];
$__bag = $errors->getBag($__errorArgs[1] ?? 'default'); $__bag = $errors->getBag($__errorArgs[1] ?? 'default');
if ($__bag->has($__errorArgs[0])) : if ($__bag->has($__errorArgs[0])) :
@@ -263,7 +274,8 @@ unset($__errorArgs, $__bag); ?>
<div class="col-xl-3"> <div class="col-xl-3">
<label class="form-label">ظرفیت مسافر</label> <label class="form-label">ظرفیت مسافر</label>
<input type="number" class="form-control" name="capacity" placeholder="مثال: ۳۰" value="<?php echo e(old('capacity')); ?>"> <input type="number" class="form-control" name="capacity" placeholder="مثال: ۳۰"
value="<?php echo e(old('capacity')); ?>">
<?php $__errorArgs = ['capacity']; <?php $__errorArgs = ['capacity'];
$__bag = $errors->getBag($__errorArgs[1] ?? 'default'); $__bag = $errors->getBag($__errorArgs[1] ?? 'default');
if ($__bag->has($__errorArgs[0])) : if ($__bag->has($__errorArgs[0])) :