s-ahy/sogandAsghary.Project09
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: final updates

Browse Source
This commit is contained in:
Admin
2026-08-22 11:11:28 -07:00
parent 618a3d4cd9
commit d4bb1b9414
43 changed files with 1136 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Account/EditProfileController.php
+6 -2
View File
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Account;
use App\Http\Controllers\Controller;
use App\Http\Requests\EditProfilePostRequest;
use App\Models\Province;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
@@ -11,10 +12,13 @@ class EditProfileController extends Controller
{
public function index()
{
$user = Auth::user();
return view('account.setting', compact('user'));
$user->load(['province', 'city']);
$provinces = Province::all();
return view('account.setting', compact('user', 'provinces'));
}
public function post(EditProfilePostRequest $request)
app/Http/Controllers/Admin/ActivityLogController.php
+1
View File
@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
class ActivityLogController extends Controller
{
public function index(Request $request)
{
$logs = ActivityLog::query()
app/Http/Controllers/Admin/AdminController.php
+4 -5
View File
@@ -207,12 +207,11 @@ class AdminController extends Controller
public function destroy(Admin $admin)
{
AdminPermission::where('admin_id', $admin->id)->delete();
$admin->delete();
return redirect()
->route('admin.admins.index')
->withErrors([
'success' => 'عملیات با موفقیت انجام شد'
]);
return redirect()->route('admin.admins.index')
->with('success', 'ادمین با موفقیت حذف شد.');
}
}
app/Http/Controllers/Admin/CityController.php
+88
View File
@@ -0,0 +1,88 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Models\City;
use App\Models\Province;
use Illuminate\Http\Request;
class CityController extends Controller
{
public function index(Request $request)
{
$cities = City::query()
->with('province')
->when($request->filled('search'), function ($query) use ($request) {
$query->where('name', 'LIKE', '%' . $request->input('search') . '%');
})
->orderByDesc('created_at')
->paginate();
return view('admin.cities.index', compact('cities'));
}
public function create()
{
$provinces = Province::all();
return view('admin.cities.create', compact('provinces'));
}
public function store(Request $request)
{
$request->validate([
'name' => ['required', 'max:255'],
'province_id' => ['required', 'exists:provinces,id'],
]);
City::create([
'name' => $request->input('name'),
'province_id' => $request->input('province_id'),
]);
return redirect()
->route('admin.cities.index')
->with('success', 'شهرستان با موفقیت ایجاد شد');
}
public function edit(City $city)
{
$provinces = Province::all();
return view('admin.cities.edit', compact('city', 'provinces'));
}
public function update(Request $request, City $city)
{
$request->validate([
'name' => ['required', 'max:255'],
'province_id' => ['required', 'exists:provinces,id'],
]);
$city->update([
'name' => $request->input('name'),
'province_id' => $request->input('province_id'),
]);
return redirect()
->route('admin.cities.index')
->with('success', 'شهرستان با موفقیت ویرایش شد');
}
public function destroy(City $city)
{
if ($city->airports()->exists()) {
return back()->withErrors([
'error' => 'این شهرستان دارای فرودگاه است و قابل حذف نیست.'
]);
}
$city->delete();
return redirect()->route('admin.cities.index')->withErrors([
'success', 'شهرستان با موفقیت حذف شد'
]);
}
}
app/Http/Controllers/Admin/FlightController.php
+15 -1
View File
@@ -110,6 +110,12 @@ class FlightController extends Controller
'after_or_equal:today',
],
'return_time' => [
'nullable',
'date',
'after:departure_time',
],
'departure_airport_id' => [
'required',
'exists:airports,id',
@@ -175,6 +181,7 @@ class FlightController extends Controller
'airline_id' => $request->input('airline_id'),
'flight_type' => $request->input('flight_type'),
'departure_time' => $request->input('departure_time'),
'return_time' => $request->input('return_time'),
'departure_airport_id' => $request->input('departure_airport_id'),
'arrival_airport_id' => $request->input('arrival_airport_id'),
'price' => $request->input('price'),
@@ -232,7 +239,7 @@ class FlightController extends Controller
public function update(Request $request, Flight $flight)
{
$before = $flight->only([
'title', 'airline_id', 'flight_type', 'departure_time',
'title', 'airline_id', 'flight_type', 'departure_time', 'return_time',
'departure_airport_id', 'arrival_airport_id', 'price',
'summary', 'capacity', 'description', 'status',
]);
@@ -266,6 +273,12 @@ class FlightController extends Controller
'after_or_equal:today',
],
'return_time' => [
'nullable',
'date',
'after:departure_time',
],
'departure_airport_id' => [
'required',
'exists:airports,id',
@@ -330,6 +343,7 @@ class FlightController extends Controller
'airline_id' => $request->input('airline_id'),
'flight_type' => $request->input('flight_type'),
'departure_time' => $request->input('departure_time'),
'return_time' => $request->input('return_time'),
'departure_airport_id' => $request->input('departure_airport_id'),
'arrival_airport_id' => $request->input('arrival_airport_id'),
'price' => $request->input('price'),
app/Http/Controllers/Admin/ProvinceController.php
+78
View File
@@ -0,0 +1,78 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Models\Province;
use Illuminate\Http\Request;
class ProvinceController extends Controller
{
public function index(Request $request)
{
$provinces = Province::query()
->when($request->filled('search'), function ($query) use ($request) {
$query->where('name', 'LIKE', '%' . $request->input('search') . '%');
})
->withCount('cities')
->orderByDesc('created_at')
->paginate();
return view('admin.provinces.index', compact('provinces'));
}
public function create()
{
return view('admin.provinces.create');
}
public function store(Request $request)
{
$request->validate([
'name' => ['required', 'max:255', 'unique:provinces,name'],
]);
Province::create([
'name' => $request->input('name'),
]);
return redirect()
->route('admin.provinces.index')
->with('success', 'استان با موفقیت ایجاد شد');
}
public function edit(Province $province)
{
return view('admin.provinces.edit', compact('province'));
}
public function update(Request $request, Province $province)
{
$request->validate([
'name' => ['required', 'max:255', 'unique:provinces,name,' . $province->id],
]);
$province->update([
'name' => $request->input('name'),
]);
return redirect()
->route('admin.provinces.index')
->with('success', 'استان با موفقیت ویرایش شد');
}
public function destroy(Province $province)
{
if ($province->cities()->exists()) {
return back()->withErrors([
'error' => 'این استان دارای شهرستان است و قابل حذف نیست.'
]);
}
$province->delete();
return redirect()->route('admin.provinces.index')->withErrors([
'success' => 'استان با موفقیت حذف شد'
]);
}
}
app/Http/Controllers/Admin/UserController.php
+26 -10
View File
@@ -7,6 +7,7 @@ use App\Http\Requests\Admin\Users\UserEditRequest;
use App\Http\Requests\EditProfilePostRequest;
use App\Models\Booking;
use App\Models\Order;
use App\Models\Province;
use App\Models\User;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Request;
@@ -20,15 +21,16 @@ class UserController extends Controller
{
$users = User::query()
->with(['province', 'city', 'file'])
->when($request->filled('search'), function (Builder $query) use ($request){
$search = $request->input('search');
$search = $request->input('search');
$query->whereAny([
'first_name',
'last_name',
'mobile',
'email'
],'LIKE',"%$search%");
$query->whereAny([
'first_name',
'last_name',
'mobile',
'email'
],'LIKE',"%$search%");
})
->when($request->filled('sort'), function (Builder $query) use ($request) {
$sort = $request->input('sort');
@@ -61,7 +63,11 @@ class UserController extends Controller
public function edit(User $user)
{
return view('admin.users.edit', compact('user'));
$user->load(['province', 'city', 'file']);
$provinces = Province::all();
return view('admin.users.edit', compact('user', 'provinces'));
}
public function update(User $user, UserEditRequest $request)
@@ -71,7 +77,9 @@ class UserController extends Controller
'first_name',
'last_name',
'mobile',
'email'
'email',
'province_id',
'city_id',
]);
if ($request->filled('password')){
@@ -86,9 +94,17 @@ class UserController extends Controller
public function destroy(User $user)
{
if ($user->bookings()->exists()) {
return back()->withErrors([
'error' => 'این کاربر دارای رزرو است و قابل حذف نیست.'
]);
}
$user->delete();
return redirect()->route('admin.users.index');
return redirect()->route('admin.users.index')->withErrors([
'success'=> 'کاربر با موفقیت حذف شد'
]);
}
}
app/Http/Controllers/Auth/RegisterController.php
+4 -1
View File
@@ -6,6 +6,7 @@ use App\Enums\UserStatus;
use App\Http\Controllers\Controller;
use App\Http\Requests\Auth\RegisterPostRequest;
use App\Models\File;
use App\Models\Province;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@@ -19,7 +20,9 @@ class RegisterController extends Controller
$withoutHeader = true;
$withoutFooter = true;
return view('auth.register', compact('withoutHeader', 'withoutFooter'));
$provinces = Province::all();
return view('auth.register', compact('withoutHeader', 'withoutFooter', 'provinces'));
}
app/Http/Requests/Auth/RegisterPostRequest.php
+6 -5
View File
@@ -79,14 +79,14 @@ class RegisterPostRequest extends FormRequest
'max:800',
],
'province' => [
'province_id' => [
'nullable',
'string',
'exists:provinces,id',
],
'city' => [
'city_id' => [
'nullable',
'string',
'exists:cities,id',
],
'password' => [
@@ -105,7 +105,8 @@ class RegisterPostRequest extends FormRequest
'required',
'max:150',
'email',
'unique:users,mobile', ]
'unique:users,email',
]
];
}
}
app/Http/Requests/EditProfilePostRequest.php
+1 -1
View File
@@ -48,7 +48,7 @@ class EditProfilePostRequest extends FormRequest
'max:100',
],
'city' => [
'cities' => [
'nullable',
'string',
'max:100',
app/Models/Airport.php
+3 -3
View File
@@ -11,14 +11,14 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class Airport
*
*
* @property int $id
* @property string $name
* @property int $city_id
* @property string $country
* @property string $code
*
* @property City $city
*
* @property City $cities
* @property Collection|Flight[] $flights
*
* @package App\Models
app/Models/City.php
+7 -3
View File
@@ -11,11 +11,11 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class City
*
*
* @property int $id
* @property int $province_id
* @property string $name
*
*
* @property Province $province
* @property Collection|User[] $users
*
@@ -24,7 +24,6 @@ use Illuminate\Database\Eloquent\Model;
class City extends Model
{
protected $table = 'cities';
public $timestamps = false;
public static $snakeAttributes = false;
protected $casts = [
@@ -45,4 +44,9 @@ class City extends Model
{
return $this->hasMany(User::class);
}
public function airports()
{
return $this->hasMany(Airport::class);
}
}
app/Models/Flight.php
+4 -2
View File
@@ -31,7 +31,6 @@ use Illuminate\Database\Eloquent\Model;
* @property int $status
* @property Carbon $created_at
* @property Carbon $updated_at
*
* @property Airline $airline
* @property File|null $file
* @property Airport $airport
@@ -53,7 +52,8 @@ class Flight extends Model
'price' => 'float',
'capacity' => 'int',
'views' => 'int',
'status' => FlightStatus::class
'status' => FlightStatus::class,
'return_time' => 'datetime',
];
protected $fillable = [
@@ -72,6 +72,8 @@ class Flight extends Model
'status',
'created_by',
'updated_by',
'return_time',
];
protected $hidden = [
app/Models/Province.php
+2 -3
View File
@@ -11,10 +11,10 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class Province
*
*
* @property int $id
* @property string $name
*
*
* @property Collection|City[] $cities
* @property Collection|User[] $users
*
@@ -23,7 +23,6 @@ use Illuminate\Database\Eloquent\Model;
class Province extends Model
{
protected $table = 'provinces';
public $timestamps = false;
public static $snakeAttributes = false;
protected $fillable = [
app/Models/User.php
+28 -19
View File
@@ -30,7 +30,7 @@ use Illuminate\Foundation\Auth\User as Authenticated;
* @property string $username
* @property string $password
* @property string $province
* @property string $city
* @property string $cities
* @property int $status
* @property Carbon $created_at
* @property Carbon $updated_at
@@ -58,24 +58,23 @@ class User extends Authenticated
'password'
];
protected $fillable = [
'first_name',
'last_name',
'national_code',
'gender',
'marital_status',
'spouse_name',
'mobile',
'email',
'file_id',
'username',
'password',
'province',
'city',
'status',
'deleted'
];
protected $fillable = [
'first_name',
'last_name',
'national_code',
'gender',
'marital_status',
'spouse_name',
'mobile',
'email',
'file_id',
'username',
'password',
'province_id',
'city_id',
'status',
'deleted'
];
public function file()
{
return $this->belongsTo(File::class);
@@ -95,4 +94,14 @@ class User extends Authenticated
{
return $this->hasMany(Wishlist::class);
}
public function province()
{
return $this->belongsTo(Province::class);
}
public function city()
{
return $this->belongsTo(City::class, 'city_id');
}
}