diff --git a/app/Http/Controllers/Admin/FlightController.php b/app/Http/Controllers/Admin/FlightController.php index 160b7af..d7d92e5 100644 --- a/app/Http/Controllers/Admin/FlightController.php +++ b/app/Http/Controllers/Admin/FlightController.php @@ -22,11 +22,12 @@ class FlightController extends Controller 'destinationAirport', ]) ->latest('id') - ->paginate(10); + ->paginate(5); + + + foreach ($flights as $flight) { - $flight->start_date_fa = $flight->start_time - ? $flight->start_time->toJalali()->format('Y/m/d') - : null; + $flight->start_date_fa = $flight->start_time ? $flight->start_time->toJalali()->format('Y/m/d') : null; $flight->end_date_fa = $flight->end_time ? $flight->end_time->toJalali()->format('Y/m/d') diff --git a/app/Http/Requests/Admins/FlightPostRequest.php b/app/Http/Requests/Admins/FlightPostRequest.php index d547ff1..8b09c4c 100644 --- a/app/Http/Requests/Admins/FlightPostRequest.php +++ b/app/Http/Requests/Admins/FlightPostRequest.php @@ -40,6 +40,7 @@ class FlightPostRequest extends FormRequest ], 'end_time' => [ 'required', + ], 'price' => [ 'required', diff --git a/resources/views/admin/admins/create.blade.php b/resources/views/admin/admins/create.blade.php index c6bb82f..df511c1 100644 --- a/resources/views/admin/admins/create.blade.php +++ b/resources/views/admin/admins/create.blade.php @@ -72,8 +72,7 @@
@error('password') {{ $message }} @@ -84,10 +83,8 @@
- +
diff --git a/resources/views/admin/tours/edit.blade.php b/resources/views/admin/tours/edit.blade.php index 927127a..4f3dd1b 100644 --- a/resources/views/admin/tours/edit.blade.php +++ b/resources/views/admin/tours/edit.blade.php @@ -155,9 +155,6 @@ - - بازگشت -
diff --git a/resources/views/dashboard/layouts/sidebar.blade.php b/resources/views/dashboard/layouts/sidebar.blade.php index 6d7e452..db34fde 100644 --- a/resources/views/dashboard/layouts/sidebar.blade.php +++ b/resources/views/dashboard/layouts/sidebar.blade.php @@ -146,41 +146,6 @@ -
  • - - - -
    - - - -
    - -
  • -