diff --git a/app/Enums/Flight/FlightScope.php b/app/Enums/Flight/FlightScope.php index 7fbc0f4..778900e 100644 --- a/app/Enums/Flight/FlightScope.php +++ b/app/Enums/Flight/FlightScope.php @@ -4,8 +4,8 @@ namespace App\Enums\Flight; enum FlightScope:int { - case Domestic = 1; - case International = 2; + case Domestic = 0; + case International = 1; public function label(): string { diff --git a/app/Enums/Flight/FlightType.php b/app/Enums/Flight/FlightType.php index 2b4ec6d..c6e5afd 100644 --- a/app/Enums/Flight/FlightType.php +++ b/app/Enums/Flight/FlightType.php @@ -4,8 +4,8 @@ namespace App\Enums\Flight; enum FlightType:int { - case Systematic = 1; - case Charter = 2; + case Systematic = 0; + case Charter = 1; public function label(): string { diff --git a/app/Enums/Tour/TourStatus.php b/app/Enums/Tour/TourStatus.php new file mode 100644 index 0000000..d52cda9 --- /dev/null +++ b/app/Enums/Tour/TourStatus.php @@ -0,0 +1,21 @@ + 'در دسترس', + self::FULL => 'تکمیل', + self::CANCELLED => 'کنسل شده', + self::DRAFT => 'در امتظار' + }; + } +} diff --git a/app/Enums/Flight/TourType.php b/app/Enums/Tour/TourType.php similarity index 93% rename from app/Enums/Flight/TourType.php rename to app/Enums/Tour/TourType.php index 3502f91..f04f6af 100644 --- a/app/Enums/Flight/TourType.php +++ b/app/Enums/Tour/TourType.php @@ -1,6 +1,6 @@ where('status', '=' , FlightStatus::AVAILABLE) ->orderByDesc('created_at') - ->paginate(4); + ->paginate(2, ['*'], 'flights_page'); $tours = Tour::with(['file' , 'originCity', 'city']) + ->where('status', '=', TourStatus::AVAILABLE) ->orderByDesc('created_at') - ->paginate(4); + ->paginate(2, ['*'], 'tours_page');e(4); diff --git a/app/Models/Tour.php b/app/Models/Tour.php index 9cc3c8f..8ea6cc6 100644 --- a/app/Models/Tour.php +++ b/app/Models/Tour.php @@ -7,9 +7,10 @@ namespace App\Models; -use App\Enums\Flight\TourType; use App\Enums\Tour\TourMode; use App\Enums\Tour\TourScope; +use App\Enums\Tour\TourStatus; +use App\Enums\Tour\TourType; use Carbon\Carbon; use Illuminate\Database\Eloquent\Attributes\Scope; use Illuminate\Database\Eloquent\Builder; @@ -50,7 +51,8 @@ class Tour extends Model 'tour_mode'=> TourMode::class, 'tour_scope' => TourScope::class, 'tour_type' => TourType::class, - 'views_count' => 'int' + 'views_count' => 'int', + 'status'=>TourStatus::class ]; protected $fillable = [ @@ -63,6 +65,7 @@ class Tour extends Model 'tour_type', 'tour_mode', 'tour_scope', + 'status', 'views_count' ]; #[Scope] diff --git a/resources/views/admin/layouts/sidebar.blade.php b/resources/views/admin/layouts/sidebar.blade.php index b4e3f83..e08c5a7 100644 --- a/resources/views/admin/layouts/sidebar.blade.php +++ b/resources/views/admin/layouts/sidebar.blade.php @@ -96,27 +96,6 @@ @endif - -
در حال حاضر توری برای نمایش وجود ندارد.
@endforelse - {{ $tours->links() }} + {{ $tours->appends(request()->except('tours_page'))->links() }} diff --git a/storage/framework/views/2136a7dd98becfb3e04bce4594c1e881.php b/storage/framework/views/2136a7dd98becfb3e04bce4594c1e881.php new file mode 100644 index 0000000..a780ea7 --- /dev/null +++ b/storage/framework/views/2136a7dd98becfb3e04bce4594c1e881.php @@ -0,0 +1,721 @@ +startSection('breadcrumb'); ?> ++ ورود به پنل مدیریت +
++ برای ورود به پنل مدیریت لطفا اطلاعات فرم را وارد کنید. +
+ + + +در حال حاضر توری برای نمایش وجود ندارد.
- links()); ?> + appends(request()->except('tours_page'))->links()); ?> diff --git a/storage/framework/views/b2e4ef51ca161dca1548ebdfa1871732.php b/storage/framework/views/b2e4ef51ca161dca1548ebdfa1871732.php new file mode 100644 index 0000000..a360efd --- /dev/null +++ b/storage/framework/views/b2e4ef51ca161dca1548ebdfa1871732.php @@ -0,0 +1,781 @@ +startSection('breadcrumb'); ?> +