git commit"fix flight type display and status handling"

app/Http/Controllers/Admin/FlightController.php

@@ -5,6 +5,8 @@ namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\FlightStoreRequest;
 use App\Models\Flight;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
 
 class FlightController extends Controller
 {
@@ -12,52 +14,128 @@ class FlightController extends Controller
     {
         $flights = Flight::latest()->paginate(4);
 
-        return view('admin.flights.index',compact('flights'));
+        return view('admin.flights.index', compact('flights'));
     }
+
+
     public function create()
     {
         return view('admin.flights.create');
     }
+
+
     public function store(FlightStoreRequest $request)
     {
-        $data = $request->validated();
+        DB::beginTransaction();
 
-        $data['type'] = (int) $data['type'];
+        try {
 
-        if ($request->hasFile('image')) {
-            $data['image'] = $request->file('image')->store('flights', 'public');
+            $data = $request->validated();
+
+
+            if ($request->hasFile('image')) {
+
+                $data['image'] = $request
+                    ->file('image')
+                    ->store('flights','public');
+
+            }
+
+
+            Flight::create($data);
+
+
+            DB::commit();
+
+
+            return redirect()
+                ->route('admin.flights.index')
+                ->with('success','پرواز ثبت شد');
+
+
+        } catch(\Exception $e) {
+
+            DB::rollBack();
+
+            dd($e->getMessage());
         }
 
-        Flight::create($data);
-
-        return redirect()->route('admin.flights.index')
-            ->with('success', 'پرواز با موفقیت ثبت شد');
     }
 
+
+
     public function edit(Flight $flight)
     {
         return view('admin.flights.edit',compact('flight'));
-
     }
-         public function update(FlightStoreRequest $request, Flight $flight)
+
+
+
+    public function update(FlightStoreRequest $request, Flight $flight)
     {
-        $data = $request->validated();
 
-        $data['type'] = (int) $data['type'];
+        DB::beginTransaction();
+
+        try {
+
+            $data = $request->validated();
+
+
+            if ($request->hasFile('image')) {
+
+
+                if($flight->image){
+
+                    Storage::disk('public')
+                        ->delete($flight->image);
+
+                }
+
+
+                $data['image'] = $request
+                    ->file('image')
+                    ->store('flights','public');
+
+            }
+
+
+            $flight->update($data);
+
+
+            DB::commit();
+
+
+            return redirect()
+                ->route('admin.flights.index')
+                ->with('success','پرواز ویرایش شد');
+
+
+        }catch(\Exception $e){
+
+            DB::rollBack();
+
+            dd($e->getMessage());
 
-        if ($request->hasFile('image')) {
-            $data['image'] = $request->file('image')->store('flights', 'public');
         }
 
-        $flight->update($data);
-
-        return redirect()->route('admin.flights.index')
-            ->with('success', 'پرواز با موفقیت ویرایش شد');
     }
-     public function destroy(Flight $flight)
+
+    public function destroy(Flight $flight)
     {
+
+        if($flight->image){
+
+            Storage::disk('public')
+                ->delete($flight->image);
+
+        }
+
+
         $flight->delete();
-        return back()->with('پرواز با موفقیت حذف شد.');
+
+
+        return back()
+            ->with('success','پرواز حذف شد');
 
     }
 }

app/Http/Controllers/Admin/RoleController.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Admin;
 
+use App\Http\Controllers\Controller;
 use App\Models\Permission;
 use App\Models\Role;
 use Illuminate\Http\Request;
@@ -11,13 +12,13 @@ class RoleController extends Controller
     public function index()
     {
         $roles=Role::paginate(3);
-       return view('admins.Roles.index',compact('roles'));
+       return view('admin.Roles.index',compact('roles'));
     }
 
     public function permissions(Role $role)
     {
         $permissions=Permission::all();
-        return view('admins.Roles.permissions',compact('role','permissions'));
+        return view('admin.Roles.permissions',compact('role','permissions'));
     }
     public function updatePermissions(Request $request, Role $role)
     {

app/Http/Requests/Admin/FlightStoreRequest.php

@@ -46,10 +46,11 @@ class FlightStoreRequest extends FormRequest
             'departure_date'=>[
                 'required',
                 'date',
-
+                'after_or_equal:today'
             ],
             'departure_time'=>[
-                'required'
+                'required',
+                'date_format:H:i'
             ],
             'arrival_time'=>[
                 'required'