diff --git a/app/Http/Controllers/Admin/FlightController.php b/app/Http/Controllers/Admin/FlightController.php
index 50e6384..39147bc 100644
--- a/app/Http/Controllers/Admin/FlightController.php
+++ b/app/Http/Controllers/Admin/FlightController.php
@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\FlightStoreRequest;
 use App\Models\ActivityLog;
 use App\Models\Flight;
+use Hekmatinasser\Verta\Verta;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
@@ -38,6 +39,14 @@ class FlightController extends Controller
         try {
 
             $data = $request->validated();
+            if ($request->departure_date) {
+
+                $data['departure_date'] = Verta::parse(
+                    $request->departure_date
+                )->formatGregorian('Y-m-d');
+
+            }
+
 
             if ($request->hasFile('image')) {
 
@@ -94,6 +103,13 @@ class FlightController extends Controller
 
             $data = $request->validated();
 
+            if ($request->departure_date) {
+
+                $data['departure_date'] = Verta::parse(
+                    $request->departure_date
+                )->formatGregorian('Y-m-d');
+
+            }
 
             if ($request->hasFile('image')) {
 
diff --git a/app/Http/Controllers/Admin/TourController.php b/app/Http/Controllers/Admin/TourController.php
index a6dbbea..80f1022 100644
--- a/app/Http/Controllers/Admin/TourController.php
+++ b/app/Http/Controllers/Admin/TourController.php
@@ -7,6 +7,7 @@ use App\Http\Requests\TourStoreRequest;
 use App\Models\ActivityLog;
 use App\Models\Tour;
 use App\Models\TravelType;
+use Hekmatinasser\Verta\Verta;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
@@ -41,6 +42,14 @@ class TourController extends Controller
 
             $data = $request->validated();
 
+            if ($request->departure_date) {
+
+                $data['departure_date'] = Verta::parse(
+                    $request->departure_date
+                )->formatGregorian('Y-m-d');
+
+            }
+
             if ($request->hasFile('image')) {
 
                 $data['image'] = $request
@@ -97,6 +106,13 @@ class TourController extends Controller
 
             $data = $request->validated();
 
+            if ($request->departure_date) {
+
+                $data['departure_date'] = Verta::parse(
+                    $request->departure_date
+                )->formatGregorian('Y-m-d');
+
+            }
 
             if ($request->hasFile('image')) {
 
diff --git a/app/Http/Requests/Admin/FlightStoreRequest.php b/app/Http/Requests/Admin/FlightStoreRequest.php
index c79e500..8d262fa 100644
--- a/app/Http/Requests/Admin/FlightStoreRequest.php
+++ b/app/Http/Requests/Admin/FlightStoreRequest.php
@@ -44,9 +44,8 @@ class FlightStoreRequest extends FormRequest
                 'max:100'
             ],
             'departure_date' => [
-                'required',
-                'string',
-             ],
+                'required'
+              ],
             'departure_time' => [
                 'required',
                 'date_format:H:i'
diff --git a/app/Http/Requests/TourStoreRequest.php b/app/Http/Requests/TourStoreRequest.php
index 49c307e..2e50d19 100644
--- a/app/Http/Requests/TourStoreRequest.php
+++ b/app/Http/Requests/TourStoreRequest.php
@@ -77,9 +77,7 @@ class TourStoreRequest extends FormRequest
 
             'departure_date' => [
                 'required',
-                'date',
-                'after_or_equal:today',
-              ],
+            ],
 
 
             'status' => [
diff --git a/resources/views/admin/flights/create.blade.php b/resources/views/admin/flights/create.blade.php
index 3b3ba52..db0b961 100644
--- a/resources/views/admin/flights/create.blade.php
+++ b/resources/views/admin/flights/create.blade.php
@@ -75,6 +75,12 @@
                            name="origin"
                            class="form-control"
                            value="{{ old('origin') }}">
+                    @error('origin')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
+
 
                 </div>
 
@@ -89,6 +95,11 @@
                            name="destination"
                            class="form-control"
                            value="{{ old('destination') }}">
+                    @error('destination')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
 
                 </div>
 
@@ -101,6 +112,11 @@
                     <input type="time"
                            name="departure_time"
                            class="form-control">
+                    @error('departure_time')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
 
                 </div>
 
@@ -114,6 +130,11 @@
                     <input type="time"
                            name="arrival_time"
                            class="form-control">
+                    @error('arrival_time')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
 
                 </div>
 
@@ -123,28 +144,39 @@
                         نوع پرواز
                     </label>
 
-                    <select name="type" class="form-control">                        <option value="0">داخلی</option>
+                    <select name="type" class="form-control">
+                        <option value="0">داخلی</option>
                         <option value="2">خارجی</option>
                         <option value="3">چارتر</option>
                     </select>
+                    @error('type')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
 
                 </div>
 
 
+                <div class="mb-3">
 
-                <div class="col-md-4 mb-3">
-
-                    <label>
-                        تاریخ حرکت
+                    <label class="form-label">
+                        تاریخ حرکت پرواز
                     </label>
 
                     <input type="text"
-                           name="departure_date"
                            id="departure_date"
+                           name="departure_date"
                            class="form-control"
-                           autocomplete="off">
-                </div>
+                           placeholder="انتخاب تاریخ حرکت">
 
+                    @error('departure_date')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
+
+                </div>
 
 
                 <div class="col-md-4 mb-3">
@@ -156,6 +188,11 @@
                     <input type="text"
                            name="flight_class"
                            class="form-control">
+                    @error('flight_class')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
 
                 </div>
 
@@ -171,6 +208,11 @@
                     <input type="number"
                            name="capacity"
                            class="form-control">
+                    @error('capacity')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
 
                 </div>
 
@@ -185,6 +227,11 @@
                     <input type="number"
                            name="price"
                            class="form-control">
+                    @error('price')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
 
                 </div>
 
@@ -199,6 +246,11 @@
                     <input type="file"
                            name="image"
                            class="form-control">
+                    @error('image')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
 
                 </div>
 
@@ -210,12 +262,19 @@
                         وضعیت
                     </label>
 
-                    <select name="status" class="form-control">                        <option value="0">پیش‌نویس</option>
+                    <select name="status" class="form-control">
+                        <option value="0">پیش‌نویس</option>
                         <option value="1">فعال</option>
                         <option value="2">غیرفعال</option>
                         <option value="3">تمام شده</option>
                         <option value="4">لغو شده</option>
                     </select>
+                    @error('status')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
+
                 </div>
 
 
@@ -231,4 +290,12 @@
 
     </div>
 
+    <script>
+        $("#departure_date").persianDatepicker({
+            format: 'YYYY/MM/DD',
+            autoClose: true,
+            initialValue: false,
+            minDate: new persianDate()
+        });
+    </script>
 @endsection
diff --git a/resources/views/admin/flights/edit.blade.php b/resources/views/admin/flights/edit.blade.php
index bab667b..3c91165 100644
--- a/resources/views/admin/flights/edit.blade.php
+++ b/resources/views/admin/flights/edit.blade.php
@@ -140,10 +140,11 @@
                     </label>
 
                     <input type="text"
-                           name="departure_date"
                            id="departure_date"
-                           class="form-control"
-                           autocomplete="off">
+                           name="departure_date"
+                           class="form-control">
+                    {{ verta($flight->departure_date)->format('Y/m/d') }}
+
                 </div>
 
 
@@ -233,4 +234,12 @@
 
     </div>
 
+    <script>
+        $("#departure_date").persianDatepicker({
+            format: 'YYYY/MM/DD',
+            autoClose: true,
+            initialValue: false,
+            minDate: new persianDate()
+        });
+    </script>
 @endsection
diff --git a/resources/views/admin/flights/index.blade.php b/resources/views/admin/flights/index.blade.php
index 76980f8..7b8e0b8 100644
--- a/resources/views/admin/flights/index.blade.php
+++ b/resources/views/admin/flights/index.blade.php
@@ -125,6 +125,9 @@
                 <th>
                     شماره پرواز
                 </th>
+                <th>
+                    تاریخ حرکت
+                </th>
 
                 <th>
                     مسیر
diff --git a/resources/views/admin/layouts/app.blade.php b/resources/views/admin/layouts/app.blade.php
index a37f4f9..cc1841c 100644
--- a/resources/views/admin/layouts/app.blade.php
+++ b/resources/views/admin/layouts/app.blade.php
@@ -14,8 +14,10 @@
         @endisset
     </title>
 
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/persian-datepicker@1.2.0/dist/css/persian-datepicker.min.css">
      <link href="{{asset('assets/bootstrap-5.3.8-examples/assets/dist/css/bootstrap.rtl.min.css')}}" rel="stylesheet">
     <link href="{{ asset('assets/admin/css/style.css') }}" rel="stylesheet">
+
 </head>
 
 
@@ -35,5 +37,9 @@
 
 @includeUnless(isset($rawLayout),'admin.layouts.footer')
 
+
+<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/persian-date@1.1.0/dist/persian-date.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/persian-datepicker@1.2.0/dist/js/persian-datepicker.min.js"></script>
 </body>
 </html>
diff --git a/resources/views/admin/tours/create.blade.php b/resources/views/admin/tours/create.blade.php
index 9740909..7ac7ed6 100644
--- a/resources/views/admin/tours/create.blade.php
+++ b/resources/views/admin/tours/create.blade.php
@@ -41,6 +41,13 @@
                            class="form-control"
                            value="{{ old('title') }}">
 
+                    @error('title')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
+
+
                 </div>
 
 
@@ -67,6 +74,12 @@
                         </option>
 
                     </select>
+                    @error('travel_type_id')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
+
                 </div>
 
 
@@ -79,7 +92,13 @@
 
                     <textarea name="summary"
                               class="form-control"
-                              rows="3">{{ old('summary') }}</textarea>
+                              rows="3">{{ old('summary') }}
+                    </textarea>
+                    @error('summary')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
 
                 </div>
 
@@ -93,7 +112,13 @@
 
                     <textarea name="description"
                               class="form-control"
-                              rows="6">{{ old('description') }}</textarea>
+                              rows="6">{{ old('description') }}
+                    </textarea>
+                    @error('description')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
 
                 </div>
 
@@ -109,28 +134,36 @@
                            name="price"
                            class="form-control"
                            value="{{ old('price') }}">
+                    @error('price')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
 
                 </div>
 
 
 
-                <div class="col-md-4 mb-3">
+                <div class="mb-3">
 
-                    <label>
-                        تاریخ حرکت
+                    <label class="form-label">
+                        تاریخ حرکت تور
                     </label>
 
                     <input type="text"
-                           name="departure_date"
                            id="departure_date"
+                           name="departure_date"
                            class="form-control"
-                           autocomplete="off"
-                           value="{{ old('departure_date') }}">
+                           placeholder="انتخاب تاریخ حرکت">
+
+                    @error('departure_date')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
 
                 </div>
 
-
-
                 <div class="col-md-4 mb-3">
 
                     <label>
@@ -140,6 +173,11 @@
                     <input type="file"
                            name="image"
                            class="form-control">
+                    @error('image')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
 
                 </div>
 
@@ -167,6 +205,11 @@
                         </option>
 
                     </select>
+                    @error('status')
+                    <div class="text-danger mt-2">
+                        {{ $message }}
+                    </div>
+                    @enderror
 
                 </div>
 
@@ -185,5 +228,19 @@
 
     </div>
 
+    <script>
 
+        $("#start_date").persianDatepicker({
+
+            format: 'YYYY/MM/DD',
+
+            autoClose: true,
+
+            initialValue: false,
+
+            minDate: new persianDate()
+
+        });
+
+    </script>
 @endsection
diff --git a/resources/views/admin/tours/edit.blade.php b/resources/views/admin/tours/edit.blade.php
index 21291c9..efb2d42 100644
--- a/resources/views/admin/tours/edit.blade.php
+++ b/resources/views/admin/tours/edit.blade.php
@@ -104,20 +104,22 @@
 
 
 
-                <div class="col-md-4 mb-3">
+                <div class="mb-3">
 
-                    <label>تاریخ حرکت</label>
+                    <label class="form-label">
+                        تاریخ حرکت تور
+                    </label>
 
                     <input type="text"
-                           name="departure_date"
-                           id="departure_date"
+                           id="start_date"
+                           name="start_date"
                            class="form-control"
-                           value="{{ old('departure_date',$tour->departure_date) }}">
+                           placeholder="انتخاب تاریخ حرکت">
+                    {{ verta($tour->departure_date)->format('Y/m/d') }}
+
 
                 </div>
 
-
-
                 <div class="col-md-4 mb-3">
 
                     <label>وضعیت</label>
@@ -188,5 +190,19 @@
 
     </div>
 
+    <script>
 
+        $("#start_date").persianDatepicker({
+
+            format: 'YYYY/MM/DD',
+
+            autoClose: true,
+
+            initialValue: false,
+
+            minDate: new persianDate()
+
+        });
+
+    </script>
 @endsection