taxation module

Modules/Admin/app/Http/Controllers/AdminController.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace Modules\Admin\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+class AdminController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        return view('admin::index');
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        return view('admin::create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request): RedirectResponse
+    {
+        //
+    }
+
+    /**
+     * Show the specified resource.
+     */
+    public function show($id)
+    {
+        return view('admin::show');
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit($id)
+    {
+        return view('admin::edit');
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, $id): RedirectResponse
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}

Modules/Admin/app/Http/Controllers/CastesController.php

@@ -0,0 +1,218 @@
+<?php
+namespace Modules\Admin\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Validator;
+use App\Service\CommonModelService;
+use Log;
+use Exception;
+use Modules\Admin\Models\Castes;
+
+class CastesController extends Controller
+{
+    protected $modelService;
+    public function __construct(Castes $model)
+    {
+        $this->modelService = new CommonModelService($model);
+    }
+    public function index(Request $request)
+    {
+        // createActivityLog(CastesController::class, 'index', ' Castes index');
+        $data = Castes::where('status', '<>', -1)->orderBy('display_order')->get();
+
+        return view("admin::castes.index", compact('data'));
+    }
+
+    public function create(Request $request)
+    {
+        // createActivityLog(CastesController::class, 'create', ' Castes create');
+        $TableData = Castes::where('status', '<>', -1)->orderBy('display_order')->get();
+        $editable = false;
+        return view("admin::castes.edit", compact('TableData', 'editable'));
+    }
+
+    public function store(Request $request)
+    {
+        // createActivityLog(CastesController::class, 'store', ' Castes store');
+        $validator = Validator::make($request->all(), [
+            //ADD REQUIRED FIELDS FOR VALIDATION
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'error' => $validator->errors(),
+            ], 500);
+        }
+        $request->request->add(['alias' => slugify($request->title)]);
+        $request->request->add(['display_order' => getDisplayOrder('tbl_castes')]);
+        $request->request->add(['created_at' => date("Y-m-d h:i:s")]);
+        $request->request->add(['updated_at' => date("Y-m-d h:i:s")]);
+        $requestData = $request->all();
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL') . '/', '', $value);
+        });
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL'), '', $value);
+        });
+        DB::beginTransaction();
+        try {
+            $operationNumber = getOperationNumber();
+            $this->modelService->create($operationNumber, $operationNumber, null, $requestData);
+        } catch (\Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(CastesController::class, 'store', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        if ($request->ajax()) {
+            return response()->json(['status' => true, 'message' => 'The Castes Created Successfully.'], 200);
+        }
+        return redirect()->route('castes.index')->with('success', 'The Castes created Successfully.');
+    }
+
+    public function sort(Request $request)
+    {
+        $idOrder = $request->input('id_order');
+
+        foreach ($idOrder as $index => $id) {
+            $companyArticle = Castes::find($id);
+            $companyArticle->display_order = $index + 1;
+            $companyArticle->save();
+        }
+
+        return response()->json(['status' => true, 'content' => 'The articles sorted successfully.'], 200);
+    }
+    public function updatealias(Request $request)
+    {
+
+        $articleId = $request->input('articleId');
+        $newAlias = $request->input('newAlias');
+        $companyArticle = Castes::find($articleId);
+        if (!$companyArticle) {
+            return response()->json(['status' => false, 'content' => 'Company article not found.'], 404);
+        }
+        $companyArticle->alias = $newAlias;
+        $companyArticle->save();
+        return response()->json(['status' => true, 'content' => 'Alias updated successfully.'], 200);
+    }
+
+
+
+
+    public function show(Request $request, $id)
+    {
+        // createActivityLog(CastesController::class, 'show', ' Castes show');
+        $data = Castes::findOrFail($id);
+
+        return view("admin::castes.show", compact('data'));
+    }
+
+
+    public function edit(Request $request, $id)
+    {
+        // createActivityLog(CastesController::class, 'edit', ' Castes edit');
+        $TableData = Castes::where('status', '<>', -1)->orderBy('display_order')->get();
+        $data = Castes::findOrFail($id);
+        $editable = true;
+        return view("admin::castes.edit", compact('data', 'TableData', 'editable'));
+    }
+
+
+    public function update(Request $request, $id)
+    {
+        // createActivityLog(CastesController::class, 'update', ' Castes update');
+        $validator = Validator::make($request->all(), [
+            //ADD VALIDATION FOR REQIRED FIELDS
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'error' => $validator->errors(),
+            ], 500);
+        }
+        $requestData = $request->all();
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL') . '/', '', $value);
+        });
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL'), '', $value);
+        });
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->update($OperationNumber, $OperationNumber, null, $requestData, $request->input('caste_id'));
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(CastesController::class, 'update', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        if ($request->ajax()) {
+            return response()->json(['status' => true, 'message' => 'The Castes updated Successfully.'], 200);
+        }
+        // return redirect()->route('castes.index')->with('success','The Castes updated Successfully.');
+        return redirect()->back()->with('success', 'The  Castes  updated successfully.');
+    }
+
+    public function destroy(Request $request, $id)
+    {
+        // createActivityLog(CastesController::class, 'destroy', ' Castes destroy');
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->destroy($OperationNumber, $OperationNumber, $id);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(CastesController::class, 'destroy', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Castes Deleted Successfully.'], 200);
+    }
+    public function toggle(Request $request, $id)
+    {
+        // createActivityLog(CastesController::class, 'destroy', ' Castes destroy');
+        $data = Castes::findOrFail($id);
+        $requestData = ['status' => ($data->status == 1) ? 0 : 1];
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->update($OperationNumber, $OperationNumber, null, $requestData, $id);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(CastesController::class, 'destroy', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Castes Deleted Successfully.'], 200);
+    }
+    public function clone(Request $request, $id)
+    {
+        // createActivityLog(CastesController::class, 'clone', ' Castes clone');
+        $data = Castes::findOrFail($id);
+        unset($data['updatedby']);
+        unset($data['createdby']);
+        $requestData = $data->toArray();
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->create($OperationNumber, $OperationNumber, null, $requestData);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(CastesController::class, 'clone', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Castes Clonned Successfully.'], 200);
+    }
+
+
+
+}

Modules/Admin/app/Http/Controllers/CitiesController.php

@@ -0,0 +1,219 @@
+<?php
+
+namespace Modules\Admin\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Validator;
+use App\Service\CommonModelService;
+use Log;
+use Exception;
+use Modules\Admin\Models\Cities;
+
+class CitiesController extends Controller
+{
+    protected $modelService;
+    public function __construct(Cities $model)
+    {
+        $this->modelService = new CommonModelService($model);
+    }
+    public function index(Request $request)
+    {
+        // createActivityLog(CitiesController::class, 'index', ' Cities index');
+        $data = Cities::where('status', '<>', -1)->orderBy('display_order')->get();
+
+        return view("admin::cities.index", compact('data'));
+    }
+
+    public function create(Request $request)
+    {
+        // createActivityLog(CitiesController::class, 'create', ' Cities create');
+        $TableData = Cities::where('status', '<>', -1)->orderBy('display_order')->get();
+        $editable = false;
+        return view("admin::cities.edit", compact('TableData', 'editable'));
+    }
+
+    public function store(Request $request)
+    {
+        // createActivityLog(CitiesController::class, 'store', ' Cities store');
+        $validator = Validator::make($request->all(), [
+            //ADD REQUIRED FIELDS FOR VALIDATION
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'error' => $validator->errors(),
+            ], 500);
+        }
+        $request->request->add(['alias' => slugify($request->title)]);
+        $request->request->add(['display_order' => getDisplayOrder('tbl_cities')]);
+        $request->request->add(['created_at' => date("Y-m-d h:i:s")]);
+        $request->request->add(['updated_at' => date("Y-m-d h:i:s")]);
+        $requestData = $request->all();
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL') . '/', '', $value);
+        });
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL'), '', $value);
+        });
+        DB::beginTransaction();
+        try {
+            $operationNumber = getOperationNumber();
+            $this->modelService->create($operationNumber, $operationNumber, null, $requestData);
+        } catch (\Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(CitiesController::class, 'store', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        if ($request->ajax()) {
+            return response()->json(['status' => true, 'message' => 'The Cities Created Successfully.'], 200);
+        }
+        return redirect()->route('cities.index')->with('success', 'The Cities created Successfully.');
+    }
+
+    public function sort(Request $request)
+    {
+        $idOrder = $request->input('id_order');
+
+        foreach ($idOrder as $index => $id) {
+            $companyArticle = Cities::find($id);
+            $companyArticle->display_order = $index + 1;
+            $companyArticle->save();
+        }
+
+        return response()->json(['status' => true, 'content' => 'The articles sorted successfully.'], 200);
+    }
+    public function updatealias(Request $request)
+    {
+
+        $articleId = $request->input('articleId');
+        $newAlias = $request->input('newAlias');
+        $companyArticle = Cities::find($articleId);
+        if (!$companyArticle) {
+            return response()->json(['status' => false, 'content' => 'Company article not found.'], 404);
+        }
+        $companyArticle->alias = $newAlias;
+        $companyArticle->save();
+        return response()->json(['status' => true, 'content' => 'Alias updated successfully.'], 200);
+    }
+
+
+
+
+    public function show(Request $request, $id)
+    {
+        // createActivityLog(CitiesController::class, 'show', ' Cities show');
+        $data = Cities::findOrFail($id);
+
+        return view("admin::cities.show", compact('data'));
+    }
+
+
+    public function edit(Request $request, $id)
+    {
+        // createActivityLog(CitiesController::class, 'edit', ' Cities edit');
+        $TableData = Cities::where('status', '<>', -1)->orderBy('display_order')->get();
+        $data = Cities::findOrFail($id);
+        $editable = true;
+        return view("admin::cities.edit", compact('data', 'TableData', 'editable'));
+    }
+
+
+    public function update(Request $request, $id)
+    {
+        // createActivityLog(CitiesController::class, 'update', ' Cities update');
+        $validator = Validator::make($request->all(), [
+            //ADD VALIDATION FOR REQIRED FIELDS
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'error' => $validator->errors(),
+            ], 500);
+        }
+        $requestData = $request->all();
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL') . '/', '', $value);
+        });
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL'), '', $value);
+        });
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->update($OperationNumber, $OperationNumber, null, $requestData, $request->input('city_id'));
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(CitiesController::class, 'update', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        if ($request->ajax()) {
+            return response()->json(['status' => true, 'message' => 'The Cities updated Successfully.'], 200);
+        }
+        // return redirect()->route('cities.index')->with('success','The Cities updated Successfully.');
+        return redirect()->back()->with('success', 'The  Cities  updated successfully.');
+    }
+
+    public function destroy(Request $request, $id)
+    {
+        // createActivityLog(CitiesController::class, 'destroy', ' Cities destroy');
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->destroy($OperationNumber, $OperationNumber, $id);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(CitiesController::class, 'destroy', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Cities Deleted Successfully.'], 200);
+    }
+    public function toggle(Request $request, $id)
+    {
+        // createActivityLog(CitiesController::class, 'destroy', ' Cities destroy');
+        $data = Cities::findOrFail($id);
+        $requestData = ['status' => ($data->status == 1) ? 0 : 1];
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->update($OperationNumber, $OperationNumber, null, $requestData, $id);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(CitiesController::class, 'destroy', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Cities Deleted Successfully.'], 200);
+    }
+    public function clone(Request $request, $id)
+    {
+        // createActivityLog(CitiesController::class, 'clone', ' Cities clone');
+        $data = Cities::findOrFail($id);
+        unset($data['updatedby']);
+        unset($data['createdby']);
+        $requestData = $data->toArray();
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->create($OperationNumber, $OperationNumber, null, $requestData);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(CitiesController::class, 'clone', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Cities Clonned Successfully.'], 200);
+    }
+
+
+
+}

Modules/Admin/app/Http/Controllers/CountriesController.php

@@ -1,14 +1,15 @@
 <?php
-namespace App\Http\Controllers;
+
+namespace Modules\Admin\Http\Controllers;
 
 use App\Http\Controllers\Controller;
-use App\Models\Country\Country;
 use App\Service\CommonModelService;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 use Log;
+use Modules\Admin\Models\Country;
 
 class CountriesController extends Controller
 {
@@ -22,15 +23,14 @@ class CountriesController extends Controller
         // createActivityLog(CountriesController::class, 'index', ' Country index');
         $data = Country::where('status', '<>', -1)->orderBy('display_order')->get();
 
-        return view("crud.generated.countries.index", compact('data'));
+        return view("admin::countries.index", compact('data'));
     }
 
     public function create(Request $request)
     {
         // createActivityLog(CountriesController::class, 'create', ' Country create');
-        $TableData = Country::where('status', '<>', -1)->orderBy('display_order')->get();
         $editable = false;
-        return view("crud.generated.countries.edit", compact('TableData', 'editable'));
+        return view("admin::countries.edit", compact('editable'));
     }
 
     public function store(Request $request)
@@ -104,7 +104,7 @@ class CountriesController extends Controller
         // createActivityLog(CountriesController::class, 'show', ' Country show');
         $data = Country::findOrFail($id);
 
-        return view("crud.generated.countries.show", compact('data'));
+        return view("admin::countries.show", compact('data'));
     }
 
     public function edit(Request $request, $id)
@@ -113,7 +113,7 @@ class CountriesController extends Controller
         $TableData = Country::where('status', '<>', -1)->orderBy('display_order')->get();
         $data = Country::findOrFail($id);
         $editable = true;
-        return view("crud.generated.countries.edit", compact('data', 'TableData', 'editable'));
+        return view("admin::countries.edit", compact('data', 'TableData', 'editable'));
     }
 
     public function update(Request $request, $id)
@@ -187,7 +187,7 @@ class CountriesController extends Controller
         DB::commit();
         return response()->json(['status' => true, 'message' => 'The Country Deleted Successfully.'], 200);
     }
-    public function clone (Request $request, $id)
+    public function clone(Request $request, $id)
     {
         // createActivityLog(CountriesController::class, 'clone', ' Country clone');
         $data = Country::findOrFail($id);

Modules/Admin/app/Http/Controllers/DistrictsController.php

@@ -0,0 +1,218 @@
+<?php
+namespace Modules\Admin\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Validator;
+use App\Service\CommonModelService;
+use Log;
+use Exception;
+use Modules\Admin\Models\Districts;
+
+class DistrictsController extends Controller
+{
+    protected $modelService;
+    public function __construct(Districts $model)
+    {
+        $this->modelService = new CommonModelService($model);
+    }
+    public function index(Request $request)
+    {
+        // createActivityLog(DistrictsController::class, 'index', ' Districts index');
+        $data = Districts::where('status', '<>', -1)->orderBy('display_order')->get();
+
+        return view("admin::districts.index", compact('data'));
+    }
+
+    public function create(Request $request)
+    {
+        // createActivityLog(DistrictsController::class, 'create', ' Districts create');
+        $TableData = Districts::where('status', '<>', -1)->orderBy('display_order')->get();
+        $editable = false;
+        return view("admin::districts.edit", compact('TableData', 'editable'));
+    }
+
+    public function store(Request $request)
+    {
+        // createActivityLog(DistrictsController::class, 'store', ' Districts store');
+        $validator = Validator::make($request->all(), [
+            //ADD REQUIRED FIELDS FOR VALIDATION
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'error' => $validator->errors(),
+            ], 500);
+        }
+        $request->request->add(['alias' => slugify($request->title)]);
+        $request->request->add(['display_order' => getDisplayOrder('tbl_districts')]);
+        $request->request->add(['created_at' => date("Y-m-d h:i:s")]);
+        $request->request->add(['updated_at' => date("Y-m-d h:i:s")]);
+        $requestData = $request->all();
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL') . '/', '', $value);
+        });
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL'), '', $value);
+        });
+        DB::beginTransaction();
+        try {
+            $operationNumber = getOperationNumber();
+            $this->modelService->create($operationNumber, $operationNumber, null, $requestData);
+        } catch (\Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(DistrictsController::class, 'store', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        if ($request->ajax()) {
+            return response()->json(['status' => true, 'message' => 'The Districts Created Successfully.'], 200);
+        }
+        return redirect()->route('districts.index')->with('success', 'The Districts created Successfully.');
+    }
+
+    public function sort(Request $request)
+    {
+        $idOrder = $request->input('id_order');
+
+        foreach ($idOrder as $index => $id) {
+            $companyArticle = Districts::find($id);
+            $companyArticle->display_order = $index + 1;
+            $companyArticle->save();
+        }
+
+        return response()->json(['status' => true, 'content' => 'The articles sorted successfully.'], 200);
+    }
+    public function updatealias(Request $request)
+    {
+
+        $articleId = $request->input('articleId');
+        $newAlias = $request->input('newAlias');
+        $companyArticle = Districts::find($articleId);
+        if (!$companyArticle) {
+            return response()->json(['status' => false, 'content' => 'Company article not found.'], 404);
+        }
+        $companyArticle->alias = $newAlias;
+        $companyArticle->save();
+        return response()->json(['status' => true, 'content' => 'Alias updated successfully.'], 200);
+    }
+
+
+
+
+    public function show(Request $request, $id)
+    {
+        // createActivityLog(DistrictsController::class, 'show', ' Districts show');
+        $data = Districts::findOrFail($id);
+
+        return view("admin::districts.show", compact('data'));
+    }
+
+
+    public function edit(Request $request, $id)
+    {
+        // createActivityLog(DistrictsController::class, 'edit', ' Districts edit');
+        $TableData = Districts::where('status', '<>', -1)->orderBy('display_order')->get();
+        $data = Districts::findOrFail($id);
+        $editable = true;
+        return view("admin::districts.edit", compact('data', 'TableData', 'editable'));
+    }
+
+
+    public function update(Request $request, $id)
+    {
+        // createActivityLog(DistrictsController::class, 'update', ' Districts update');
+        $validator = Validator::make($request->all(), [
+            //ADD VALIDATION FOR REQIRED FIELDS
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'error' => $validator->errors(),
+            ], 500);
+        }
+        $requestData = $request->all();
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL') . '/', '', $value);
+        });
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL'), '', $value);
+        });
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->update($OperationNumber, $OperationNumber, null, $requestData, $request->input('district_id'));
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(DistrictsController::class, 'update', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        if ($request->ajax()) {
+            return response()->json(['status' => true, 'message' => 'The Districts updated Successfully.'], 200);
+        }
+        // return redirect()->route('districts.index')->with('success','The Districts updated Successfully.');
+        return redirect()->back()->with('success', 'The  Districts  updated successfully.');
+    }
+
+    public function destroy(Request $request, $id)
+    {
+        // createActivityLog(DistrictsController::class, 'destroy', ' Districts destroy');
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->destroy($OperationNumber, $OperationNumber, $id);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(DistrictsController::class, 'destroy', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Districts Deleted Successfully.'], 200);
+    }
+    public function toggle(Request $request, $id)
+    {
+        // createActivityLog(DistrictsController::class, 'destroy', ' Districts destroy');
+        $data = Districts::findOrFail($id);
+        $requestData = ['status' => ($data->status == 1) ? 0 : 1];
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->update($OperationNumber, $OperationNumber, null, $requestData, $id);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(DistrictsController::class, 'destroy', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Districts Deleted Successfully.'], 200);
+    }
+    public function clone(Request $request, $id)
+    {
+        // createActivityLog(DistrictsController::class, 'clone', ' Districts clone');
+        $data = Districts::findOrFail($id);
+        unset($data['updatedby']);
+        unset($data['createdby']);
+        $requestData = $data->toArray();
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->create($OperationNumber, $OperationNumber, null, $requestData);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(DistrictsController::class, 'clone', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Districts Clonned Successfully.'], 200);
+    }
+
+
+
+}

Modules/Admin/app/Http/Controllers/GendersController.php

@@ -0,0 +1,218 @@
+<?php
+namespace Modules\Admin\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Validator;
+use App\Service\CommonModelService;
+use Log;
+use Exception;
+use Modules\Admin\Models\Genders;
+
+class GendersController extends Controller
+{
+    protected $modelService;
+    public function __construct(Genders $model)
+    {
+        $this->modelService = new CommonModelService($model);
+    }
+    public function index(Request $request)
+    {
+        // createActivityLog(GendersController::class, 'index', ' Genders index');
+        $data = Genders::where('status', '<>', -1)->orderBy('display_order')->get();
+
+        return view("admin::genders.index", compact('data'));
+    }
+
+    public function create(Request $request)
+    {
+        // createActivityLog(GendersController::class, 'create', ' Genders create');
+        $TableData = Genders::where('status', '<>', -1)->orderBy('display_order')->get();
+        $editable = false;
+        return view("admin::genders.edit", compact('TableData', 'editable'));
+    }
+
+    public function store(Request $request)
+    {
+        // createActivityLog(GendersController::class, 'store', ' Genders store');
+        $validator = Validator::make($request->all(), [
+            //ADD REQUIRED FIELDS FOR VALIDATION
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'error' => $validator->errors(),
+            ], 500);
+        }
+        $request->request->add(['alias' => slugify($request->title)]);
+        $request->request->add(['display_order' => getDisplayOrder('tbl_genders')]);
+        $request->request->add(['created_at' => date("Y-m-d h:i:s")]);
+        $request->request->add(['updated_at' => date("Y-m-d h:i:s")]);
+        $requestData = $request->all();
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL') . '/', '', $value);
+        });
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL'), '', $value);
+        });
+        DB::beginTransaction();
+        try {
+            $operationNumber = getOperationNumber();
+            $this->modelService->create($operationNumber, $operationNumber, null, $requestData);
+        } catch (\Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(GendersController::class, 'store', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        if ($request->ajax()) {
+            return response()->json(['status' => true, 'message' => 'The Genders Created Successfully.'], 200);
+        }
+        return redirect()->route('genders.index')->with('success', 'The Genders created Successfully.');
+    }
+
+    public function sort(Request $request)
+    {
+        $idOrder = $request->input('id_order');
+
+        foreach ($idOrder as $index => $id) {
+            $companyArticle = Genders::find($id);
+            $companyArticle->display_order = $index + 1;
+            $companyArticle->save();
+        }
+
+        return response()->json(['status' => true, 'content' => 'The articles sorted successfully.'], 200);
+    }
+    public function updatealias(Request $request)
+    {
+
+        $articleId = $request->input('articleId');
+        $newAlias = $request->input('newAlias');
+        $companyArticle = Genders::find($articleId);
+        if (!$companyArticle) {
+            return response()->json(['status' => false, 'content' => 'Company article not found.'], 404);
+        }
+        $companyArticle->alias = $newAlias;
+        $companyArticle->save();
+        return response()->json(['status' => true, 'content' => 'Alias updated successfully.'], 200);
+    }
+
+
+
+
+    public function show(Request $request, $id)
+    {
+        // createActivityLog(GendersController::class, 'show', ' Genders show');
+        $data = Genders::findOrFail($id);
+
+        return view("admin::genders.show", compact('data'));
+    }
+
+
+    public function edit(Request $request, $id)
+    {
+        // createActivityLog(GendersController::class, 'edit', ' Genders edit');
+        $TableData = Genders::where('status', '<>', -1)->orderBy('display_order')->get();
+        $data = Genders::findOrFail($id);
+        $editable = true;
+        return view("admin::genders.edit", compact('data', 'TableData', 'editable'));
+    }
+
+
+    public function update(Request $request, $id)
+    {
+        // createActivityLog(GendersController::class, 'update', ' Genders update');
+        $validator = Validator::make($request->all(), [
+            //ADD VALIDATION FOR REQIRED FIELDS
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'error' => $validator->errors(),
+            ], 500);
+        }
+        $requestData = $request->all();
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL') . '/', '', $value);
+        });
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL'), '', $value);
+        });
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->update($OperationNumber, $OperationNumber, null, $requestData, $request->input('gender_id'));
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(GendersController::class, 'update', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        if ($request->ajax()) {
+            return response()->json(['status' => true, 'message' => 'The Genders updated Successfully.'], 200);
+        }
+        // return redirect()->route('genders.index')->with('success','The Genders updated Successfully.');
+        return redirect()->back()->with('success', 'The  Genders  updated successfully.');
+    }
+
+    public function destroy(Request $request, $id)
+    {
+        // createActivityLog(GendersController::class, 'destroy', ' Genders destroy');
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->destroy($OperationNumber, $OperationNumber, $id);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(GendersController::class, 'destroy', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Genders Deleted Successfully.'], 200);
+    }
+    public function toggle(Request $request, $id)
+    {
+        // createActivityLog(GendersController::class, 'destroy', ' Genders destroy');
+        $data = Genders::findOrFail($id);
+        $requestData = ['status' => ($data->status == 1) ? 0 : 1];
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->update($OperationNumber, $OperationNumber, null, $requestData, $id);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(GendersController::class, 'destroy', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Genders Deleted Successfully.'], 200);
+    }
+    public function clone(Request $request, $id)
+    {
+        // createActivityLog(GendersController::class, 'clone', ' Genders clone');
+        $data = Genders::findOrFail($id);
+        unset($data['updatedby']);
+        unset($data['createdby']);
+        $requestData = $data->toArray();
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->create($OperationNumber, $OperationNumber, null, $requestData);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(GendersController::class, 'clone', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Genders Clonned Successfully.'], 200);
+    }
+
+
+
+}

Modules/Admin/app/Http/Controllers/NationalitiesController.php

@@ -0,0 +1,218 @@
+<?php
+namespace Modules\Admin\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Validator;
+use App\Service\CommonModelService;
+use Log;
+use Exception;
+use Modules\Admin\Models\Nationalities;
+
+class NationalitiesController extends Controller
+{
+    protected $modelService;
+    public function __construct(Nationalities $model)
+    {
+        $this->modelService = new CommonModelService($model);
+    }
+    public function index(Request $request)
+    {
+        // createActivityLog(NationalitiesController::class, 'index', ' Nationalities index');
+        $data = Nationalities::where('status', '<>', -1)->orderBy('display_order')->get();
+
+        return view("admin::nationalities.index", compact('data'));
+    }
+
+    public function create(Request $request)
+    {
+        // createActivityLog(NationalitiesController::class, 'create', ' Nationalities create');
+        $TableData = Nationalities::where('status', '<>', -1)->orderBy('display_order')->get();
+        $editable = false;
+        return view("admin::nationalities.edit", compact('TableData', 'editable'));
+    }
+
+    public function store(Request $request)
+    {
+        // createActivityLog(NationalitiesController::class, 'store', ' Nationalities store');
+        $validator = Validator::make($request->all(), [
+            //ADD REQUIRED FIELDS FOR VALIDATION
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'error' => $validator->errors(),
+            ], 500);
+        }
+        $request->request->add(['alias' => slugify($request->title)]);
+        $request->request->add(['display_order' => getDisplayOrder('tbl_nationalities')]);
+        $request->request->add(['created_at' => date("Y-m-d h:i:s")]);
+        $request->request->add(['updated_at' => date("Y-m-d h:i:s")]);
+        $requestData = $request->all();
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL') . '/', '', $value);
+        });
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL'), '', $value);
+        });
+        DB::beginTransaction();
+        try {
+            $operationNumber = getOperationNumber();
+            $this->modelService->create($operationNumber, $operationNumber, null, $requestData);
+        } catch (\Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(NationalitiesController::class, 'store', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        if ($request->ajax()) {
+            return response()->json(['status' => true, 'message' => 'The Nationalities Created Successfully.'], 200);
+        }
+        return redirect()->route('nationalities.index')->with('success', 'The Nationalities created Successfully.');
+    }
+
+    public function sort(Request $request)
+    {
+        $idOrder = $request->input('id_order');
+
+        foreach ($idOrder as $index => $id) {
+            $companyArticle = Nationalities::find($id);
+            $companyArticle->display_order = $index + 1;
+            $companyArticle->save();
+        }
+
+        return response()->json(['status' => true, 'content' => 'The articles sorted successfully.'], 200);
+    }
+    public function updatealias(Request $request)
+    {
+
+        $articleId = $request->input('articleId');
+        $newAlias = $request->input('newAlias');
+        $companyArticle = Nationalities::find($articleId);
+        if (!$companyArticle) {
+            return response()->json(['status' => false, 'content' => 'Company article not found.'], 404);
+        }
+        $companyArticle->alias = $newAlias;
+        $companyArticle->save();
+        return response()->json(['status' => true, 'content' => 'Alias updated successfully.'], 200);
+    }
+
+
+
+
+    public function show(Request $request, $id)
+    {
+        // createActivityLog(NationalitiesController::class, 'show', ' Nationalities show');
+        $data = Nationalities::findOrFail($id);
+
+        return view("admin::nationalities.show", compact('data'));
+    }
+
+
+    public function edit(Request $request, $id)
+    {
+        // createActivityLog(NationalitiesController::class, 'edit', ' Nationalities edit');
+        $TableData = Nationalities::where('status', '<>', -1)->orderBy('display_order')->get();
+        $data = Nationalities::findOrFail($id);
+        $editable = true;
+        return view("admin::nationalities.edit", compact('data', 'TableData', 'editable'));
+    }
+
+
+    public function update(Request $request, $id)
+    {
+        // createActivityLog(NationalitiesController::class, 'update', ' Nationalities update');
+        $validator = Validator::make($request->all(), [
+            //ADD VALIDATION FOR REQIRED FIELDS
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'error' => $validator->errors(),
+            ], 500);
+        }
+        $requestData = $request->all();
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL') . '/', '', $value);
+        });
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL'), '', $value);
+        });
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->update($OperationNumber, $OperationNumber, null, $requestData, $request->input('nationality_id'));
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(NationalitiesController::class, 'update', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        if ($request->ajax()) {
+            return response()->json(['status' => true, 'message' => 'The Nationalities updated Successfully.'], 200);
+        }
+        // return redirect()->route('nationalities.index')->with('success','The Nationalities updated Successfully.');
+        return redirect()->back()->with('success', 'The  Nationalities  updated successfully.');
+    }
+
+    public function destroy(Request $request, $id)
+    {
+        // createActivityLog(NationalitiesController::class, 'destroy', ' Nationalities destroy');
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->destroy($OperationNumber, $OperationNumber, $id);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(NationalitiesController::class, 'destroy', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Nationalities Deleted Successfully.'], 200);
+    }
+    public function toggle(Request $request, $id)
+    {
+        // createActivityLog(NationalitiesController::class, 'destroy', ' Nationalities destroy');
+        $data = Nationalities::findOrFail($id);
+        $requestData = ['status' => ($data->status == 1) ? 0 : 1];
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->update($OperationNumber, $OperationNumber, null, $requestData, $id);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(NationalitiesController::class, 'destroy', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Nationalities Deleted Successfully.'], 200);
+    }
+    public function clone(Request $request, $id)
+    {
+        // createActivityLog(NationalitiesController::class, 'clone', ' Nationalities clone');
+        $data = Nationalities::findOrFail($id);
+        unset($data['updatedby']);
+        unset($data['createdby']);
+        $requestData = $data->toArray();
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->create($OperationNumber, $OperationNumber, null, $requestData);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(NationalitiesController::class, 'clone', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Nationalities Clonned Successfully.'], 200);
+    }
+
+
+
+}

Modules/Admin/app/Http/Controllers/ProvinceController.php

@@ -0,0 +1,218 @@
+<?php
+
+namespace Modules\Admin\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Validator;
+use App\Service\CommonModelService;
+use Log;
+use Exception;
+use Modules\Admin\Models\Province;
+
+class ProvinceController extends Controller
+{
+    protected $modelService;
+    public function __construct(Province $model)
+    {
+        $this->modelService = new CommonModelService($model);
+    }
+    public function index(Request $request)
+    {
+        // createActivityLog(ProvinceController::class, 'index', ' Province index');
+
+        $data = Province::where('status', '<>', -1)->orderBy('display_order')->get();
+
+        return view("admin::provinces.index", compact('data'));
+    }
+
+    public function create(Request $request)
+    {
+        // createActivityLog(ProvinceController::class, 'create', ' Province create');
+
+        $editable = false;
+
+        return view("admin::provinces.edit", compact('editable'));
+    }
+
+    public function store(Request $request)
+    {
+        // createActivityLog(ProvinceController::class, 'store', ' Province store');
+        $validator = Validator::make($request->all(), [
+            //ADD REQUIRED FIELDS FOR VALIDATION
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'error' => $validator->errors(),
+            ], 500);
+        }
+        $request->request->add(['alias' => slugify($request->title)]);
+        $request->request->add(['display_order' => getDisplayOrder('tbl_province')]);
+        $request->request->add(['created_at' => date("Y-m-d h:i:s")]);
+        $request->request->add(['updated_at' => date("Y-m-d h:i:s")]);
+        $requestData = $request->all();
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL') . '/', '', $value);
+        });
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL'), '', $value);
+        });
+        DB::beginTransaction();
+        try {
+            $operationNumber = getOperationNumber();
+            $this->modelService->create($operationNumber, $operationNumber, null, $requestData);
+        } catch (\Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(ProvinceController::class, 'store', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        if ($request->ajax()) {
+            return response()->json(['status' => true, 'message' => 'The Province Created Successfully.'], 200);
+        }
+        return redirect()->route('provinces.index')->with('success', 'The Province created Successfully.');
+    }
+
+    public function sort(Request $request)
+    {
+        $idOrder = $request->input('id_order');
+
+        foreach ($idOrder as $index => $id) {
+            $companyArticle = Province::find($id);
+            $companyArticle->display_order = $index + 1;
+            $companyArticle->save();
+        }
+
+        return response()->json(['status' => true, 'content' => 'The articles sorted successfully.'], 200);
+    }
+    public function updatealias(Request $request)
+    {
+
+        $articleId = $request->input('articleId');
+        $newAlias = $request->input('newAlias');
+        $companyArticle = Province::find($articleId);
+        if (!$companyArticle) {
+            return response()->json(['status' => false, 'content' => 'Company article not found.'], 404);
+        }
+        $companyArticle->alias = $newAlias;
+        $companyArticle->save();
+        return response()->json(['status' => true, 'content' => 'Alias updated successfully.'], 200);
+    }
+
+
+
+
+    public function show(Request $request, $id)
+    {
+        // createActivityLog(ProvinceController::class, 'show', ' Province show');
+        $data = Province::findOrFail($id);
+
+        return view("admin::provinces.show", compact('data'));
+    }
+
+
+    public function edit(Request $request, $id)
+    {
+        // createActivityLog(ProvinceController::class, 'edit', ' Province edit');
+        $TableData = Province::where('status', '<>', -1)->orderBy('display_order')->get();
+        $data = Province::findOrFail($id);
+        $editable = true;
+        return view("admin::provinces.edit", compact('data', 'TableData', 'editable'));
+    }
+
+
+    public function update(Request $request, $id)
+    {
+        // createActivityLog(ProvinceController::class, 'update', ' Province update');
+        $validator = Validator::make($request->all(), [
+            //ADD VALIDATION FOR REQIRED FIELDS
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'error' => $validator->errors(),
+            ], 500);
+        }
+        $requestData = $request->all();
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL') . '/', '', $value);
+        });
+        array_walk_recursive($requestData, function (&$value) {
+            $value = str_replace(env('APP_URL'), '', $value);
+        });
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->update($OperationNumber, $OperationNumber, null, $requestData, $request->input('provience_id'));
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(ProvinceController::class, 'update', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        if ($request->ajax()) {
+            return response()->json(['status' => true, 'message' => 'The Province updated Successfully.'], 200);
+        }
+        return redirect()->back()->with('success', 'The  Province  updated successfully.');
+    }
+
+    public function destroy(Request $request, $id)
+    {
+        // createActivityLog(ProvinceController::class, 'destroy', ' Province destroy');
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->destroy($OperationNumber, $OperationNumber, $id);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(ProvinceController::class, 'destroy', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Province Deleted Successfully.'], 200);
+    }
+    public function toggle(Request $request, $id)
+    {
+        // createActivityLog(ProvinceController::class, 'destroy', ' Province destroy');
+        $data = Province::findOrFail($id);
+        $requestData = ['status' => ($data->status == 1) ? 0 : 1];
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->update($OperationNumber, $OperationNumber, null, $requestData, $id);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(ProvinceController::class, 'destroy', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Province Deleted Successfully.'], 200);
+    }
+    public function clone(Request $request, $id)
+    {
+        // createActivityLog(ProvinceController::class, 'clone', ' Province clone');
+        $data = Province::findOrFail($id);
+        unset($data['updatedby']);
+        unset($data['createdby']);
+        $requestData = $data->toArray();
+        DB::beginTransaction();
+        try {
+            $OperationNumber = getOperationNumber();
+            $this->modelService->create($OperationNumber, $OperationNumber, null, $requestData);
+        } catch (Exception $e) {
+            DB::rollBack();
+            Log::info($e->getMessage());
+            createErrorLog(ProvinceController::class, 'clone', $e->getMessage());
+            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+        }
+        DB::commit();
+        return response()->json(['status' => true, 'message' => 'The Province Clonned Successfully.'], 200);
+    }
+
+}

Modules/Admin/app/Models/Castes.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Modules\Admin\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Castes extends Model
+{
+    use HasFactory;
+
+    protected $table = 'tbl_castes';
+    protected $primaryKey = 'caste_id';
+
+    protected $guarded = [];
+}

Modules/Admin/app/Models/Cities.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Modules\Admin\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Cities extends Model
+{
+    use HasFactory;
+
+    protected $table = 'tbl_cities';
+    protected $primaryKey = 'city_id';
+
+    protected $guarded = [];
+}

Modules/Admin/app/Models/Country.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Country;
+namespace Modules\Admin\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -15,14 +15,4 @@ class Country extends Model
         'country_code',
         'status',
     ];
-
-    public function provinces()
-    {
-        return $this->hasMany(Province::class);
-    }
-
-    public static function getCountries()
-    {
-        return self::select('id', 'country_name')->where('status', 'Active')->get();
-    }
 }

Modules/Admin/app/Models/Districts.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Modules\Admin\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Districts extends Model
+{
+    use HasFactory;
+
+    protected $table = 'tbl_districts';
+    protected $primaryKey = 'district_id';
+    protected $fillable = [
+        'district_name',
+        'countries_id',
+        'provinces_id',
+        'status',
+    ];
+}

Modules/Admin/app/Models/Genders.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Modules\Admin\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Genders extends Model
+{
+    use HasFactory;
+
+    protected $table = 'tbl_genders';
+    protected $primaryKey = 'gender_id';
+
+    protected $guarded = [];
+}

Modules/Admin/app/Models/Nationalities.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Modules\Admin\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Nationalities extends Model
+{
+    use HasFactory;
+
+    protected $table = 'tbl_nationalities';
+    protected $primaryKey = 'nationality_id';
+
+    protected $guarded = [];
+}

Modules/Admin/app/Models/Province.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Modules\Admin\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Province extends Model
+{
+    use HasFactory;
+
+    protected $table = 'tbl_provinces';
+    protected $primaryKey = 'province_id';
+    protected $fillable = [
+        'province_name',
+        'country_id',
+        'status',
+    ];
+    public function country()
+    {
+        return $this->belongsTo(Country::class);
+    }
+}

Modules/Admin/app/Providers/AdminServiceProvider.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace Modules\Admin\Providers;
+
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\ServiceProvider;
+
+class AdminServiceProvider extends ServiceProvider
+{
+    protected string $moduleName = 'Admin';
+
+    protected string $moduleNameLower = 'admin';
+
+    /**
+     * Boot the application events.
+     */
+    public function boot(): void
+    {
+        $this->registerCommands();
+        $this->registerCommandSchedules();
+        $this->registerTranslations();
+        $this->registerConfig();
+        $this->registerViews();
+        $this->loadMigrationsFrom(module_path($this->moduleName, 'database/migrations'));
+    }
+
+    /**
+     * Register the service provider.
+     */
+    public function register(): void
+    {
+        $this->app->register(RouteServiceProvider::class);
+    }
+
+    /**
+     * Register commands in the format of Command::class
+     */
+    protected function registerCommands(): void
+    {
+        // $this->commands([]);
+    }
+
+    /**
+     * Register command Schedules.
+     */
+    protected function registerCommandSchedules(): void
+    {
+        // $this->app->booted(function () {
+        //     $schedule = $this->app->make(Schedule::class);
+        //     $schedule->command('inspire')->hourly();
+        // });
+    }
+
+    /**
+     * Register translations.
+     */
+    public function registerTranslations(): void
+    {
+        $langPath = resource_path('lang/modules/'.$this->moduleNameLower);
+
+        if (is_dir($langPath)) {
+            $this->loadTranslationsFrom($langPath, $this->moduleNameLower);
+            $this->loadJsonTranslationsFrom($langPath);
+        } else {
+            $this->loadTranslationsFrom(module_path($this->moduleName, 'lang'), $this->moduleNameLower);
+            $this->loadJsonTranslationsFrom(module_path($this->moduleName, 'lang'));
+        }
+    }
+
+    /**
+     * Register config.
+     */
+    protected function registerConfig(): void
+    {
+        $this->publishes([module_path($this->moduleName, 'config/config.php') => config_path($this->moduleNameLower.'.php')], 'config');
+        $this->mergeConfigFrom(module_path($this->moduleName, 'config/config.php'), $this->moduleNameLower);
+    }
+
+    /**
+     * Register views.
+     */
+    public function registerViews(): void
+    {
+        $viewPath = resource_path('views/modules/'.$this->moduleNameLower);
+        $sourcePath = module_path($this->moduleName, 'resources/views');
+
+        $this->publishes([$sourcePath => $viewPath], ['views', $this->moduleNameLower.'-module-views']);
+
+        $this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->moduleNameLower);
+
+        $componentNamespace = str_replace('/', '\\', config('modules.namespace').'\\'.$this->moduleName.'\\'.ltrim(config('modules.paths.generator.component-class.path'), config('modules.paths.app_folder','')));
+        Blade::componentNamespace($componentNamespace, $this->moduleNameLower);
+    }
+
+    /**
+     * Get the services provided by the provider.
+     */
+    public function provides(): array
+    {
+        return [];
+    }
+
+    private function getPublishableViewPaths(): array
+    {
+        $paths = [];
+        foreach (config('view.paths') as $path) {
+            if (is_dir($path.'/modules/'.$this->moduleNameLower)) {
+                $paths[] = $path.'/modules/'.$this->moduleNameLower;
+            }
+        }
+
+        return $paths;
+    }
+}

Modules/Admin/app/Providers/RouteServiceProvider.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Modules\Admin\Providers;
+
+use Illuminate\Support\Facades\Route;
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+
+class RouteServiceProvider extends ServiceProvider
+{
+    /**
+     * Called before routes are registered.
+     *
+     * Register any model bindings or pattern based filters.
+     */
+    public function boot(): void
+    {
+        parent::boot();
+    }
+
+    /**
+     * Define the routes for the application.
+     */
+    public function map(): void
+    {
+        $this->mapApiRoutes();
+
+        $this->mapWebRoutes();
+    }
+
+    /**
+     * Define the "web" routes for the application.
+     *
+     * These routes all receive session state, CSRF protection, etc.
+     */
+    protected function mapWebRoutes(): void
+    {
+        Route::middleware('web')->group(module_path('Admin', '/routes/web.php'));
+    }
+
+    /**
+     * Define the "api" routes for the application.
+     *
+     * These routes are typically stateless.
+     */
+    protected function mapApiRoutes(): void
+    {
+        Route::middleware('api')->prefix('api')->name('api.')->group(module_path('Admin', '/routes/api.php'));
+    }
+}

Modules/Admin/app/Services/AdminService.php

@@ -0,0 +1,51 @@
+<?php
+namespace Modules\Admin\Services;
+
+use Modules\Admin\Models\Castes;
+use Modules\Admin\Models\Cities;
+use Modules\Admin\Models\Country;
+use Modules\Admin\Models\Districts;
+use Modules\Admin\Models\Genders;
+use Modules\Admin\Models\Nationalities;
+use Modules\Admin\Models\Province;
+
+final class AdminService
+{
+    function pluckCountries()
+    {
+        return Country::pluck('title', 'country_id');
+    }
+
+    function pluckProvinces()
+    {
+        return Province::pluck('title', 'province_id');
+    }
+
+    function pluckDistricts()
+    {
+        return Districts::pluck('title', 'district_id');
+
+    }
+
+    function pluckCities()
+    {
+        return Cities::pluck('title', 'city_id');
+    }
+
+    function pluckCastes()
+    {
+        return Castes::pluck('title', 'caste_id');
+    }
+
+    function pluckGenders()
+    {
+        return Genders::pluck('title', 'gender_id');
+    }
+
+    function pluckNationalities()
+    {
+        return Nationalities::pluck('title', 'nationality_id');
+    }
+
+}
+

Modules/Admin/composer.json

@@ -0,0 +1,30 @@
+{
+    "name": "nwidart/admin",
+    "description": "",
+    "authors": [
+        {
+            "name": "Nicolas Widart",
+            "email": "n.widart@gmail.com"
+        }
+    ],
+    "extra": {
+        "laravel": {
+            "providers": [],
+            "aliases": {
+
+            }
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "Modules\\Admin\\": "app/",
+            "Modules\\Admin\\Database\\Factories\\": "database/factories/",
+            "Modules\\Admin\\Database\\Seeders\\": "database/seeders/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Modules\\Admin\\Tests\\": "tests/"
+        }
+    }
+}

Modules/Admin/config/config.php

@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'name' => 'Admin',
+];

Modules/Admin/database/seeders/AdminDatabaseSeeder.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Modules\Admin\database\seeders;
+
+use Illuminate\Database\Seeder;
+
+class AdminDatabaseSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        // $this->call([]);
+    }
+}

Modules/Admin/module.json

@@ -0,0 +1,11 @@
+{
+    "name": "Admin",
+    "alias": "admin",
+    "description": "",
+    "keywords": [],
+    "priority": 0,
+    "providers": [
+        "Modules\\Admin\\Providers\\AdminServiceProvider"
+    ],
+    "files": []
+}

Modules/Admin/package.json

@@ -0,0 +1,15 @@
+{
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build"
+  },
+  "devDependencies": {
+    "axios": "^1.1.2",
+    "laravel-vite-plugin": "^0.7.5",
+    "sass": "^1.69.5",
+    "postcss": "^8.3.7",
+    "vite": "^4.0.0"
+  }
+}

Modules/Admin/resources/views/castes/edit.blade.php

@@ -0,0 +1,41 @@
+@extends('layouts.app')
+@section('content')
+  <div class="page-content">
+    <div class="container-fluid">
+
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'Caste'])
+
+      <!-- end page title -->
+
+      <div class='card'>
+
+        <div class='card-body'>
+
+          <form action="{{ $editable ? route('castes.update', [$data->caste_id]) : route('castes.store') }}"
+            id="updateCustomForm" method="POST">
+
+            @csrf
+            <input type=hidden name='caste_id' value='{{ $editable ? $data->caste_id : '' }}' />
+
+            <div class="row">
+              <div class="col-lg-12">{{ createText('title', 'title', 'Title', '', $editable ? $data->title : '') }}
+              </div>
+
+              <div class="col-lg-12 pb-2">
+                {{ createPlainTextArea('remarks', '', 'Remarks', $editable ? $data->remarks : '') }}
+              </div>
+
+              <div class="col-md-12 mt-2">
+
+                <?php createButton('btn-primary btn-update', '', 'Submit'); ?>
+                <?php createButton('btn-danger btn-cancel', '', 'Cancel', route('castes.index')); ?>
+
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+@endsection

Modules/Admin/resources/views/castes/index.blade.php

@@ -1,101 +1,92 @@
 @extends('layouts.app')
 @section('content')
-  <div class="card">
-    <div class="card-header d-flex justify-content-between align-items-center">
-      <h2>{{ label('Caste List') }}</h2>
-      <a href="{{ route('castes.create') }}" class="btn btn-primary"><span>{{ label('Create New') }}</span></a>
-    </div>
-    <div class="card-body">
-      <table class="dataTable table" id="tbl_castes" data-url="{{ route('castes.sort') }}">
-        <thead class="table-light">
-          <tr>
-            <th class="tb-col"><span class="overline-title">{{ label('Sn.') }}</span></th>
-            <th class="tb-col"><span class="overline-title">{{ label('title') }}</span></th>
-            <th class="tb-col"><span class="overline-title">{{ label('alias') }}</span></th>
-            <th class="tb-col" data-sortable="false"><span class="overline-title">{{ label('Action') }}</span>
-            </th>
-          </tr>
-        </thead>
-        <tbody>
-          @php
-            $i = 1;
-          @endphp
-          @foreach ($data as $item)
-            <tr data-id="{{ $item->caste_id }}" data-display_order="{{ $item->display_order }}"
-              class="draggable-row <?php echo $item->status == 0 ? 'bg-light bg-danger' : ''; ?>">
-              <td class="tb-col">{{ $i++ }}</td>
-              <td class="tb-col">{{ $item->title }}</td>
-              <td class="tb-col">
-                <div class="alias-wrapper" data-id="{{ $item->caste_id }}">
-                  <span class="alias">{{ $item->alias }}</span>
-                  <input type="text" class="alias-input d-none" value="{{ $item->alias }}"
-                    id="alias_{{ $item->caste_id }}" />
-                </div>
-                <span class="badge badge-soft-primary change-alias-badge">change alias</span>
-              </td>
-              <td class="tb-col">
-                <div class="dropdown d-inline-block">
-                  <button class="btn btn-soft-secondary btn-sm dropdown" type="button" data-bs-toggle="dropdown"
-                    aria-expanded="false">
-                    <i class="ri-more-fill align-middle"></i>
-                  </button>
-                  <ul class="dropdown-menu dropdown-menu-end">
-                    <li><a href="{{ route('castes.show', [$item->caste_id]) }}" class="dropdown-item"><i
-                          class="ri-eye-fill text-muted me-2 align-bottom"></i> {{ label('View') }}</a></li>
-                    <li><a href="{{ route('castes.edit', [$item->caste_id]) }}" class="dropdown-item edit-item-btn"><i
-                          class="ri-pencil-fill text-muted me-2 align-bottom"></i> {{ label('Edit') }}</a></li>
-                    <li>
-                      <a href="{{ route('castes.toggle', [$item->caste_id]) }}" class="dropdown-item toggle-item-btn"
-                        onclick="confirmToggle(this.href)">
-                        <i class="ri-article-fill text-muted me-2 align-bottom"></i>
-                        {{ $item->status == 1 ? label('Unpublish') : label('Publish') }}
-                      </a>
+  <div class="page-content">
+    <div class="container-fluid">
 
-                    </li>
-                    <li>
-                      <a href="{{ route('castes.clone', [$item->caste_id]) }}" class="dropdown-item toggle-item-btn"
-                        onclick="confirmClone(this.href)">
-                        <i class="ri-file-copy-line text-muted me-2 align-bottom"></i> {{ label('Clone') }}
-                      </a>
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'Caste'])
 
-                    </li>
-                    <li>
-                      <a href="{{ route('castes.destroy', [$item->caste_id]) }}" class="dropdown-item remove-item-btn"
-                        onclick="confirmDelete(this.href)">
-                        <i class="ri-delete-bin-fill text-muted me-2 align-bottom"></i> {{ label('Delete') }}
-                      </a>
+      <!-- end page title -->
 
-                    </li>
-                  </ul>
-                </div>
-
-
-              </td>
-            </tr>
-          @endforeach
-
-        </tbody>
-      </table>
+      <div class="card">
+        <div class="card-header align-items-center d-flex">
+          <h5 class="card-title flex-grow-1 mb-0">Caste Lists</h5>
+          <div class="flex-shrink-0">
+            <a href="{{ route('castes.index') }}" class="btn btn-success waves-effect waves-light"><i
+                class="ri-add-fill me-1 align-bottom"></i> Create Caste</a>
+          </div>
+        </div>
+        <div class="card-body">
+          <table class="dataTable table" id="tbl_castes" data-url="{{ route('castes.sort') }}">
+            <thead class="table-light">
+              <tr>
+                <th class="tb-col"><span class="overline-title">{{ label('Sn.') }}</span></th>
+                <th class="tb-col"><span class="overline-title">{{ label('title') }}</span></th>
+                <th class="tb-col"><span class="overline-title">{{ label('alias') }}</span></th>
+                <th class="tb-col" data-sortable="false"><span class="overline-title">{{ label('Action') }}</span>
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+              @foreach ($data as $index => $item)
+                <tr data-id="{{ $item->caste_id }}" data-display_order="{{ $item->display_order }}"
+                  class="draggable-row <?php echo $item->status == 0 ? 'bg-light bg-danger' : ''; ?>">
+                  <td class="tb-col">{{ $index + 1 }}</td>
+                  <td class="tb-col">{{ $item->title }}</td>
+                  <td class="tb-col">
+                    <div class="alias-wrapper" data-id="{{ $item->caste_id }}">
+                      <span class="alias">{{ $item->alias }}</span>
+                      <input type="text" class="alias-input d-none" value="{{ $item->alias }}"
+                        id="alias_{{ $item->caste_id }}" />
+                    </div>
+                    <span class="badge badge-soft-primary change-alias-badge">change alias</span>
+                  </td>
+                  <td class="tb-col">
+                    <div class="dropdown d-inline-block">
+                      <button class="btn btn-soft-secondary btn-sm dropdown" type="button" data-bs-toggle="dropdown"
+                        aria-expanded="false">
+                        <i class="ri-more-fill align-middle"></i>
+                      </button>
+                      <ul class="dropdown-menu dropdown-menu-end">
+                        <li><a href="{{ route('castes.show', [$item->caste_id]) }}" class="dropdown-item"><i
+                              class="ri-eye-fill text-muted me-2 align-bottom"></i> {{ label('View') }}</a></li>
+                        <li><a href="{{ route('castes.edit', [$item->caste_id]) }}"
+                            class="dropdown-item edit-item-btn"><i
+                              class="ri-pencil-fill text-muted me-2 align-bottom"></i> {{ label('Edit') }}</a></li>
+                        <li>
+                          <a href="{{ route('castes.toggle', [$item->caste_id]) }}" class="dropdown-item toggle-item-btn"
+                            onclick="confirmToggle(this.href)">
+                            <i class="ri-article-fill text-muted me-2 align-bottom"></i>
+                            {{ $item->status == 1 ? label('Unpublish') : label('Publish') }}
+                          </a>
 
+                        </li>
+                        <li>
+                          <a href="{{ route('castes.clone', [$item->caste_id]) }}" class="dropdown-item toggle-item-btn"
+                            onclick="confirmClone(this.href)">
+                            <i class="ri-file-copy-line text-muted me-2 align-bottom"></i> {{ label('Clone') }}
+                          </a>
 
+                        </li>
+                        <li>
+                          <a href="{{ route('castes.destroy', [$item->caste_id]) }}"
+                            class="dropdown-item remove-item-btn" onclick="confirmDelete(this.href)">
+                            <i class="ri-delete-bin-fill text-muted me-2 align-bottom"></i> {{ label('Delete') }}
+                          </a>
+                        </li>
+                      </ul>
+                    </div>
+                  </td>
+                </tr>
+              @endforeach
+            </tbody>
+          </table>
+        </div>
+      </div>
     </div>
   </div>
 @endsection
-
-@push('css')
-  <link rel="stylesheet" href="https://cdn.datatables.net/1.13.5/css/dataTables.bootstrap4.min.css">
-  <link rel="stylesheet" href="https://cdn.datatables.net/rowreorder/1.4.0/css/rowReorder.dataTables.min.css">
-@endpush
 @push('js')
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.68/pdfmake.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.68/vfs_fonts.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-  <script src="https://cdn.datatables.net/1.13.5/js/jquery.dataTables.min.js"></script>
-  <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.html5.min.js"></script>
-  <script src="https://cdn.datatables.net/rowreorder/1.4.0/js/dataTables.rowReorder.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-
   <script>
     $(document).ready(function(e) {
       $('.change-alias-badge').on('click', function() {

Modules/Admin/resources/views/castes/show.blade.php

@@ -0,0 +1,43 @@
+@extends('layouts.app')
+@section('content')
+  <div class="page-content">
+    <div class="container-fluid">
+
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'Caste'])
+
+      <!-- end page title -->
+      <div class='card'>
+        <div class="card-header align-items-center d-flex">
+          <h5 class="card-title flex-grow-1 mb-0">View Detail</h5>
+          <div class="flex-shrink-0">
+            <a href="{{ route('castes.index') }}" class="btn btn-success waves-effect waves-light"><i
+                class="ri-add-fill me-1 align-bottom"></i> Back to List</a>
+          </div>
+        </div>
+      </div>
+
+      <div class='card-body'>
+        <p><b>Title :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->title }}</span></p>
+        <p><b>Alias :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->alias }}</span></p>
+        <p><b>Status :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span
+            class="{{ $data->status == 1 ? 'text-success' : 'text-danger' }}">{{ $data->status == 1 ? 'Active' : 'Inactive' }}</span>
+        </p>
+        <p><b>Remarks :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->remarks }}</span></p>
+        <p><b>Display Order :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->display_order }}</span></p>
+        <p><b>Createdby :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->createdby }}</span></p>
+        <p><b>Updatedby :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->updatedby }}</span></p>
+        <div class="d-flex justify-content-between">
+          <div>
+            <p><b>Created On :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->created_at }}</span></p>
+            <p><b>Created By :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->createdBy }}</span></p>
+          </div>
+          <div>
+            <p><b>Updated On :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->updated_at }}</span></p>
+            <p><b>Updated By :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->updatedBy }}</span></p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+@endsection

Modules/Admin/resources/views/cities/edit.blade.php

@@ -0,0 +1,47 @@
+@extends('layouts.app')
+@section('content')
+  <div class="page-content">
+    <div class="container-fluid">
+
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'City'])
+
+      <!-- end page title -->
+      <div class='card'>
+        <div class='card-body'>
+          <form action="{{ $editable ? route('cities.update', [$data->city_id]) : route('cities.store') }}"
+            id="updateCustomForm" method="POST">
+
+            @csrf
+            <input type=hidden name='city_id' value='{{ $editable ? $data->city_id : '' }}' />
+
+            <div class="row">
+
+              <div class="col-lg-6">
+                {{ createText('title', 'title', 'Title', '', $editable ? $data->title : '') }}
+              </div>
+
+              <div class="col-lg-6">
+                {{ createCustomSelect('tbl_districts', 'title', 'district_id', $editable ? $data->districts_id : '', 'District', 'districts_id', 'form-control select2', 'status<>-1') }}
+              </div>
+
+
+              {{-- <div class="col-lg-12 pb-2">
+                {{ createTextarea('description', 'description ckeditor-classic', 'Description', $editable ? $data->description : '') }}
+              </div> --}}
+
+              <div class="col-lg-12 pb-2">
+                {{ createPlainTextArea('remarks', '', 'Remarks', $editable ? $data->remarks : '') }}
+              </div>
+
+              <div class="col-md-12 mt-2">
+                <?php createButton('btn-primary btn-update', '', 'Submit'); ?>
+                <?php createButton('btn-danger btn-cancel', '', 'Cancel', route('cities.index')); ?>
+              </div>
+
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+@endsection

Modules/Admin/resources/views/cities/index.blade.php

@@ -1,101 +1,97 @@
 @extends('layouts.app')
 @section('content')
-  <div class="card">
-    <div class="card-header d-flex justify-content-between align-items-center">
-      <h2>{{ label('Genders List') }}</h2>
-      <a href="{{ route('genders.create') }}" class="btn btn-primary"><span>{{ label('Create New') }}</span></a>
-    </div>
-    <div class="card-body">
-      <table class="dataTable table" id="tbl_genders" data-url="{{ route('genders.sort') }}">
-        <thead class="table-light">
-          <tr>
-            <th class="tb-col"><span class="overline-title">{{ label('Sn.') }}</span></th>
-            <th class="tb-col"><span class="overline-title">{{ label('title') }}</span></th>
-            <th class="tb-col"><span class="overline-title">{{ label('alias') }}</span></th>
-            <th class="tb-col" data-sortable="false"><span class="overline-title">{{ label('Action') }}</span>
-            </th>
-          </tr>
-        </thead>
-        <tbody>
-          @php
-            $i = 1;
-          @endphp
-          @foreach ($data as $item)
-            <tr data-id="{{ $item->gender_id }}" data-display_order="{{ $item->display_order }}"
-              class="draggable-row <?php echo $item->status == 0 ? 'bg-light bg-danger' : ''; ?>">
-              <td class="tb-col">{{ $i++ }}</td>
-              <td class="tb-col">{{ $item->title }}</td>
-              <td class="tb-col">
-                <div class="alias-wrapper" data-id="{{ $item->gender_id }}">
-                  <span class="alias">{{ $item->alias }}</span>
-                  <input type="text" class="alias-input d-none" value="{{ $item->alias }}"
-                    id="alias_{{ $item->gender_id }}" />
-                </div>
-                <span class="badge badge-soft-primary change-alias-badge">change alias</span>
-              </td>
-              <td class="tb-col">
-                <div class="dropdown d-inline-block">
-                  <button class="btn btn-soft-secondary btn-sm dropdown" type="button" data-bs-toggle="dropdown"
-                    aria-expanded="false">
-                    <i class="ri-more-fill align-middle"></i>
-                  </button>
-                  <ul class="dropdown-menu dropdown-menu-end">
-                    <li><a href="{{ route('genders.show', [$item->gender_id]) }}" class="dropdown-item"><i
-                          class="ri-eye-fill text-muted me-2 align-bottom"></i> {{ label('View') }}</a></li>
-                    <li><a href="{{ route('genders.edit', [$item->gender_id]) }}" class="dropdown-item edit-item-btn"><i
-                          class="ri-pencil-fill text-muted me-2 align-bottom"></i> {{ label('Edit') }}</a></li>
-                    <li>
-                      <a href="{{ route('genders.toggle', [$item->gender_id]) }}" class="dropdown-item toggle-item-btn"
-                        onclick="confirmToggle(this.href)">
-                        <i class="ri-article-fill text-muted me-2 align-bottom"></i>
-                        {{ $item->status == 1 ? label('Unpublish') : label('Publish') }}
-                      </a>
+  <div class="page-content">
+    <div class="container-fluid">
 
-                    </li>
-                    <li>
-                      <a href="{{ route('genders.clone', [$item->gender_id]) }}" class="dropdown-item toggle-item-btn"
-                        onclick="confirmClone(this.href)">
-                        <i class="ri-file-copy-line text-muted me-2 align-bottom"></i> {{ label('Clone') }}
-                      </a>
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'City'])
+      <!-- end page title -->
 
-                    </li>
-                    <li>
-                      <a href="{{ route('genders.destroy', [$item->gender_id]) }}" class="dropdown-item remove-item-btn"
-                        onclick="confirmDelete(this.href)">
-                        <i class="ri-delete-bin-fill text-muted me-2 align-bottom"></i> {{ label('Delete') }}
-                      </a>
+      <div class="card">
+        <div class="card-header align-items-center d-flex">
+          <h5 class="card-title flex-grow-1 mb-0">City Lists</h5>
+          <div class="flex-shrink-0">
+            <a href="{{ route('cities.create') }}" class="btn btn-success waves-effect waves-light"><i
+                class="ri-add-fill me-1 align-bottom"></i> Create City</a>
+          </div>
+        </div>
 
-                    </li>
-                  </ul>
-                </div>
-
-
-              </td>
-            </tr>
-          @endforeach
-
-        </tbody>
-      </table>
+        <div class="card-body">
+          <table class="dataTable table" id="tbl_cities" data-url="{{ route('cities.sort') }}">
+            <thead class="table-light">
+              <tr>
+                <th class="tb-col"><span class="overline-title">{{ label('Sn.') }}</span></th>
+                <th class="tb-col"><span class="overline-title">{{ label('District') }}</span></th>
+                <th class="tb-col"><span class="overline-title">{{ label('title') }}</span></th>
+                <th class="tb-col"><span class="overline-title">{{ label('alias') }}</span></th>
+                <th class="tb-col" data-sortable="false"><span class="overline-title">{{ label('Action') }}</span>
+                </th>
+              </tr>
+            </thead>
 
+            <tbody>
+              @foreach ($data as $item)
+                <tr data-id="{{ $item->city_id }}" data-display_order="{{ $item->display_order }}"
+                  class="draggable-row <?php echo $item->status == 0 ? 'bg-light bg-danger' : ''; ?>">
+                  <td class="tb-col">{{ $index + 1 }}</td>
+                  <td class="tb-col">
+                    {!! getFieldData('tbl_districts', 'title', 'district_id', $item->districts_id) !!}
+                  </td>
+                  <td class="tb-col">{{ $item->title }}</td>
+                  <td class="tb-col">
+                    <div class="alias-wrapper" data-id="{{ $item->city_id }}">
+                      <span class="alias">{{ $item->alias }}</span>
+                      <input type="text" class="alias-input d-none" value="{{ $item->alias }}"
+                        id="alias_{{ $item->city_id }}" />
+                    </div>
+                    <span class="badge badge-soft-primary change-alias-badge">change alias</span>
+                  </td>
+                  <td class="tb-col">
+                    <div class="dropdown d-inline-block">
+                      <button class="btn btn-soft-secondary btn-sm dropdown" type="button" data-bs-toggle="dropdown"
+                        aria-expanded="false">
+                        <i class="ri-more-fill align-middle"></i>
+                      </button>
+                      <ul class="dropdown-menu dropdown-menu-end">
+                        <li><a href="{{ route('cities.show', [$item->city_id]) }}" class="dropdown-item"><i
+                              class="ri-eye-fill text-muted me-2 align-bottom"></i> {{ label('View') }}</a></li>
+                        <li><a href="{{ route('cities.edit', [$item->city_id]) }}" class="dropdown-item edit-item-btn"><i
+                              class="ri-pencil-fill text-muted me-2 align-bottom"></i> {{ label('Edit') }}</a></li>
+                        <li>
+                          <a href="{{ route('cities.toggle', [$item->city_id]) }}" class="dropdown-item toggle-item-btn"
+                            onclick="confirmToggle(this.href)">
+                            <i class="ri-article-fill text-muted me-2 align-bottom"></i>
+                            {{ $item->status == 1 ? label('Unpublish') : label('Publish') }}
+                          </a>
+                        </li>
+                        <li>
+                          <a href="{{ route('cities.clone', [$item->city_id]) }}" class="dropdown-item toggle-item-btn"
+                            onclick="confirmClone(this.href)">
+                            <i class="ri-file-copy-line text-muted me-2 align-bottom"></i> {{ label('Clone') }}
+                          </a>
 
+                        </li>
+                        <li>
+                          <a href="{{ route('cities.destroy', [$item->city_id]) }}" class="dropdown-item remove-item-btn"
+                            onclick="confirmDelete(this.href)">
+                            <i class="ri-delete-bin-fill text-muted me-2 align-bottom"></i> {{ label('Delete') }}
+                          </a>
+                        </li>
+                      </ul>
+                    </div>
+                  </td>
+                </tr>
+              @endforeach
+            </tbody>
+          </table>
+        </div>
+      </div>
     </div>
   </div>
 @endsection
 
-@push('css')
-  <link rel="stylesheet" href="https://cdn.datatables.net/1.13.5/css/dataTables.bootstrap4.min.css">
-  <link rel="stylesheet" href="https://cdn.datatables.net/rowreorder/1.4.0/css/rowReorder.dataTables.min.css">
-@endpush
+
 @push('js')
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.68/pdfmake.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.68/vfs_fonts.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-  <script src="https://cdn.datatables.net/1.13.5/js/jquery.dataTables.min.js"></script>
-  <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.html5.min.js"></script>
-  <script src="https://cdn.datatables.net/rowreorder/1.4.0/js/dataTables.rowReorder.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-
   <script>
     $(document).ready(function(e) {
       $('.change-alias-badge').on('click', function() {
@@ -112,7 +108,7 @@
           aliasInput.hide();
           $(this).removeClass('editing').text('Change Alias');
           var articleId = $(aliasWrapper).data('id');
-          var ajaxUrl = "{{ route('genders.updatealias') }}";
+          var ajaxUrl = "{{ route('cities.updatealias') }}";
           var data = {
             articleId: articleId,
             newAlias: newAlias
@@ -195,7 +191,7 @@
         if (result.isConfirmed) {
           $.ajax({
             url: url,
-            type: 'GET',
+            type: 'DELETE',
             headers: {
               'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
             },

Modules/Admin/resources/views/countries/edit.blade.php

@@ -0,0 +1,50 @@
+@extends('layouts.app')
+@section('content')
+  <div class="page-content">
+    <div class="container-fluid">
+
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'Country'])
+
+      <!-- end page title -->
+
+      <form action="{{ $editable ? route('countries.update', [$data->country_id]) : route('countries.store') }}"
+        id="updateCustomForm" method="POST">
+        @csrf
+
+        <input type=hidden name='country_id' value='{{ $editable ? $data->country_id : '' }}' />
+
+        <div class='card'>
+
+          <div class='card-body'>
+
+            <div class="row">
+
+              <div class="col-lg-12">
+                {{ createText('title', 'title', 'Title', '', $editable ? $data->title : '') }}
+              </div>
+
+              {{-- <div class="col-lg-12 pb-4">
+            {{ createTextarea('description', 'description ckeditor-classic', 'Description', $editable ? $data->description : '') }}
+          </div> --}}
+
+              <div class="border border-dashed"></div>
+
+              <div class="col-lg-12 pb-2">
+                {{ createPlainTextArea('remarks', '', 'Remarks', $editable ? $data->remarks : '') }}
+              </div>
+
+            </div>
+          </div>
+          <div class="card-footer">
+            <div class="col-md-12">
+              <?php createButton('btn-primary btn-update', '', 'Submit'); ?>
+              <?php createButton('btn-danger btn-cancel', '', 'Cancel', route('countries.index')); ?>
+
+            </div>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+@endsection

Modules/Admin/resources/views/countries/index.blade.php

@@ -0,0 +1,230 @@
+@extends('layouts.app')
+@section('content')
+  <div class="page-content">
+    <div class="container-fluid">
+
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'Country'])
+
+      <!-- end page title -->
+
+      <div class="row">
+        <div class="col-lg-12">
+          <div class="card">
+            <div class="card-header align-items-center d-flex">
+              <h5 class="card-title flex-grow-1 mb-0">Country Lists</h5>
+              <div class="flex-shrink-0">
+                <a href="{{ route('countries.create') }}" class="btn btn-success waves-effect waves-light"><i
+                    class="ri-add-fill me-1 align-bottom"></i> Create Country</a>
+              </div>
+            </div>
+
+            <div class="card-body">
+              <table class="dataTable table" id="tbl_countries" data-url="{{ route('countries.sort') }}">
+                <thead class="table-light">
+                  <tr>
+                    <th class="tb-col text-uppercase"><span class="overline-title">{{ label('Sn.') }}</span></th>
+                    <th class="tb-col text-uppercase"><span class="overline-title">{{ label('title') }}</span></th>
+                    <th class="tb-col text-uppercase"><span class="overline-title">{{ label('alias') }}</span></th>
+                    <th class="tb-col text-uppercase" data-sortable="false"><span
+                        class="overline-title">{{ label('Action') }}</span>
+                    </th>
+                  </tr>
+                </thead>
+                <tbody>
+
+                  @foreach ($data as $index => $item)
+                    <tr data-id="{{ $item->country_id }}" data-display_order="{{ $item->display_order }}"
+                      class="draggable-row <?php echo $item->status == 0 ? 'bg-light bg-danger' : ''; ?>">
+                      <td class="tb-col">{{ $index + 1 }}</td>
+                      <td class="tb-col">{{ $item->title }}</td>
+                      <td class="tb-col">
+                        <div class="alias-wrapper" data-id="{{ $item->country_id }}">
+                          <span class="alias">{{ $item->alias }}</span>
+                          <input type="text" class="alias-input d-none" value="{{ $item->alias }}"
+                            id="alias_{{ $item->country_id }}" />
+                        </div>
+                        <span class="badge badge-soft-primary change-alias-badge">change alias</span>
+                      </td>
+                      <td class="tb-col">
+                        <div class="dropdown d-inline-block">
+                          <button class="btn btn-soft-secondary btn-sm dropdown" type="button" data-bs-toggle="dropdown"
+                            aria-expanded="false">
+                            <i class="ri-more-fill align-middle"></i>
+                          </button>
+                          <ul class="dropdown-menu dropdown-menu-end">
+                            <li><a href="{{ route('countries.show', [$item->country_id]) }}" class="dropdown-item"><i
+                                  class="ri-eye-fill text-muted me-2 align-bottom"></i> {{ label('View') }}</a></li>
+                            <li><a href="{{ route('countries.edit', [$item->country_id]) }}"
+                                class="dropdown-item edit-item-btn"><i
+                                  class="ri-pencil-fill text-muted me-2 align-bottom"></i> {{ label('Edit') }}</a></li>
+                            <li>
+                              <a href="{{ route('countries.toggle', [$item->country_id]) }}"
+                                class="dropdown-item toggle-item-btn" onclick="confirmToggle(this.href)">
+                                <i class="ri-article-fill text-muted me-2 align-bottom"></i>
+                                {{ $item->status == 1 ? label('Unpublish') : label('Publish') }}
+                              </a>
+                            </li>
+                            <li>
+                              <a href="{{ route('countries.destroy', [$item->country_id]) }}"
+                                class="dropdown-item remove-item-btn" onclick="confirmDelete(this.href)">
+                                <i class="ri-delete-bin-fill text-muted me-2 align-bottom"></i> {{ label('Delete') }}
+                              </a>
+                            </li>
+                          </ul>
+                        </div>
+                      </td>
+                    </tr>
+                  @endforeach
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+@endsection
+
+@push('js')
+  <script>
+    $(document).ready(function(e) {
+      $('.change-alias-badge').on('click', function() {
+        var aliasWrapper = $(this).prev('.alias-wrapper');
+        var aliasSpan = aliasWrapper.find('.alias');
+        var aliasInput = aliasWrapper.find('.alias-input');
+        var isEditing = $(this).hasClass('editing');
+        aliasInput.toggleClass("d-none");
+        if (isEditing) {
+          // Update alias text and switch to non-editing state
+          var newAlias = aliasInput.val();
+          aliasSpan.text(newAlias);
+          aliasSpan.show();
+          aliasInput.hide();
+          $(this).removeClass('editing').text('Change Alias');
+          var articleId = $(aliasWrapper).data('id');
+          var ajaxUrl = "{{ route('countries.updatealias') }}";
+          var data = {
+            articleId: articleId,
+            newAlias: newAlias
+          };
+          $.ajax({
+            url: ajaxUrl,
+            type: 'POST',
+            headers: {
+              'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+            },
+            data: data,
+            success: function(response) {
+              console.log(response);
+            },
+            error: function(xhr, status, error) {
+              console.error(error);
+            }
+          });
+        } else {
+          // Switch to editing state
+          aliasSpan.hide();
+          aliasInput.show().focus();
+          $(this).addClass('editing').text('Save Alias');
+        }
+      });
+      var mytable = $(".dataTable").DataTable({
+        ordering: true,
+        rowReorder: {
+          //selector: 'tr'
+        },
+      });
+      var isRowReorderComplete = false;
+      mytable.on('row-reorder', function(e, diff, edit) {
+        isRowReorderComplete = true;
+      });
+      mytable.on('draw', function() {
+        if (isRowReorderComplete) {
+          var url = mytable.table().node().getAttribute('data-url');
+          var ids = mytable.rows().nodes().map(function(node) {
+            return $(node).data('id');
+          }).toArray();
+          console.log(ids);
+          $.ajax({
+            url: url,
+            type: "POST",
+            headers: {
+              "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+            },
+            data: {
+              id_order: ids
+            },
+            success: function(response) {
+              console.log(response);
+            },
+            error: function(xhr, status, error) {
+              console.error(error);
+            }
+          });
+          isRowReorderComplete = false;
+        }
+      });
+    });
+
+    function confirmDelete(url) {
+      event.preventDefault();
+      Swal.fire({
+        title: 'Are you sure?',
+        text: 'You will not be able to recover this item!',
+        icon: 'warning',
+        showCancelButton: true,
+        confirmButtonText: 'Delete',
+        cancelButtonText: 'Cancel',
+        reverseButtons: true
+      }).then((result) => {
+        if (result.isConfirmed) {
+          $.ajax({
+            url: url,
+            type: 'DELETE',
+            headers: {
+              'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+            },
+            success: function(response) {
+              Swal.fire('Deleted!', 'The item has been deleted.', 'success');
+              location.reload();
+            },
+            error: function(xhr, status, error) {
+              Swal.fire('Error!', 'An error occurred while deleting the item.', 'error');
+            }
+          });
+        }
+      });
+    }
+
+    function confirmToggle(url) {
+      event.preventDefault();
+      Swal.fire({
+        title: 'Are you sure?',
+        text: 'Publish Status of Item will be changed!! if Unpublished, links will be dead!',
+        icon: 'warning',
+        showCancelButton: true,
+        confirmButtonText: 'Proceed',
+        cancelButtonText: 'Cancel',
+        reverseButtons: true
+      }).then((result) => {
+        if (result.isConfirmed) {
+          $.ajax({
+            url: url,
+            type: 'GET',
+            headers: {
+              'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+            },
+            success: function(response) {
+              Swal.fire('Updated!', 'Publishing Status has been updated.', 'success');
+              location.reload();
+            },
+            error: function(xhr, status, error) {
+              Swal.fire('Error!', 'An error occurred.', 'error');
+            }
+          });
+        }
+      });
+    }
+  </script>
+@endpush

Modules/Admin/resources/views/countries/show.blade.php

@@ -0,0 +1,52 @@
+@extends('layouts.app')
+@section('content')
+  <div class="page-content">
+    <div class="container-fluid">
+
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'Employee'])
+
+      <!-- end page title -->
+
+      <div class="page-content">
+        <div class="container-fluid">
+
+          <!-- start page title -->
+          @include('layouts.partials.breadcrumb', ['title' => 'Employee'])
+
+          <!-- end page title -->
+          <div class='card'>
+            <div class='card-header d-flex justify-content-between align-items-center'>
+              <h2><?php echo label('View Detail'); ?></h2>
+              <?php createButton('btn-primary btn-cancel', '', 'Back to List', route('countries.index')); ?>
+
+            </div>
+            <div class='card-body'>
+              <p><b>Title :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->title }}</span></p>
+              <p><b>Alias :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->alias }}</span></p>
+              <p><b>Description :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->description }}</span></p>
+              <p><b>Display Order :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->display_order }}</span></p>
+              <p><b>Status :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span
+                  class="{{ $data->status == 1 ? 'text-success' : 'text-danger' }}">{{ $data->status == 1 ? 'Active' : 'Inactive' }}</span>
+              </p>
+              <p><b>Remarks :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->remarks }}</span></p>
+              <p><b>Createdby :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->createdby }}</span></p>
+              <p><b>Updatedby :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->updatedby }}</span></p>
+              <div class="d-flex justify-content-between">
+                <div>
+                  <p><b>Created On :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->created_at }}</span></p>
+                  <p><b>Created By :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->createdBy }}</span></p>
+                </div>
+                <div>
+                  <p><b>Updated On :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->updated_at }}</span></p>
+                  <p><b>Updated By :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->updatedBy }}</span></p>
+
+                </div>
+              </div>
+
+            </div>
+          </div>
+
+        </div>
+      </div>
+    @endSection

Modules/Admin/resources/views/districts/edit.blade.php

@@ -0,0 +1,46 @@
+@extends('layouts.app')
+@section('content')
+  <div class="page-content">
+    <div class="container-fluid">
+
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'District'])
+
+      <!-- end page title -->
+
+      <div class='card'>
+        <div class='card-body'>
+          <form action="{{ $editable ? route('districts.update', [$data->district_id]) : route('districts.store') }}"
+            id="updateCustomForm" method="POST">
+
+            @csrf
+
+            <input type=hidden name='district_id' value='{{ $editable ? $data->district_id : '' }}' />
+
+            <div class="row">
+              <div class="col-lg-6">
+                {{ createCustomSelect('tbl_provinces', 'title', 'province_id', $editable ? $data->provinces_id : '', 'Province', 'provinces_id', 'form-control select2', 'status<>-1') }}
+              </div>
+
+              <div class="col-lg-6">
+                {{ createText('title', 'title', 'Title', '', $editable ? $data->title : '') }}
+              </div>
+
+              {{-- <div class="col-lg-12 pb-2">
+                {{ createTextarea('description', 'description ckeditor-classic', 'Description', $editable ? $data->description : '') }}
+              </div> --}}
+
+              <div class="col-lg-12 pb-2">
+                {{ createPlainTextArea('remarks', '', 'Remarks', $editable ? $data->remarks : '') }}
+              </div>
+
+              <div class="col-md-12"><?php createButton('btn-primary btn-update', '', 'Submit'); ?>
+                <?php createButton('btn-primary btn-cancel', '', 'Cancel', route('districts.index')); ?>
+              </div>
+
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+@endsection

Modules/Admin/resources/views/districts/index.blade.php

@@ -1,50 +1,27 @@
 @extends('layouts.app')
 @section('content')
-  <div class="row">
-    <div class="col-xl-4">
-      <form action="{{ route('proviences.store') }}" id="storeCustomForm" method="POST">
-        @csrf
-        <div class='card'>
-          <div class='card-header d-flex justify-content-between align-items-center'>
-            <h2 class="">{{ label('Add Proviences') }}</h2>
+  <div class="page-content">
+    <div class="container-fluid">
 
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'District'])
 
-          </div>
-          <div class='card-body'>
+      <!-- end page title -->
 
-            <div class="row">
-              <div class="col-lg-6">
-                {{ createCustomSelect('tbl_countries', 'title', 'country_id', 'Countries Id', 'countries_id', 'form-control select2', 'status<>-1') }}
-              </div>
-              <div class="col-lg-6">{{ createText('title', 'title', 'Title') }}
-              </div>
-              <div class="col-lg-12 pb-2">{{ createTextarea('description', 'description ', 'Description') }}
-              </div>
-
-
-            </div>
-          </div>
-          <div class="card-footer">
-            <div class="col-md-12"><?php createButton('btn-primary btn-update', '', 'Submit'); ?>
-              <?php createButton('btn-danger btn-cancel', '', 'Cancel', route('proviences.index')); ?>
-            </div>
-          </div>
-        </div>
-      </form>
-
-    </div>
-    <div class="col-xl-8">
       <div class="card">
-        <div class="card-header d-flex justify-content-between align-items-center">
-          <h2>{{ label('Proviences List') }}</h2>
-          <a href="{{ route('proviences.create') }}" class="btn btn-primary"><span>{{ label('Create New') }}</span></a>
+        <div class="card-header align-items-center d-flex">
+          <h5 class="card-title flex-grow-1 mb-0">District Lists</h5>
+          <div class="flex-shrink-0">
+            <a href="{{ route('districts.create') }}" class="btn btn-success waves-effect waves-light"><i
+                class="ri-add-fill me-1 align-bottom"></i> Create District</a>
+          </div>
         </div>
         <div class="card-body">
-          <table class="dataTable table" id="tbl_proviences" data-url="{{ route('proviences.sort') }}">
+          <table class="dataTable table" id="tbl_districts" data-url="{{ route('districts.sort') }}">
             <thead class="table-light">
               <tr>
                 <th class="tb-col"><span class="overline-title">{{ label('Sn.') }}</span></th>
-                <th class="tb-col"><span class="overline-title">{{ label('countries') }}</span></th>
+                <th class="tb-col"><span class="overline-title">{{ label('provinces') }}</span></th>
                 <th class="tb-col"><span class="overline-title">{{ label('title') }}</span></th>
                 <th class="tb-col"><span class="overline-title">{{ label('alias') }}</span></th>
                 <th class="tb-col" data-sortable="false"><span class="overline-title">{{ label('Action') }}</span>
@@ -56,18 +33,18 @@
                 $i = 1;
               @endphp
               @foreach ($data as $item)
-                <tr data-id="{{ $item->provience_id }}" data-display_order="{{ $item->display_order }}"
+                <tr data-id="{{ $item->district_id }}" data-display_order="{{ $item->display_order }}"
                   class="draggable-row <?php echo $item->status == 0 ? 'bg-light bg-danger' : ''; ?>">
                   <td class="tb-col">{{ $i++ }}</td>
                   <td class="tb-col">
-                    {!! getFieldData('tbl_countries', 'title', 'country_id', $item->countries_id) !!}
+                    {!! getFieldData('tbl_provinces', 'title', 'province_id', $item->provinces_id) !!}
                   </td>
                   <td class="tb-col">{{ $item->title }}</td>
                   <td class="tb-col">
-                    <div class="alias-wrapper" data-id="{{ $item->provience_id }}">
+                    <div class="alias-wrapper" data-id="{{ $item->district_id }}">
                       <span class="alias">{{ $item->alias }}</span>
                       <input type="text" class="alias-input d-none" value="{{ $item->alias }}"
-                        id="alias_{{ $item->provience_id }}" />
+                        id="alias_{{ $item->district_id }}" />
                     </div>
                     <span class="badge badge-soft-primary change-alias-badge">change alias</span>
                   </td>
@@ -78,13 +55,14 @@
                         <i class="ri-more-fill align-middle"></i>
                       </button>
                       <ul class="dropdown-menu dropdown-menu-end">
-                        <li><a href="{{ route('proviences.show', [$item->provience_id]) }}" class="dropdown-item"><i
+                        <li><a href="{{ route('districts.show', [$item->district_id]) }}" class="dropdown-item"><i
                               class="ri-eye-fill text-muted me-2 align-bottom"></i> {{ label('View') }}</a></li>
-                        <li><a href="{{ route('proviences.edit', [$item->provience_id]) }}"
+                        <li><a href="{{ route('districts.edit', [$item->district_id]) }}"
                             class="dropdown-item edit-item-btn"><i
-                              class="ri-pencil-fill text-muted me-2 align-bottom"></i> {{ label('Edit') }}</a></li>
+                              class="ri-pencil-fill text-muted me-2 align-bottom"></i>
+                            {{ label('Edit') }}</a></li>
                         <li>
-                          <a href="{{ route('proviences.toggle', [$item->provience_id]) }}"
+                          <a href="{{ route('districts.toggle', [$item->district_id]) }}"
                             class="dropdown-item toggle-item-btn" onclick="confirmToggle(this.href)">
                             <i class="ri-article-fill text-muted me-2 align-bottom"></i>
                             {{ $item->status == 1 ? label('Unpublish') : label('Publish') }}
@@ -92,14 +70,14 @@
 
                         </li>
                         <li>
-                          <a href="{{ route('proviences.clone', [$item->provience_id]) }}"
+                          <a href="{{ route('districts.clone', [$item->district_id]) }}"
                             class="dropdown-item toggle-item-btn" onclick="confirmClone(this.href)">
                             <i class="ri-file-copy-line text-muted me-2 align-bottom"></i> {{ label('Clone') }}
                           </a>
 
                         </li>
                         <li>
-                          <a href="{{ route('proviences.destroy', [$item->provience_id]) }}"
+                          <a href="{{ route('districts.destroy', [$item->district_id]) }}"
                             class="dropdown-item remove-item-btn" onclick="confirmDelete(this.href)">
                             <i class="ri-delete-bin-fill text-muted me-2 align-bottom"></i> {{ label('Delete') }}
                           </a>
@@ -107,36 +85,18 @@
                         </li>
                       </ul>
                     </div>
-
-
                   </td>
                 </tr>
               @endforeach
-
             </tbody>
           </table>
-
-
         </div>
       </div>
     </div>
   </div>
 @endsection
 
-@push('css')
-  <link rel="stylesheet" href="https://cdn.datatables.net/1.13.5/css/dataTables.bootstrap4.min.css">
-  <link rel="stylesheet" href="https://cdn.datatables.net/rowreorder/1.4.0/css/rowReorder.dataTables.min.css">
-@endpush
 @push('js')
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.68/pdfmake.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.68/vfs_fonts.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-  <script src="https://cdn.datatables.net/1.13.5/js/jquery.dataTables.min.js"></script>
-  <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.html5.min.js"></script>
-  <script src="https://cdn.datatables.net/rowreorder/1.4.0/js/dataTables.rowReorder.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-
   <script>
     $(document).ready(function(e) {
       $('.change-alias-badge').on('click', function() {
@@ -153,7 +113,7 @@
           aliasInput.hide();
           $(this).removeClass('editing').text('Change Alias');
           var articleId = $(aliasWrapper).data('id');
-          var ajaxUrl = "{{ route('proviences.updatealias') }}";
+          var ajaxUrl = "{{ route('districts.updatealias') }}";
           var data = {
             articleId: articleId,
             newAlias: newAlias
@@ -236,7 +196,7 @@
         if (result.isConfirmed) {
           $.ajax({
             url: url,
-            type: 'GET',
+            type: 'DELETE',
             headers: {
               'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
             },

Modules/Admin/resources/views/districts/show.blade.php

@@ -0,0 +1,45 @@
+@extends('layouts.app')
+@section('content')
+  <div class="page-content">
+    <div class="container-fluid">
+
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'Province'])
+
+      <!-- end page title -->
+
+      <div class='card'>
+        <div class='card-header d-flex justify-content-between align-items-center'>
+          <h2><?php echo label('View Detail'); ?></h2>
+          <?php createButton('btn-primary btn-cancel', '', 'Back to List', route('districts.index')); ?>
+
+        </div>
+        <div class='card-body'>
+          <p><b>Province:&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->proviences_id }}</span></p>
+          <p><b>Title :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->title }}</span></p>
+          <p><b>Alias :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->alias }}</span></p>
+          <p><b>Description :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->description }}</span></p>
+          <p><b>Display Order :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->display_order }}</span></p>
+          <p><b>Status :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span
+              class="{{ $data->status == 1 ? 'text-success' : 'text-danger' }}">{{ $data->status == 1 ? 'Active' : 'Inactive' }}</span>
+          </p>
+          <p><b>Remarks :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->remarks }}</span></p>
+          <p><b>Createdby :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->createdby }}</span></p>
+          <p><b>Updatedby :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->updatedby }}</span></p>
+          <div class="d-flex justify-content-between">
+            <div>
+              <p><b>Created On :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->created_at }}</span></p>
+              <p><b>Created By :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->createdBy }}</span></p>
+            </div>
+            <div>
+              <p><b>Updated On :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->updated_at }}</span></p>
+              <p><b>Updated By :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->updatedBy }}</span></p>
+
+            </div>
+          </div>
+
+        </div>
+      </div>
+    </div>
+  </div>
+@endSection

Modules/Admin/resources/views/genders/edit.blade.php

@@ -0,0 +1,39 @@
+@extends('layouts.app')
+@section('content')
+  \<div class="page-content">
+    <div class="container-fluid">
+
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'Gender'])
+
+      <!-- end page title -->
+      <div class='card'>
+        <div class='card-body'>
+
+          <form action="{{ $editable ? route('genders.update', [$data->gender_id]) : route('genders.store') }}"
+            id="updateCustomForm" method="POST">
+
+            @csrf
+            <input type=hidden name='gender_id' value='{{ $editable ? $data->gender_id : '' }}' />
+
+            <div class="row">
+              <div class="col-lg-12">
+                {{ createText('title', 'title', 'Title', '', $editable ? $data->title : '') }}
+              </div>
+
+              <div class="col-lg-12 pb-2">
+                {{ createPlainTextArea('remarks', '', 'Remarks', $editable ? $data->remarks : '') }}
+              </div>
+
+              <div class="col-md-12 mt-2">
+                <?php createButton('btn-primary btn-update', '', 'Submit'); ?>
+                <?php createButton('btn-danger btn-cancel', '', 'Cancel', route('genders.index')); ?>
+              </div>
+
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+@endsection

Modules/Admin/resources/views/genders/index.blade.php

@@ -1,63 +1,42 @@
 @extends('layouts.app')
 @section('content')
-  <div class="row">
-    <div class="col-lg-4">
-      <form action="{{ route('countries.store') }}" id="storeCustomForm" method="POST">
-        @csrf
-        <div class='card'>
-          <div class="card-header">
-            <h2 class="card-title mb-0">Add Country</h2>
-          </div>
-          <div class='card-body'>
-            <div class="row">
-              <div class="col-lg-12">{{ createText('title', 'title', 'Title') }}</div>
-              <div class="border border-dashed"></div>
-              <div class="col-lg-12 pb-3">{{ createTextarea('description', 'description ', 'Description') }}</div>
-              <div class="border border-dashed"></div>
-              <div class="col-lg-12 pb-2">{{ createPlainTextArea('remarks', 'remarks ', 'Remarks') }}</div>
-            </div>
-          </div>
+  <div class="page-content">
+    <div class="container-fluid">
 
-          <div class="card-footer">
-            <div class="col-md-12">
-              <?php createButton('btn-primary btn-store', '', 'Submit'); ?>
-              <?php createButton('btn-danger btn-cancel', '', 'Cancel', route('countries.index')); ?>
-            </div>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="col-lg-8">
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'Gender'])
+
+      <!-- end page title -->
       <div class="card">
-        <div class="card-header d-flex justify-content-between align-items-center">
-          <h2 class="card-title mb-0">{{ label('Countries List') }}</h2>
+        <div class="card-header align-items-center d-flex">
+          <h5 class="card-title flex-grow-1 mb-0">Gender Lists</h5>
+          <div class="flex-shrink-0">
+            <a href="{{ route('genders.create') }}" class="btn btn-success waves-effect waves-light"><i
+                class="ri-add-fill me-1 align-bottom"></i> Create Gender</a>
+          </div>
         </div>
         <div class="card-body">
-          <table class="dataTable table" id="tbl_countries" data-url="{{ route('countries.sort') }}">
+          <table class="dataTable table" id="tbl_genders" data-url="{{ route('genders.sort') }}">
             <thead class="table-light">
               <tr>
-                <th class="tb-col text-uppercase"><span class="overline-title">{{ label('Sn.') }}</span></th>
-                <th class="tb-col text-uppercase"><span class="overline-title">{{ label('title') }}</span></th>
-                <th class="tb-col text-uppercase"><span class="overline-title">{{ label('alias') }}</span></th>
-                <th class="tb-col text-uppercase" data-sortable="false"><span
-                    class="overline-title">{{ label('Action') }}</span>
+                <th class="tb-col"><span class="overline-title">{{ label('Sn.') }}</span></th>
+                <th class="tb-col"><span class="overline-title">{{ label('title') }}</span></th>
+                <th class="tb-col"><span class="overline-title">{{ label('alias') }}</span></th>
+                <th class="tb-col" data-sortable="false"><span class="overline-title">{{ label('Action') }}</span>
                 </th>
               </tr>
             </thead>
             <tbody>
-              @php
-                $i = 1;
-              @endphp
-              @foreach ($data as $item)
-                <tr data-id="{{ $item->country_id }}" data-display_order="{{ $item->display_order }}"
+              @foreach ($data as $index => $item)
+                <tr data-id="{{ $item->gender_id }}" data-display_order="{{ $item->display_order }}"
                   class="draggable-row <?php echo $item->status == 0 ? 'bg-light bg-danger' : ''; ?>">
-                  <td class="tb-col">{{ $i++ }}</td>
+                  <td class="tb-col">{{ $index + 1 }}</td>
                   <td class="tb-col">{{ $item->title }}</td>
                   <td class="tb-col">
-                    <div class="alias-wrapper" data-id="{{ $item->country_id }}">
+                    <div class="alias-wrapper" data-id="{{ $item->gender_id }}">
                       <span class="alias">{{ $item->alias }}</span>
                       <input type="text" class="alias-input d-none" value="{{ $item->alias }}"
-                        id="alias_{{ $item->country_id }}" />
+                        id="alias_{{ $item->gender_id }}" />
                     </div>
                     <span class="badge badge-soft-primary change-alias-badge">change alias</span>
                   </td>
@@ -68,20 +47,28 @@
                         <i class="ri-more-fill align-middle"></i>
                       </button>
                       <ul class="dropdown-menu dropdown-menu-end">
-                        <li><a href="{{ route('countries.show', [$item->country_id]) }}" class="dropdown-item"><i
+                        <li><a href="{{ route('genders.show', [$item->gender_id]) }}" class="dropdown-item"><i
                               class="ri-eye-fill text-muted me-2 align-bottom"></i> {{ label('View') }}</a></li>
-                        <li><a href="{{ route('countries.edit', [$item->country_id]) }}"
+                        <li><a href="{{ route('genders.edit', [$item->gender_id]) }}"
                             class="dropdown-item edit-item-btn"><i
                               class="ri-pencil-fill text-muted me-2 align-bottom"></i> {{ label('Edit') }}</a></li>
                         <li>
-                          <a href="{{ route('countries.toggle', [$item->country_id]) }}"
+                          <a href="{{ route('genders.toggle', [$item->gender_id]) }}"
                             class="dropdown-item toggle-item-btn" onclick="confirmToggle(this.href)">
                             <i class="ri-article-fill text-muted me-2 align-bottom"></i>
                             {{ $item->status == 1 ? label('Unpublish') : label('Publish') }}
                           </a>
+
                         </li>
                         <li>
-                          <a href="{{ route('countries.destroy', [$item->country_id]) }}"
+                          <a href="{{ route('genders.clone', [$item->gender_id]) }}"
+                            class="dropdown-item toggle-item-btn" onclick="confirmClone(this.href)">
+                            <i class="ri-file-copy-line text-muted me-2 align-bottom"></i> {{ label('Clone') }}
+                          </a>
+
+                        </li>
+                        <li>
+                          <a href="{{ route('genders.destroy', [$item->gender_id]) }}"
                             class="dropdown-item remove-item-btn" onclick="confirmDelete(this.href)">
                             <i class="ri-delete-bin-fill text-muted me-2 align-bottom"></i> {{ label('Delete') }}
                           </a>
@@ -98,18 +85,8 @@
     </div>
   </div>
 @endsection
-@push('css')
-  <link rel="stylesheet" href="https://cdn.datatables.net/1.13.5/css/dataTables.bootstrap4.min.css">
-  <link rel="stylesheet" href="https://cdn.datatables.net/rowreorder/1.4.0/css/rowReorder.dataTables.min.css">
-@endpush
+
 @push('js')
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.68/pdfmake.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.68/vfs_fonts.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-  <script src="https://cdn.datatables.net/1.13.5/js/jquery.dataTables.min.js"></script>
-  <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.html5.min.js"></script>
-  <script src="https://cdn.datatables.net/rowreorder/1.4.0/js/dataTables.rowReorder.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
   <script>
     $(document).ready(function(e) {
       $('.change-alias-badge').on('click', function() {
@@ -126,11 +103,12 @@
           aliasInput.hide();
           $(this).removeClass('editing').text('Change Alias');
           var articleId = $(aliasWrapper).data('id');
-          var ajaxUrl = "{{ route('countries.updatealias') }}";
+          var ajaxUrl = "{{ route('genders.updatealias') }}";
           var data = {
             articleId: articleId,
             newAlias: newAlias
           };
+
           $.ajax({
             url: ajaxUrl,
             type: 'POST',
@@ -158,16 +136,20 @@
           //selector: 'tr'
         },
       });
+
       var isRowReorderComplete = false;
+
       mytable.on('row-reorder', function(e, diff, edit) {
         isRowReorderComplete = true;
       });
+
       mytable.on('draw', function() {
         if (isRowReorderComplete) {
           var url = mytable.table().node().getAttribute('data-url');
           var ids = mytable.rows().nodes().map(function(node) {
             return $(node).data('id');
           }).toArray();
+
           console.log(ids);
           $.ajax({
             url: url,
@@ -204,7 +186,7 @@
         if (result.isConfirmed) {
           $.ajax({
             url: url,
-            type: 'DELETE',
+            type: 'GET',
             headers: {
               'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
             },
@@ -249,5 +231,35 @@
         }
       });
     }
+
+    function confirmClone(url) {
+      event.preventDefault();
+      Swal.fire({
+        title: 'Are you sure?',
+        text: 'Clonning will create replica of current row. No any linked data will be updated!',
+        icon: 'warning',
+        showCancelButton: true,
+        confirmButtonText: 'Proceed',
+        cancelButtonText: 'Cancel',
+        reverseButtons: true
+      }).then((result) => {
+        if (result.isConfirmed) {
+          $.ajax({
+            url: url,
+            type: 'GET',
+            headers: {
+              'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+            },
+            success: function(response) {
+              Swal.fire('Updated!', 'Clonning Completed', 'success');
+              location.reload();
+            },
+            error: function(xhr, status, error) {
+              Swal.fire('Error!', 'An error occurred.', 'error');
+            }
+          });
+        }
+      });
+    }
   </script>
 @endpush

Modules/Admin/resources/views/genders/show.blade.php

@@ -0,0 +1,42 @@
+@extends('layouts.app')
+@section('content')
+  <div class="page-content">
+    <div class="container-fluid">
+
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'Nationality'])
+
+      <!-- end page title -->
+      <div class='card'>
+        <div class="card-header align-items-center d-flex">
+          <h5 class="card-title flex-grow-1 mb-0">View Detail</h5>
+          <div class="flex-shrink-0">
+            <a href="{{ route('nationalities.index') }}" class="btn btn-success waves-effect waves-light"><i
+                class="ri-add-fill me-1 align-bottom"></i> Back to List</a>
+          </div>
+        </div>
+        <div class='card-body'>
+          <p><b>Title :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->title }}</span></p>
+          <p><b>Alias :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->alias }}</span></p>
+          <p><b>Status :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span
+              class="{{ $data->status == 1 ? 'text-success' : 'text-danger' }}">{{ $data->status == 1 ? 'Active' : 'Inactive' }}</span>
+          </p>
+          <p><b>Remarks :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->remarks }}</span></p>
+          <p><b>Display Order :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->display_order }}</span></p>
+          <p><b>Createdby :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->createdby }}</span></p>
+          <p><b>Updatedby :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->updatedby }}</span></p>
+          <div class="d-flex justify-content-between">
+            <div>
+              <p><b>Created On :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->created_at }}</span></p>
+              <p><b>Created By :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->createdBy }}</span></p>
+            </div>
+            <div>
+              <p><b>Updated On :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->updated_at }}</span></p>
+              <p><b>Updated By :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->updatedBy }}</span></p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+@endSection

Modules/Admin/resources/views/index.blade.php

@@ -0,0 +1,7 @@
+@extends('admin::layouts.master')
+
+@section('content')
+    <h1>Hello World</h1>
+
+    <p>Module: {!! config('admin.name') !!}</p>
+@endsection

Modules/Admin/resources/views/layouts/master.blade.php

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+    <title>Admin Module - {{ config('app.name', 'Laravel') }}</title>
+
+    <meta name="description" content="{{ $description ?? '' }}">
+    <meta name="keywords" content="{{ $keywords ?? '' }}">
+    <meta name="author" content="{{ $author ?? '' }}">
+
+    <!-- Fonts -->
+    <link rel="preconnect" href="https://fonts.bunny.net">
+    <link href="https://fonts.bunny.net/css?family=figtree:400,500,600&display=swap" rel="stylesheet" />
+
+    {{-- Vite CSS --}}
+    {{-- {{ module_vite('build-admin', 'resources/assets/sass/app.scss') }} --}}
+</head>
+
+<body>
+    @yield('content')
+
+    {{-- Vite JS --}}
+    {{-- {{ module_vite('build-admin', 'resources/assets/js/app.js') }} --}}
+</body>

Modules/Admin/resources/views/nationalities/edit.blade.php

@@ -0,0 +1,40 @@
+@extends('layouts.app')
+@section('content')
+  <div class="page-content">
+    <div class="container-fluid">
+
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'Nationality'])
+
+      <!-- end page title -->
+
+      <div class='card'>
+        <div class='card-body'>
+          <form
+            action="{{ $editable ? route('nationalities.update', [$data->nationality_id]) : route('nationalities.store') }}"
+            id="updateCustomForm" method="POST">
+
+            @csrf
+
+            <input type=hidden name='nationality_id' value='{{ $editable ? $data->nationality_id : '' }}' />
+
+            <div class="row">
+
+              <div class="col-lg-12">
+                {{ createText('title', 'title', 'Title', '', $editable ? $data->title : '') }}
+              </div>
+
+              <div class="col-lg-12 pb-2">
+                {{ createPlainTextArea('remarks', '', 'Remarks', $editable ? $data->remarks : '') }}
+              </div>
+
+              <div class="col-md-12 mt-2">
+                <?php createButton('btn-primary btn-update', '', 'Submit'); ?>
+                <?php createButton('btn-danger btn-cancel', '', 'Cancel', route('nationalities.index')); ?>
+              </div>
+            </div>
+
+          </form>
+        </div>
+      </div>
+    @endsection

Modules/Admin/resources/views/nationalities/index.blade.php

@@ -1,102 +1,94 @@
 @extends('layouts.app')
 @section('content')
-  <div class="card">
-    <div class="card-header d-flex justify-content-between align-items-center">
-      <h2>{{ label('Nationalities List') }}</h2>
-      <a href="{{ route('nationalities.create') }}" class="btn btn-primary"><span>{{ label('Create New') }}</span></a>
-    </div>
-    <div class="card-body">
-      <table class="dataTable table" id="tbl_nationalities" data-url="{{ route('nationalities.sort') }}">
-        <thead class="table-light">
-          <tr>
-            <th class="tb-col"><span class="overline-title">{{ label('Sn.') }}</span></th>
-            <th class="tb-col"><span class="overline-title">{{ label('title') }}</span></th>
-            <th class="tb-col"><span class="overline-title">{{ label('alias') }}</span></th>
-            <th class="tb-col" data-sortable="false"><span class="overline-title">{{ label('Action') }}</span>
-            </th>
-          </tr>
-        </thead>
-        <tbody>
-          @php
-            $i = 1;
-          @endphp
-          @foreach ($data as $item)
-            <tr data-id="{{ $item->nationality_id }}" data-display_order="{{ $item->display_order }}"
-              class="draggable-row <?php echo $item->status == 0 ? 'bg-light bg-danger' : ''; ?>">
-              <td class="tb-col">{{ $i++ }}</td>
-              <td class="tb-col">{{ $item->title }}</td>
-              <td class="tb-col">
-                <div class="alias-wrapper" data-id="{{ $item->nationality_id }}">
-                  <span class="alias">{{ $item->alias }}</span>
-                  <input type="text" class="alias-input d-none" value="{{ $item->alias }}"
-                    id="alias_{{ $item->nationality_id }}" />
-                </div>
-                <span class="badge badge-soft-primary change-alias-badge">change alias</span>
-              </td>
-              <td class="tb-col">
-                <div class="dropdown d-inline-block">
-                  <button class="btn btn-soft-secondary btn-sm dropdown" type="button" data-bs-toggle="dropdown"
-                    aria-expanded="false">
-                    <i class="ri-more-fill align-middle"></i>
-                  </button>
-                  <ul class="dropdown-menu dropdown-menu-end">
-                    <li><a href="{{ route('nationalities.show', [$item->nationality_id]) }}" class="dropdown-item"><i
-                          class="ri-eye-fill text-muted me-2 align-bottom"></i> {{ label('View') }}</a></li>
-                    <li><a href="{{ route('nationalities.edit', [$item->nationality_id]) }}"
-                        class="dropdown-item edit-item-btn"><i class="ri-pencil-fill text-muted me-2 align-bottom"></i>
-                        {{ label('Edit') }}</a></li>
-                    <li>
-                      <a href="{{ route('nationalities.toggle', [$item->nationality_id]) }}"
-                        class="dropdown-item toggle-item-btn" onclick="confirmToggle(this.href)">
-                        <i class="ri-article-fill text-muted me-2 align-bottom"></i>
-                        {{ $item->status == 1 ? label('Unpublish') : label('Publish') }}
-                      </a>
+  <div class="page-content">
+    <div class="container-fluid">
 
-                    </li>
-                    <li>
-                      <a href="{{ route('nationalities.clone', [$item->nationality_id]) }}"
-                        class="dropdown-item toggle-item-btn" onclick="confirmClone(this.href)">
-                        <i class="ri-file-copy-line text-muted me-2 align-bottom"></i> {{ label('Clone') }}
-                      </a>
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'Nationality'])
 
-                    </li>
-                    <li>
-                      <a href="{{ route('nationalities.destroy', [$item->nationality_id]) }}"
-                        class="dropdown-item remove-item-btn" onclick="confirmDelete(this.href)">
-                        <i class="ri-delete-bin-fill text-muted me-2 align-bottom"></i> {{ label('Delete') }}
-                      </a>
+      <!-- end page title -->
+      <div class="card">
 
-                    </li>
-                  </ul>
-                </div>
-
-
-              </td>
-            </tr>
-          @endforeach
-
-        </tbody>
-      </table>
+        <div class="card-header align-items-center d-flex">
+          <h5 class="card-title flex-grow-1 mb-0">Nationality Lists</h5>
+          <div class="flex-shrink-0">
+            <a href="{{ route('nationalities.index') }}" class="btn btn-success waves-effect waves-light"><i
+                class="ri-add-fill me-1 align-bottom"></i>Create Nationality</a>
+          </div>
+        </div>
+        <div class="card-body">
+          <table class="dataTable table" id="tbl_nationalities" data-url="{{ route('nationalities.sort') }}">
+            <thead class="table-light">
+              <tr>
+                <th class="tb-col"><span class="overline-title">{{ label('Sn.') }}</span></th>
+                <th class="tb-col"><span class="overline-title">{{ label('title') }}</span></th>
+                <th class="tb-col"><span class="overline-title">{{ label('alias') }}</span></th>
+                <th class="tb-col" data-sortable="false"><span class="overline-title">{{ label('Action') }}</span>
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+              @foreach ($data as $index => $item)
+                <tr data-id="{{ $item->nationality_id }}" data-display_order="{{ $item->display_order }}"
+                  class="draggable-row <?php echo $item->status == 0 ? 'bg-light bg-danger' : ''; ?>">
+                  <td class="tb-col">{{ $index + 1 }}</td>
+                  <td class="tb-col">{{ $item->title }}</td>
+                  <td class="tb-col">
+                    <div class="alias-wrapper" data-id="{{ $item->nationality_id }}">
+                      <span class="alias">{{ $item->alias }}</span>
+                      <input type="text" class="alias-input d-none" value="{{ $item->alias }}"
+                        id="alias_{{ $item->nationality_id }}" />
+                    </div>
+                    <span class="badge badge-soft-primary change-alias-badge">change alias</span>
+                  </td>
+                  <td class="tb-col">
+                    <div class="dropdown d-inline-block">
+                      <button class="btn btn-soft-secondary btn-sm dropdown" type="button" data-bs-toggle="dropdown"
+                        aria-expanded="false">
+                        <i class="ri-more-fill align-middle"></i>
+                      </button>
+                      <ul class="dropdown-menu dropdown-menu-end">
+                        <li><a href="{{ route('nationalities.show', [$item->nationality_id]) }}" class="dropdown-item"><i
+                              class="ri-eye-fill text-muted me-2 align-bottom"></i> {{ label('View') }}</a></li>
+                        <li><a href="{{ route('nationalities.edit', [$item->nationality_id]) }}"
+                            class="dropdown-item edit-item-btn"><i
+                              class="ri-pencil-fill text-muted me-2 align-bottom"></i>
+                            {{ label('Edit') }}</a></li>
+                        <li>
+                          <a href="{{ route('nationalities.toggle', [$item->nationality_id]) }}"
+                            class="dropdown-item toggle-item-btn" onclick="confirmToggle(this.href)">
+                            <i class="ri-article-fill text-muted me-2 align-bottom"></i>
+                            {{ $item->status == 1 ? label('Unpublish') : label('Publish') }}
+                          </a>
 
+                        </li>
+                        <li>
+                          <a href="{{ route('nationalities.clone', [$item->nationality_id]) }}"
+                            class="dropdown-item toggle-item-btn" onclick="confirmClone(this.href)">
+                            <i class="ri-file-copy-line text-muted me-2 align-bottom"></i> {{ label('Clone') }}
+                          </a>
 
+                        </li>
+                        <li>
+                          <a href="{{ route('nationalities.destroy', [$item->nationality_id]) }}"
+                            class="dropdown-item remove-item-btn" onclick="confirmDelete(this.href)">
+                            <i class="ri-delete-bin-fill text-muted me-2 align-bottom"></i> {{ label('Delete') }}
+                          </a>
+                        </li>
+                      </ul>
+                    </div>
+                  </td>
+                </tr>
+              @endforeach
+            </tbody>
+          </table>
+        </div>
+      </div>
     </div>
   </div>
 @endsection
 
-@push('css')
-  <link rel="stylesheet" href="https://cdn.datatables.net/1.13.5/css/dataTables.bootstrap4.min.css">
-  <link rel="stylesheet" href="https://cdn.datatables.net/rowreorder/1.4.0/css/rowReorder.dataTables.min.css">
-@endpush
 @push('js')
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.68/pdfmake.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.68/vfs_fonts.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-  <script src="https://cdn.datatables.net/1.13.5/js/jquery.dataTables.min.js"></script>
-  <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.html5.min.js"></script>
-  <script src="https://cdn.datatables.net/rowreorder/1.4.0/js/dataTables.rowReorder.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-
   <script>
     $(document).ready(function(e) {
       $('.change-alias-badge').on('click', function() {

Modules/Admin/resources/views/nationalities/show.blade.php

@@ -0,0 +1,42 @@
+@extends('layouts.app')
+@section('content')
+  <div class="page-content">
+    <div class="container-fluid">
+
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'Nationality'])
+
+      <!-- end page title -->
+      <div class='card'>
+        <div class="card-header align-items-center d-flex">
+          <h5 class="card-title flex-grow-1 mb-0">View Detail</h5>
+          <div class="flex-shrink-0">
+            <a href="{{ route('nationalities.index') }}" class="btn btn-success waves-effect waves-light"><i
+                class="ri-add-fill me-1 align-bottom"></i> Back to List</a>
+          </div>
+        </div>
+        <div class='card-body'>
+          <p><b>Title :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->title }}</span></p>
+          <p><b>Alias :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->alias }}</span></p>
+          <p><b>Status :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span
+              class="{{ $data->status == 1 ? 'text-success' : 'text-danger' }}">{{ $data->status == 1 ? 'Active' : 'Inactive' }}</span>
+          </p>
+          <p><b>Remarks :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->remarks }}</span></p>
+          <p><b>Display Order :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->display_order }}</span></p>
+          <p><b>Createdby :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->createdby }}</span></p>
+          <p><b>Updatedby :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->updatedby }}</span></p>
+          <div class="d-flex justify-content-between">
+            <div>
+              <p><b>Created On :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->created_at }}</span></p>
+              <p><b>Created By :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->createdBy }}</span></p>
+            </div>
+            <div>
+              <p><b>Updated On :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->updated_at }}</span></p>
+              <p><b>Updated By :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->updatedBy }}</span></p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+@endSection

Modules/Admin/resources/views/provinces/edit.blade.php

@@ -0,0 +1,37 @@
+@extends('layouts.app')
+@section('content')
+  <div class="page-content">
+    <div class="container-fluid">
+
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'Province'])
+
+      <!-- end page title -->
+
+      <div class='card'>
+        <div class='card-body'>
+          <form action="{{ $editable ? route('provinces.update', [$data->province_id]) : route('provinces.store') }}"
+            id="updateCustomForm" method="POST">
+            @csrf <input type=hidden name='province_id' value='{{ $editable ? $data->province_id : '' }}' />
+            <div class="row">
+              <div class="col-lg-6">
+                {{ createCustomSelect('tbl_countries', 'title', 'country_id', $editable ? $data->countries_id : '', 'Countries Id', 'countries_id', 'form-control select2', 'status<>-1') }}
+              </div>
+              <div class="col-lg-6">{{ createText('title', 'title', 'Title', '', $editable ? $data->title : '') }}
+              </div>
+              <div class="col-lg-12 pb-2">
+                {{ createTextarea('description', 'description ckeditor-classic', 'Description', $editable ? $data->description : '') }}
+              </div>
+              <div class="col-lg-12 pb-2">
+                {{ createPlainTextArea('remarks', '', 'Remarks', $editable ? $data->remarks : '') }}
+              </div>
+              <div class="col-md-12"><?php createButton('btn-primary btn-update', '', 'Submit'); ?>
+                <?php createButton('btn-primary btn-cancel', '', 'Cancel', route('provinces.index')); ?>
+              </div>
+          </form>
+        </div>
+      </div>
+
+    </div>
+  </div>
+@endsection

Modules/Admin/resources/views/provinces/index.blade.php

@@ -1,106 +1,110 @@
 @extends('layouts.app')
 @section('content')
-  <div class="card">
-    <div class="card-header d-flex justify-content-between align-items-center">
-      <h2>{{ label('Districts List') }}</h2>
-      <a href="{{ route('districts.create') }}" class="btn btn-primary"><span>{{ label('Create New') }}</span></a>
-    </div>
-    <div class="card-body">
-      <table class="dataTable table" id="tbl_districts" data-url="{{ route('districts.sort') }}">
-        <thead class="table-light">
-          <tr>
-            <th class="tb-col"><span class="overline-title">{{ label('Sn.') }}</span></th>
-            <th class="tb-col"><span class="overline-title">{{ label('proviences') }}</span></th>
-            <th class="tb-col"><span class="overline-title">{{ label('title') }}</span></th>
-            <th class="tb-col"><span class="overline-title">{{ label('alias') }}</span></th>
-            <th class="tb-col" data-sortable="false"><span class="overline-title">{{ label('Action') }}</span>
-            </th>
-          </tr>
-        </thead>
-        <tbody>
-          @php
-            $i = 1;
-          @endphp
-          @foreach ($data as $item)
-            <tr data-id="{{ $item->district_id }}" data-display_order="{{ $item->display_order }}"
-              class="draggable-row <?php echo $item->status == 0 ? 'bg-light bg-danger' : ''; ?>">
-              <td class="tb-col">{{ $i++ }}</td>
-              <td class="tb-col">
-                {!! getFieldData('tbl_proviences', 'title', 'provience_id', $item->proviences_id) !!}
-              </td>
-              <td class="tb-col">{{ $item->title }}</td>
-              <td class="tb-col">
-                <div class="alias-wrapper" data-id="{{ $item->district_id }}">
-                  <span class="alias">{{ $item->alias }}</span>
-                  <input type="text" class="alias-input d-none" value="{{ $item->alias }}"
-                    id="alias_{{ $item->district_id }}" />
-                </div>
-                <span class="badge badge-soft-primary change-alias-badge">change alias</span>
-              </td>
-              <td class="tb-col">
-                <div class="dropdown d-inline-block">
-                  <button class="btn btn-soft-secondary btn-sm dropdown" type="button" data-bs-toggle="dropdown"
-                    aria-expanded="false">
-                    <i class="ri-more-fill align-middle"></i>
-                  </button>
-                  <ul class="dropdown-menu dropdown-menu-end">
-                    <li><a href="{{ route('districts.show', [$item->district_id]) }}" class="dropdown-item"><i
-                          class="ri-eye-fill text-muted me-2 align-bottom"></i> {{ label('View') }}</a></li>
-                    <li><a href="{{ route('districts.edit', [$item->district_id]) }}"
-                        class="dropdown-item edit-item-btn"><i class="ri-pencil-fill text-muted me-2 align-bottom"></i>
-                        {{ label('Edit') }}</a></li>
-                    <li>
-                      <a href="{{ route('districts.toggle', [$item->district_id]) }}"
-                        class="dropdown-item toggle-item-btn" onclick="confirmToggle(this.href)">
-                        <i class="ri-article-fill text-muted me-2 align-bottom"></i>
-                        {{ $item->status == 1 ? label('Unpublish') : label('Publish') }}
-                      </a>
+  <div class="page-content">
+    <div class="container-fluid">
 
-                    </li>
-                    <li>
-                      <a href="{{ route('districts.clone', [$item->district_id]) }}" class="dropdown-item toggle-item-btn"
-                        onclick="confirmClone(this.href)">
-                        <i class="ri-file-copy-line text-muted me-2 align-bottom"></i> {{ label('Clone') }}
-                      </a>
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'Province'])
 
-                    </li>
-                    <li>
-                      <a href="{{ route('districts.destroy', [$item->district_id]) }}"
-                        class="dropdown-item remove-item-btn" onclick="confirmDelete(this.href)">
-                        <i class="ri-delete-bin-fill text-muted me-2 align-bottom"></i> {{ label('Delete') }}
-                      </a>
+      <!-- end page title -->
 
-                    </li>
-                  </ul>
-                </div>
+      <div class="row">
+        <div class="col-md-12">
+          <div class="card">
+            <div class="card-header align-items-center d-flex">
+              <h5 class="card-title flex-grow-1 mb-0">Province Lists</h5>
+              <div class="flex-shrink-0">
+                <a href="{{ route('provinces.create') }}" class="btn btn-success waves-effect waves-light"><i
+                    class="ri-add-fill me-1 align-bottom"></i> Create Province</a>
+              </div>
+            </div>
+            <div class="card-body">
+              <table class="dataTable table" id="tbl_provinces" data-url="{{ route('provinces.sort') }}">
+                <thead class="table-light">
+                  <tr>
+                    <th class="tb-col"><span class="overline-title">{{ label('Sn.') }}</span></th>
+                    <th class="tb-col"><span class="overline-title">{{ label('countries') }}</span></th>
+                    <th class="tb-col"><span class="overline-title">{{ label('title') }}</span></th>
+                    <th class="tb-col"><span class="overline-title">{{ label('alias') }}</span></th>
+                    <th class="tb-col" data-sortable="false"><span class="overline-title">{{ label('Action') }}</span>
+                    </th>
+                  </tr>
+                </thead>
+                <tbody>
+                  @php
+                    $i = 1;
+                  @endphp
+                  @foreach ($data as $item)
+                    <tr data-id="{{ $item->province_id }}" data-display_order="{{ $item->display_order }}"
+                      class="draggable-row <?php echo $item->status == 0 ? 'bg-light bg-danger' : ''; ?>">
+                      <td class="tb-col">{{ $i++ }}</td>
+                      <td class="tb-col">
+                        {!! getFieldData('tbl_countries', 'title', 'country_id', $item->countries_id) !!}
+                      </td>
+                      <td class="tb-col">{{ $item->title }}</td>
+                      <td class="tb-col">
+                        <div class="alias-wrapper" data-id="{{ $item->province_id }}">
+                          <span class="alias">{{ $item->alias }}</span>
+                          <input type="text" class="alias-input d-none" value="{{ $item->alias }}"
+                            id="alias_{{ $item->province_id }}" />
+                        </div>
+                        <span class="badge badge-soft-primary change-alias-badge">change alias</span>
+                      </td>
+                      <td class="tb-col">
+                        <div class="dropdown d-inline-block">
+                          <button class="btn btn-soft-secondary btn-sm dropdown" type="button" data-bs-toggle="dropdown"
+                            aria-expanded="false">
+                            <i class="ri-more-fill align-middle"></i>
+                          </button>
+                          <ul class="dropdown-menu dropdown-menu-end">
+                            <li><a href="{{ route('provinces.show', [$item->province_id]) }}" class="dropdown-item"><i
+                                  class="ri-eye-fill text-muted me-2 align-bottom"></i> {{ label('View') }}</a></li>
+                            <li><a href="{{ route('provinces.edit', [$item->province_id]) }}"
+                                class="dropdown-item edit-item-btn"><i
+                                  class="ri-pencil-fill text-muted me-2 align-bottom"></i> {{ label('Edit') }}</a></li>
+                            <li>
+                              <a href="{{ route('provinces.toggle', [$item->province_id]) }}"
+                                class="dropdown-item toggle-item-btn" onclick="confirmToggle(this.href)">
+                                <i class="ri-article-fill text-muted me-2 align-bottom"></i>
+                                {{ $item->status == 1 ? label('Unpublish') : label('Publish') }}
+                              </a>
+
+                            </li>
+                            <li>
+                              <a href="{{ route('provinces.clone', [$item->province_id]) }}"
+                                class="dropdown-item toggle-item-btn" onclick="confirmClone(this.href)">
+                                <i class="ri-file-copy-line text-muted me-2 align-bottom"></i> {{ label('Clone') }}
+                              </a>
+
+                            </li>
+                            <li>
+                              <a href="{{ route('provinces.destroy', [$item->province_id]) }}"
+                                class="dropdown-item remove-item-btn" onclick="confirmDelete(this.href)">
+                                <i class="ri-delete-bin-fill text-muted me-2 align-bottom"></i> {{ label('Delete') }}
+                              </a>
+
+                            </li>
+                          </ul>
+                        </div>
 
 
-              </td>
-            </tr>
-          @endforeach
+                      </td>
+                    </tr>
+                  @endforeach
 
-        </tbody>
-      </table>
+                </tbody>
+              </table>
 
 
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 @endsection
 
-@push('css')
-  <link rel="stylesheet" href="https://cdn.datatables.net/1.13.5/css/dataTables.bootstrap4.min.css">
-  <link rel="stylesheet" href="https://cdn.datatables.net/rowreorder/1.4.0/css/rowReorder.dataTables.min.css">
-@endpush
 @push('js')
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.68/pdfmake.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.68/vfs_fonts.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-  <script src="https://cdn.datatables.net/1.13.5/js/jquery.dataTables.min.js"></script>
-  <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.html5.min.js"></script>
-  <script src="https://cdn.datatables.net/rowreorder/1.4.0/js/dataTables.rowReorder.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-
   <script>
     $(document).ready(function(e) {
       $('.change-alias-badge').on('click', function() {
@@ -117,7 +121,7 @@
           aliasInput.hide();
           $(this).removeClass('editing').text('Change Alias');
           var articleId = $(aliasWrapper).data('id');
-          var ajaxUrl = "{{ route('districts.updatealias') }}";
+          var ajaxUrl = "{{ route('provinces.updatealias') }}";
           var data = {
             articleId: articleId,
             newAlias: newAlias
@@ -200,7 +204,7 @@
         if (result.isConfirmed) {
           $.ajax({
             url: url,
-            type: 'DELETE',
+            type: 'GET',
             headers: {
               'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
             },

Modules/Admin/resources/views/provinces/show.blade.php

@@ -0,0 +1,45 @@
+@extends('layouts.app')
+@section('content')
+  <div class="page-content">
+    <div class="container-fluid">
+
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => 'Province'])
+
+      <!-- end page title -->
+
+      <div class='card'>
+        <div class='card-header d-flex justify-content-between align-items-center'>
+          <h2><?php echo label('View Detail'); ?></h2>
+          <?php createButton('btn-primary btn-cancel', '', 'Back to List', route('provinces.index')); ?>
+
+        </div>
+        <div class='card-body'>
+          <p><b>Countries Id :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->countries_id }}</span></p>
+          <p><b>Title :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->title }}</span></p>
+          <p><b>Alias :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->alias }}</span></p>
+          <p><b>Description :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->description }}</span></p>
+          <p><b>Display Order :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->display_order }}</span></p>
+          <p><b>Status :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span
+              class="{{ $data->status == 1 ? 'text-success' : 'text-danger' }}">{{ $data->status == 1 ? 'Active' : 'Inactive' }}</span>
+          </p>
+          <p><b>Remarks :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->remarks }}</span></p>
+          <p><b>Createdby :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->createdby }}</span></p>
+          <p><b>Updatedby :&nbsp;&nbsp;&nbsp;&nbsp;</b> <span>{{ $data->updatedby }}</span></p>
+          <div class="d-flex justify-content-between">
+            <div>
+              <p><b>Created On :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->created_at }}</span></p>
+              <p><b>Created By :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->createdBy }}</span></p>
+            </div>
+            <div>
+              <p><b>Updated On :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->updated_at }}</span></p>
+              <p><b>Updated By :</b>&nbsp;&nbsp;&nbsp;<span>{{ $data->updatedBy }}</span></p>
+
+            </div>
+          </div>
+
+        </div>
+      </div>
+    </div>
+  </div>
+@endSection

Modules/Admin/routes/api.php

@@ -0,0 +1,19 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Modules\Admin\Http\Controllers\AdminController;
+
+/*
+ *--------------------------------------------------------------------------
+ * API Routes
+ *--------------------------------------------------------------------------
+ *
+ * Here is where you can register API routes for your application. These
+ * routes are loaded by the RouteServiceProvider within a group which
+ * is assigned the "api" middleware group. Enjoy building your API!
+ *
+*/
+
+Route::middleware(['auth:sanctum'])->prefix('v1')->group(function () {
+    Route::apiResource('admin', AdminController::class)->names('admin');
+});

Modules/Admin/routes/route.castes.php

@@ -0,0 +1,17 @@
+<?php
+use Illuminate\Support\Facades\Route;
+use Modules\Admin\Http\Controllers\CastesController;
+
+Route::prefix("caste")->as('castes.')->group(function () {
+    Route::get('/', [CastesController::class, 'index'])->name('index');
+    Route::get('/create', [CastesController::class, 'create'])->name('create');
+    Route::post('/store', [CastesController::class, 'store'])->name('store');
+    Route::post('/sort', [CastesController::class, 'sort'])->name('sort');
+    Route::post('/updatealias', [CastesController::class, 'updatealias'])->name('updatealias');
+    Route::get('/show/{id}', [CastesController::class, 'show'])->name('show');
+    Route::get('/edit/{id}', [CastesController::class, 'edit'])->name('edit');
+    Route::post('/update/{id}', [CastesController::class, 'update'])->name('update');
+    Route::get('/destroy/{id}', [CastesController::class, 'destroy'])->name('destroy');
+    Route::get('/toggle/{id}', [CastesController::class, 'toggle'])->name('toggle');
+    Route::get('/clone/{id}', [CastesController::class, 'clone'])->name('clone');
+});

Modules/Admin/routes/route.cities.php

@@ -0,0 +1,17 @@
+<?php
+use Illuminate\Support\Facades\Route;
+use Modules\Admin\Http\Controllers\CitiesController;
+
+Route::prefix("city")->as('cities.')->group(function () {
+    Route::get('/', [CitiesController::class, 'index'])->name('index');
+    Route::get('/create', [CitiesController::class, 'create'])->name('create');
+    Route::post('/store', [CitiesController::class, 'store'])->name('store');
+    Route::post('/sort', [CitiesController::class, 'sort'])->name('sort');
+    Route::post('/updatealias', [CitiesController::class, 'updatealias'])->name('updatealias');
+    Route::get('/show/{id}', [CitiesController::class, 'show'])->name('show');
+    Route::get('/edit/{id}', [CitiesController::class, 'edit'])->name('edit');
+    Route::post('/update/{id}', [CitiesController::class, 'update'])->name('update');
+    Route::delete('/destroy/{id}', [CitiesController::class, 'destroy'])->name('destroy');
+    Route::get('/clone/{id}', [CitiesController::class, 'clone'])->name('clone');
+    Route::get('/toggle/{id}', [CitiesController::class, 'toggle'])->name('toggle');
+});

Modules/Admin/routes/route.countries.php

@@ -0,0 +1,16 @@
+<?php
+use Illuminate\Support\Facades\Route;
+use Modules\Admin\Http\Controllers\CountriesController;
+
+Route::prefix("country")->as('countries.')->group(function () {
+    Route::get('/', [CountriesController::class, 'index'])->name('index');
+    Route::get('/create', [CountriesController::class, 'create'])->name('create');
+    Route::post('/store', [CountriesController::class, 'store'])->name('store');
+    Route::post('/sort', [CountriesController::class, 'sort'])->name('sort');
+    Route::post('/updatealias', [CountriesController::class, 'updatealias'])->name('updatealias');
+    Route::get('/show/{id}', [CountriesController::class, 'show'])->name('show');
+    Route::get('/edit/{id}', [CountriesController::class, 'edit'])->name('edit');
+    Route::post('/update/{id}', [CountriesController::class, 'update'])->name('update');
+    Route::delete('/destroy/{id}', [CountriesController::class, 'destroy'])->name('destroy');
+    Route::get('/toggle/{id}', [CountriesController::class, 'toggle'])->name('toggle');
+});

Modules/Admin/routes/route.districts.php

@@ -0,0 +1,18 @@
+<?php
+use Illuminate\Support\Facades\Route;
+use Modules\Admin\Http\Controllers\DistrictsController;
+
+Route::prefix("district")->as('districts.')->group(function () {
+    Route::get('/', [DistrictsController::class, 'index'])->name('index');
+    Route::get('/create', [DistrictsController::class, 'create'])->name('create');
+    Route::post('/store', [DistrictsController::class, 'store'])->name('store');
+    Route::post('/sort', [DistrictsController::class, 'sort'])->name('sort');
+    Route::post('/updatealias', [DistrictsController::class, 'updatealias'])->name('updatealias');
+    Route::get('/show/{id}', [DistrictsController::class, 'show'])->name('show');
+    Route::get('/edit/{id}', [DistrictsController::class, 'edit'])->name('edit');
+    Route::post('/update/{id}', [DistrictsController::class, 'update'])->name('update');
+    Route::delete('/destroy/{id}', [DistrictsController::class, 'destroy'])->name('destroy');
+    Route::get('/toggle/{id}', [DistrictsController::class, 'toggle'])->name('toggle');
+    Route::get('/clone/{id}', [DistrictsController::class, 'clone'])->name('clone');
+
+});

Modules/Admin/routes/route.genders.php

@@ -0,0 +1,17 @@
+<?php
+use Illuminate\Support\Facades\Route;
+use Modules\Admin\Http\Controllers\GendersController;
+
+Route::prefix("gender")->as('genders.')->group(function () {
+    Route::get('/', [GendersController::class, 'index'])->name('index');
+    Route::get('/create', [GendersController::class, 'create'])->name('create');
+    Route::post('/store', [GendersController::class, 'store'])->name('store');
+    Route::post('/sort', [GendersController::class, 'sort'])->name('sort');
+    Route::post('/updatealias', [GendersController::class, 'updatealias'])->name('updatealias');
+    Route::get('/show/{id}', [GendersController::class, 'show'])->name('show');
+    Route::get('/edit/{id}', [GendersController::class, 'edit'])->name('edit');
+    Route::post('/update/{id}', [GendersController::class, 'update'])->name('update');
+    Route::get('/destroy/{id}', [GendersController::class, 'destroy'])->name('destroy');
+    Route::get('/toggle/{id}', [GendersController::class, 'toggle'])->name('toggle');
+    Route::get('/clone/{id}', [GendersController::class, 'clone'])->name('clone');
+});

Modules/Admin/routes/route.nationalities.php

@@ -0,0 +1,17 @@
+<?php
+use Illuminate\Support\Facades\Route;
+use Modules\Admin\Http\Controllers\NationalitiesController;
+
+Route::prefix("nationality")->as('nationalities.')->group(function () {
+    Route::get('/', [NationalitiesController::class, 'index'])->name('index');
+    Route::get('/create', [NationalitiesController::class, 'create'])->name('create');
+    Route::post('/store', [NationalitiesController::class, 'store'])->name('store');
+    Route::post('/sort', [NationalitiesController::class, 'sort'])->name('sort');
+    Route::post('/updatealias', [NationalitiesController::class, 'updatealias'])->name('updatealias');
+    Route::get('/show/{id}', [NationalitiesController::class, 'show'])->name('show');
+    Route::get('/edit/{id}', [NationalitiesController::class, 'edit'])->name('edit');
+    Route::post('/update/{id}', [NationalitiesController::class, 'update'])->name('update');
+    Route::get('/destroy/{id}', [NationalitiesController::class, 'destroy'])->name('destroy');
+    Route::get('/toggle/{id}', [NationalitiesController::class, 'toggle'])->name('toggle');
+    Route::get('/clone/{id}', [NationalitiesController::class, 'clone'])->name('clone');
+});

Modules/Admin/routes/route.provinces.php

@@ -0,0 +1,17 @@
+<?php
+use Illuminate\Support\Facades\Route;
+use Modules\Admin\Http\Controllers\ProvinceController;
+
+Route::prefix("province")->as('provinces.')->group(function () {
+    Route::get('/', [ProvinceController::class, 'index'])->name('index');
+    Route::get('/create', [ProvinceController::class, 'create'])->name('create');
+    Route::post('/store', [ProvinceController::class, 'store'])->name('store');
+    Route::post('/sort', [ProvinceController::class, 'sort'])->name('sort');
+    Route::post('/updatealias', [ProvinceController::class, 'updatealias'])->name('updatealias');
+    Route::get('/show/{id}', [ProvinceController::class, 'show'])->name('show');
+    Route::get('/edit/{id}', [ProvinceController::class, 'edit'])->name('edit');
+    Route::post('/update/{id}', [ProvinceController::class, 'update'])->name('update');
+    Route::get('/destroy/{id}', [ProvinceController::class, 'destroy'])->name('destroy');
+    Route::get('/toggle/{id}', [ProvinceController::class, 'toggle'])->name('toggle');
+    Route::get('/clone/{id}', [ProvinceController::class, 'clone'])->name('clone');
+});

Modules/Admin/routes/web.php

@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Modules\Admin\Http\Controllers\AdminController;
+
+/*
+|--------------------------------------------------------------------------
+| Web Routes
+|--------------------------------------------------------------------------
+|
+| Here is where you can register web routes for your application. These
+| routes are loaded by the RouteServiceProvider within a group which
+| contains the "web" middleware group. Now create something great!
+|
+*/
+
+Route::group([], function () {
+    Route::resource('admin', AdminController::class)->names('admin');
+});
+
+require __DIR__ . '/route.countries.php';
+require __DIR__ . '/route.provinces.php';
+require __DIR__ . '/route.districts.php';
+require __DIR__ . '/route.cities.php';
+require __DIR__ . '/route.genders.php';
+require __DIR__ . '/route.castes.php';
+require __DIR__ . '/route.nationalities.php';

Modules/Admin/vite.config.js

@@ -0,0 +1,26 @@
+import { defineConfig } from 'vite';
+import laravel from 'laravel-vite-plugin';
+
+export default defineConfig({
+    build: {
+        outDir: '../../public/build-admin',
+        emptyOutDir: true,
+        manifest: true,
+    },
+    plugins: [
+        laravel({
+            publicDirectory: '../../public',
+            buildDirectory: 'build-admin',
+            input: [
+                __dirname + '/resources/assets/sass/app.scss',
+                __dirname + '/resources/assets/js/app.js'
+            ],
+            refresh: true,
+        }),
+    ],
+});
+
+//export const paths = [
+//    'Modules/Admin/resources/assets/sass/app.scss',
+//    'Modules/Admin/resources/assets/js/app.js',
+//];

Modules/Employee/app/Http/Controllers/EmployeeController.php

@@ -3,18 +3,30 @@
 namespace Modules\Employee\Http\Controllers;
 
 use App\Http\Controllers\Controller;
+use Carbon\Carbon;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Storage;
+use Modules\Admin\Services\AdminService;
 use Modules\Employee\Repositories\EmployeeInterface;
+use Modules\User\Repositories\UserInterface;
+use Spatie\Permission\Models\Role;
 
 class EmployeeController extends Controller
 {
 
-    private EmployeeInterface $employeeRepository;
+    private $employeeRepository;
+    private $userRepository;
 
-    public function __construct(EmployeeInterface $employeeRepository)
+    private $adminService;
+
+    public function __construct(EmployeeInterface $employeeRepository, UserInterface $userRepository, AdminService $adminService)
     {
         $this->employeeRepository = $employeeRepository;
+        $this->userRepository = $userRepository;
+        $this->adminService = $adminService;
+
     }
     /**
      * Display a listing of the resource.
@@ -22,6 +34,8 @@ class EmployeeController extends Controller
     public function index()
     {
         $data['employees'] = $this->employeeRepository->findAll();
+        $data['roleLists'] = Role::pluck('name', 'id');
+        // dd($data['employees']->toArray());
         return view('employee::index', $data);
     }
 
@@ -31,6 +45,13 @@ class EmployeeController extends Controller
     public function create()
     {
         $data['title'] = 'Create Employee';
+        $data['departmentList'] = [];
+        $data['designationList'] = [];
+        $data['nationalityList'] = $this->adminService->pluckNationalities();
+        $data['genderList'] = $this->adminService->pluckGenders();
+        $data['casteList'] = $this->adminService->pluckCastes();
+        $data['cityList'] = $this->adminService->pluckCities();
+
         return view('employee::create', $data);
     }
 
@@ -39,22 +60,24 @@ class EmployeeController extends Controller
      */
     public function store(Request $request)
     {
-        $inputData = $request->only(['first_name', 'last_name']);
-        // try {
+        $inputData = $request->all();
+        try {
 
-        if ($request->hasFile('profile_pic')) {
-            $fileName = time() . '_' . $request->profile_pic->getClientOriginalName();
-            $filePath = $request->file('profile_pic')->storeAs('uploads', $fileName, 'public');
-            $inputData['profile_picture'] = time() . '_' . $request->profile_pic->getClientOriginalName();
-            // $fileModel->file_path = '/storage/' . $filePath;
-            // $fileModel->save();
+            if ($request->hasFile('profile_picture')) {
+                $image = $request->profile_picture;
+                $fileName = time() . '_' . $image->getClientOriginalName();
+                $filePath = Storage::disk('public')->putFileAs('uploads', $image, $fileName);
+                $inputData['profile_picture'] = 'storage/' . $filePath;
+            }
+
+            $this->employeeRepository->create($inputData);
+
+            toastr()->success('Employee Created Succesfully');
+
+        } catch (\Throwable $th) {
+            echo $th->getMessage();
+            toastr()->error($th->getMessage());
         }
-
-        $this->employeeRepository->create($inputData);
-        toastr()->success('Employee Created Succesfully');
-        // } catch (\Throwable $th) {
-        //     toastr()->error($th->getMessage());
-        // }
         return redirect()->route('employee.index');
     }
 
@@ -63,8 +86,8 @@ class EmployeeController extends Controller
      */
     public function show($id)
     {
-
-        return view('employee::show');
+        $data['employee'] = $this->employeeRepository->getEmployeeById($id);
+        return view('employee::show', $data);
     }
 
     /**
@@ -82,28 +105,84 @@ class EmployeeController extends Controller
      */
     public function update(Request $request, $id): RedirectResponse
     {
-        $inputData = $request->only(['first_name', 'last_name']);
-        // try {
+        $inputData = $request->except(['_method', '_token']);
 
-        if ($request->hasFile('profile_pic')) {
-            $fileName = time() . '_' . $request->profile_pic->getClientOriginalName();
-            $filePath = $request->file('profile_pic')->storeAs('uploads', $fileName, 'public');
-            $inputData['profile_picture'] = time() . '_' . $request->profile_pic->getClientOriginalName();
+        try {
+
+            if ($request->hasFile('profile_picture')) {
+                $image = $request->profile_picture;
+                $fileName = time() . '_' . $image->getClientOriginalName();
+                $filePath = Storage::disk('public')->putFileAs('uploads', $image, $fileName);
+                $inputData['profile_picture'] = 'storage/' . $filePath;
+            }
+
+            $this->employeeRepository->update($id, $inputData);
+
+            toastr()->success('Employee Created Succesfully');
+
+        } catch (\Throwable $th) {
+
+            toastr()->error($th->getMessage());
         }
-
-        $this->employeeRepository->update($id, $inputData);
-        toastr()->success('Employee Created Succesfully');
-        // } catch (\Throwable $th) {
-        //     toastr()->error($th->getMessage());
-        // }
         return redirect()->route('employee.index');
     }
 
     /**
      * Remove the specified resource from storage.
      */
-    public function destroy($id)
+    public function destroy(Request $request)
     {
-        //
+        try {
+
+            $employeeModel = $this->employeeRepository->getEmployeeById($request->id);
+
+            optional($employeeModel)->user?->roles()?->detach();
+
+            optional($employeeModel)->user?->delete();
+
+            optional($employeeModel)->delete();
+
+            toastr()->success('Employee Delete Succesfully');
+
+        } catch (\Throwable $th) {
+            toastr()->error($th->getMessage());
+        }
+
+        return response()->json(['status' => true, 'message' => 'Employee Delete Succesfully']);
+
     }
+
+    public function assignRole(Request $request)
+    {
+        try {
+            $employeeModel = $this->employeeRepository->getEmployeeByEmail($request->email);
+
+            $inputData = [
+                'name' => $employeeModel->first_name . ' ' . $employeeModel->last_name,
+                'email' => $request->email,
+                'password' => Hash::make('password'),
+                'email_verified_at' => Carbon::now(),
+            ];
+            $userModel = $this->userRepository->create($inputData, [$request->role_id]);
+
+            $employeeModel->users_id = $userModel->id;
+            $employeeModel->save();
+
+            toastr()->success('Role Assigned Succesfully');
+        } catch (\Throwable $th) {
+            toastr()->error($th->getMessage());
+        }
+        return redirect()->route('employee.index');
+    }
+
+    public function changePassword(Request $request)
+    {
+        dd($request->all());
+        try {
+
+        } catch (\Throwable $th) {
+            toastr()->error($th->getMessage());
+        }
+    }
+
 }

Modules/Employee/app/Models/Employee.php

@@ -2,6 +2,7 @@
 
 namespace Modules\Employee\Models;
 
+use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 
 class Employee extends Model
@@ -9,5 +10,15 @@ class Employee extends Model
     protected $table = 'tbl_employees';
     protected $primaryKey = 'id';
     protected $guarded = [];
+    protected $appends = ['full_name'];
 
+    protected function getFullNameAttribute()
+    {
+        return $this->first_name . ' ' . $this->middle_name . ' ' . $this->last_name;
+    }
+
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'users_id');
+    }
 }

Modules/Employee/app/Repositories/EmployeeInterface.php

@@ -6,7 +6,10 @@ interface EmployeeInterface
 {
     public function findAll();
     public function getEmployeeById($employeeId);
+    public function getEmployeeByEmail($email);
     public function delete($employeeId);
     public function create($EmployeeDetails);
     public function update($employeeId, array $newDetails);
+    public function pluck();
+
 }

Modules/Employee/app/Repositories/EmployeeRepository.php

@@ -2,13 +2,14 @@
 
 namespace Modules\Employee\Repositories;
 
+use Illuminate\Support\Facades\DB;
 use Modules\Employee\Models\Employee;
 
 class EmployeeRepository implements EmployeeInterface
 {
     public function findAll()
     {
-        return Employee::get();
+        return Employee::paginate(20);
     }
 
     public function getEmployeeById($employeeId)
@@ -16,6 +17,11 @@ class EmployeeRepository implements EmployeeInterface
         return Employee::findOrFail($employeeId);
     }
 
+    public function getEmployeeByEmail($email)
+    {
+        return Employee::where('email', $email)->first();
+    }
+
     public function delete($employeeId)
     {
         Employee::destroy($employeeId);
@@ -23,7 +29,6 @@ class EmployeeRepository implements EmployeeInterface
 
     public function create($employeeDetails)
     {
-        // dd($employeeDetails);
         return Employee::create($employeeDetails);
     }
 
@@ -32,6 +37,11 @@ class EmployeeRepository implements EmployeeInterface
         return Employee::whereId($employeeId)->update($newDetails);
     }
 
+    public function pluck()
+    {
+        return Employee::pluck(DB::raw('CONCAT(first_name," ", middle_name , " ",last_name) AS full_name'), 'id');
+    }
+
     // public function uploadImage($file)
     // {
     //     if ($req->file()) {

Modules/Employee/database/migrations/2024_04_07_093523_create_employees_table.php

@@ -17,36 +17,23 @@ return new class extends Migration
             $table->string('middle_name')->nullable();
             $table->string('last_name')->nullable();
             $table->string('email')->nullable();
-            $table->unsignedBigInteger('genders_id')->nullable();
             $table->date('nepali_dob')->nullable();
             $table->date('dob')->nullable();
-            $table->unsignedBigInteger('nationalities_id')->nullable();
-            $table->text('about_me')->nullable();
             $table->string('signature')->nullable();
             $table->string('father_name')->nullable();
-            $table->string('mother_name')->nullable();
-            $table->string('grand_father_name')->nullable();
-            $table->string('grand_mother_name')->nullable();
-            $table->string('spouse')->nullable();
             $table->string('contact')->nullable();
-            $table->string('alt_contact')->nullable();
             $table->string('profile_picture')->nullable();
+            $table->unsignedBigInteger('genders_id')->nullable();
+            $table->unsignedBigInteger('nationalities_id')->nullable();
             $table->unsignedBigInteger('users_id')->nullable();
-            $table->text('skills')->nullable();
-            $table->text('experience')->nullable();
+            $table->integer('is_user_assigned')->nullable()->default(10);
+            $table->unsignedBigInteger('organization_id')->nullable();
+            $table->unsignedBigInteger('department_id')->nullable();
+            $table->unsignedBigInteger('designation_id')->nullable();
             $table->text('permanent_address')->nullable();
-            $table->unsignedBigInteger('permanent_city')->nullable();
             $table->text('temporary_address')->nullable();
-            $table->unsignedBigInteger('temporary_city')->nullable();
-            $table->text('old_system_address')->nullable();
-            $table->text('education')->nullable();
-            $table->unsignedBigInteger('castes_id')->nullable();
-            $table->unsignedBigInteger('ethnicities_id')->nullable();
-            $table->unsignedBigInteger('dags_id')->nullable();
-            $table->string('status')->nullable();
+            $table->string('status')->nullable()->default(11);
             $table->string('remarks')->nullable();
-            $table->unsignedBigInteger('createdby')->nullable();
-            $table->unsignedBigInteger('updatedby')->nullable();
             $table->timestamps();
         });
     }

Modules/Employee/resources/views/create.blade.php

@@ -8,7 +8,9 @@
       <!-- end page title -->
 
       {{ html()->form('POST')->route('employee.store')->class(['needs-validation'])->attributes(['novalidate', 'enctype' => 'multipart/form-data'])->open() }}
+      
       @include('employee::partials.action')
+
       {{ html()->form()->close() }}
 
     </div>

Modules/Employee/resources/views/edit.blade.php

@@ -7,9 +7,10 @@
       @include('layouts.partials.breadcrumb', ['title' => $title])
       <!-- end page title -->
 
-      {{-- {{ html()->form('POST')->route('employee.store')->class(['needs-validation'])->attributes(['novalidate', 'enctype' => 'multipart/form-data'])->open() }} --}}
       {{ html()->modelForm($employee, 'PUT')->route('employee.update', $employee->id)->class(['needs-validation'])->attributes(['novalidate', 'enctype' => 'multipart/form-data'])->open() }}
+
       @include('employee::partials.action')
+
       {{ html()->closeModelForm() }}
 
     </div>

Modules/Employee/resources/views/index.blade.php

@@ -42,16 +42,39 @@
                 @forelse ($employees as $employee)
                   <div class="col">
                     <div class="card team-box ribbon-box mb-lg-0 material-shadow border shadow-none">
-                      <div class="team-cover"> <img src="assets/images/small/img-9.jpg" alt="" class="img-fluid">
+                      <div class="team-cover">
+                        <img src="{{ asset('assets/images/small/img-9.jpg') }}" alt="" class="img-fluid">
                       </div>
                       <div class="card-body p-4">
-                        <div class="ribbon-two ribbon-two-success"><span>Active</span></div>
+                        @if ($employee->user)
+                          <div class="ribbon-two ribbon-two-success">
+                            <span>{{ optional($employee->user)->getRoleNames()->first() }}</span>
+                          </div>
+                        @endif
                         <div class="row align-items-center team-row">
+                          <div class="col team-settings">
+                            <div class="row">
+                              <div class="col">
+                              </div>
+                              <div class="col dropdown text-end"> <a href="javascript:void(0);" data-bs-toggle="dropdown"
+                                  aria-expanded="false" class=""> <i class="ri-more-fill fs-17"></i> </a>
+                                <ul class="dropdown-menu dropdown-menu-end" style="">
+                                  <li><a class="dropdown-item remove-item-btn" href="javascript:void(0);"
+                                      data-link="{{ route('employee.destroy', $employee->id) }}"
+                                      data-id="{{ $employee->id }}"><i
+                                        class="ri-delete-bin-5-line text-muted me-2 align-bottom"></i>Delete</a></li>
+                                </ul>
+                              </div>
+                            </div>
+                          </div>
+
                           <div class="col-lg-4 col">
                             <div class="team-profile-img">
-                              <div class="avatar-lg img-thumbnail rounded-circle flex-shrink-0"><img
-                                  src="{{ asset('app/public/uploads/' . $employee->profile_picture) }}" alt=""
-                                  class="member-img img-fluid d-block rounded-circle"></div>
+                              <div class="img-thumbnail rounded-circle flex-shrink-0">
+                                <img style="height: 90px; width:90px; object-fit:cover"
+                                  src="{{ asset($employee->profile_picture) }}" alt=""
+                                  class="img-fluid rounded-circle">
+                              </div>
                               <div class="team-content"> <a class="member-name"
                                   href="{{ route('employee.show', $employee->id) }}">
                                   <h5 class="fs-16 mb-1">{{ $employee->first_name }}</h5>
@@ -82,6 +105,7 @@
                               </li>
                               <li class="list-inline-item avatar-xs">
                                 <a href="javascript:void(0);" data-bs-toggle="modal" data-bs-target="#assignRoleModal"
+                                  data-email="{{ $employee->email }}"
                                   class="avatar-title bg-primary-subtle text-primary fs-15 rounded">
                                   <i class="ri-user-add-line"></i>
                                 </a>
@@ -100,6 +124,13 @@
                   </div>
                 @endforeach
 
+                <div class="d-flex justify-content-end align-self-end">
+                  <div class="mt-2 p-2">
+                    {{ $employees->links() }}
+                  </div>
+                </div>
+
+
               </div>
             </div>
           </div>
@@ -117,29 +148,31 @@
           <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
         </div>
         <div class="modal-body">
-          <form action="{{ route('leave.store') }}" class="needs-validation" novalidate method="post">
-            <div class="row gy-2">
-              <div class="col-lg-12">
-                {{ html()->label('Username')->class('form-label') }}
-                {{ html()->text('username')->class('form-control')->placeholder('Enter Username')->required() }}
-              </div>
-
-              <div class="col-lg-12">
-                {{ html()->label('Role')->class('form-label') }}
-                {{ html()->select('role_id', [])->class('form-select')->placeholder('Select Role')->required() }}
-              </div>
+          {{ html()->form('POST')->route('employee.assignRole')->class(['needs-validation'])->attributes(['novalidate'])->open() }}
+          <div class="row gy-2">
+            <div class="col-lg-12">
+              {{ html()->label('Email')->class('form-label') }}
+              {{ html()->email('email')->class('form-control email-field')->placeholder('Enter Email')->isReadonly(true)->required() }}
             </div>
 
-            <div class="mt-4 text-end">
-              <button type="submit" class="btn btn-success w-sm">Save</button>
+            <div class="col-lg-12">
+              {{ html()->label('Role')->class('form-label') }}
+              {{ html()->select('role_id', $roleLists)->class('form-select')->placeholder('Select Role')->required() }}
             </div>
-          </form>
+          </div>
+
+          <div class="mt-4 text-end">
+            <button type="submit" class="btn btn-success w-sm">Save</button>
+          </div>
+          {{ html()->form()->close() }}
+
         </div>
       </div>
     </div>
   </div>
 
-  <div class="modal fade" id="changePasswordModal" tabindex="-1" aria-labelledby="changePasswordLabel" aria-modal="true">
+  <div class="modal fade" id="changePasswordModal" tabindex="-1" aria-labelledby="changePasswordLabel"
+    aria-modal="true">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header model-primary">
@@ -170,3 +203,16 @@
     </div>
   </div>
 @endsection
+
+@push('js')
+  <script>
+    $(document).ready(function() {
+      $('#assignRoleModal').on('shown.bs.modal', function(e) {
+        // do something...
+        var email = $(e.relatedTarget).data('email');
+        $('.email-field').val(email)
+        console.log(email);
+      })
+    })
+  </script>
+@endpush

Modules/Employee/resources/views/partials/action.blade.php

@@ -1,144 +1,121 @@
 <div class="row">
   <div class="col-lg-12">
     <div class="card">
-      <div class="card-header card-primary">
+      {{-- <div class="card-header card-primary">
         <h4 class="card-title mb-0">Personal Details</h4>
-      </div>
+      </div> --}}
 
-      <div class="card-body row gy-4">
+      <div class="card-body">
+        <div class="row gy-1">
+          <p class="text-primary">Personal Details</p>
+          <hr>
+          <div class="col-md-4">
+            {{ html()->label('First name')->class('form-label') }}
+            {{ html()->text('first_name')->class('form-control')->placeholder('Enter First Name')->required() }}
+          </div>
 
-        <div class="col-md-4">
-          {{ html()->label('First name')->class('form-label') }}
-          {{ html()->text('first_name')->class('form-control')->placeholder('Enter First Name')->required() }}
-        </div>
+          <div class="col-md-4">
+            {{ html()->label('Middle name')->class('form-label') }}
+            {{ html()->text('middle_name')->class('form-control')->placeholder('Enter Middle Name') }}
+          </div>
 
-        <div class="col-md-4">
-          {{ html()->label('Middle name')->class('form-label') }}
-          {{ html()->text('middle_name')->class('form-control')->placeholder('Enter Middle Name') }}
-        </div>
+          <div class="col-md-4">
+            {{ html()->label('Last name')->class('form-label') }}
+            {{ html()->text('last_name')->class('form-control')->placeholder('Enter Last Name')->required() }}
+            {{ html()->div('Please enter last name')->class('invalid-feedback') }}
+          </div>
 
-        <div class="col-md-4">
-          {{ html()->label('Last name')->class('form-label') }}
-          {{ html()->text('last_name')->class('form-control')->placeholder('Enter Last Name')->required() }}
-          {{ html()->div('Please enter last name')->class('invalid-feedback') }}
-        </div>
+          <div class="col-md-4">
+            {{ html()->label('Gender')->class('form-label') }}
+            {{ html()->select('genders_id', [1 => 'male', 2 => 'female'])->class('form-select')->placeholder('Select Gender') }}
+          </div>
 
-        <div class="col-md-4">
-          {{ html()->label('Gender')->class('form-label') }}
-          {{ html()->select('gender', ['male', 'female'])->class('form-select')->placeholder('Select Gender') }}
-        </div>
+          <div class="col-md-4">
+            {{ html()->label('Date of Birth')->class('form-label') }}
+            {{ html()->date('dob')->class('form-control')->placeholder('Choose Date of Birth')->required() }}
+            {{ html()->div('Please choose dob')->class('invalid-feedback') }}
 
-        <div class="col-md-4">
-          {{ html()->label('Date of Birth')->class('form-label') }}
-          {{ html()->date('dob')->class('form-control')->placeholder('Choose Date of Birth')->required() }}
-          {{ html()->div('Please choose dob')->class('invalid-feedback') }}
+          </div>
+
+          <div class="col-md-4">
+            {{ html()->label('Nationality')->class('form-label') }}
+            {{ html()->select('nationalities_id', [1 => 'Nepal', 2 => 'Other'])->class('form-control')->placeholder('Select Nationality') }}
+          </div>
+
+          <div class="col-md-4">
+            {{ html()->label('Email')->class('form-label') }}
+            {{ html()->email('email')->class('form-control')->placeholder('Enter Email')->required() }}
+            {{ html()->div('Please enter email')->class('invalid-feedback') }}
+          </div>
+
+          <div class="col-md-4">
+            {{ html()->label('Phone Number')->class('form-label') }}
+            {{ html()->text('contact')->class('form-control')->placeholder('Enter Phone Number') }}
+          </div>
+
+          <div class="col-md-4">
+            {{ html()->label('Upload Profile Picture')->class('form-label') }}
+            {{ html()->file('profile_picture')->class('form-control') }}
+
+          </div>
 
         </div>
 
-        <div class="col-md-4">
-          {{ html()->label('Nationality')->class('form-label') }}
-          {{ html()->select('nationality', ['Nepal', 'Other'])->class('form-control')->placeholder('Select Nationality') }}
+        <div class="row gy-1 mt-1">
+          <p class="text-primary">Address Details</p>
+          <hr>
+
+          {{-- <div class="col-md-4">
+            {{ html()->label('Municipality')->class('form-label') }}
+            {{ html()->select('municipality_id', [])->class('form-select')->placeholder('Select Municipality') }}
+          </div>
+
+          <div class="col-md-4">
+            {{ html()->label('Ward')->class('form-label') }}
+            {{ html()->text('ward')->class('form-control')->placeholder('Enter Ward no') }}
+          </div> --}}
+
+          <div class="col-md-4">
+            {{ html()->label('Permanent Address')->class('form-label') }}
+            {{ html()->text('permanent_address')->class('form-control')->placeholder('Enter Permanent Address') }}
+          </div>
+
+          <div class="col-md-4">
+            {{ html()->label('Temporary Address')->class('form-label') }}
+            {{ html()->text('temporary_address')->class('form-control')->placeholder('Enter Temporary Address') }}
+          </div>
         </div>
 
-        <div class="col-md-4">
-          {{ html()->label('Email')->class('form-label') }}
-          {{ html()->email('email')->class('form-control')->placeholder('Enter Email')->required() }}
-          {{ html()->div('Please enter email')->class('invalid-feedback') }}
+        <div class="row gy-1 mt-1">
+          <p class="text-primary">Organization Details</p>
+          <hr>
+          <div class="col-md-4">
+            {{ html()->label('Department')->class('form-label') }}
+            {{ html()->select('department_id', ['Nepal'])->class('form-select')->placeholder('Select Department') }}
+          </div>
+
+          <div class="col-md-4">
+            {{ html()->label('Designation')->class('form-label') }}
+            {{ html()->select('designation_id', ['Nepal'])->class('form-select')->placeholder('Select Designation') }}
+          </div>
+
+          {{-- <div class="col-md-4">
+            {{ html()->label('Join Date')->class('form-label') }}
+            {{ html()->date('join_date')->class('form-control')->placeholder('Choose Join Date') }}
+          </div> --}}
+
+
+          <div class="col-md-8">
+            {{ html()->label('Remarks')->class('form-label') }}
+            {{ html()->textarea('remarks')->class('form-control')->placeholder('Enter Remarks') }}
+          </div>
         </div>
-
-        <div class="col-md-4">
-          {{ html()->label('Phone Number')->class('form-label') }}
-          {{ html()->text('phone')->class('form-control')->placeholder('Enter Phone Number') }}
-        </div>
-
-        <div class="col-md-4">
-          {{ html()->label('Upload Profile Pic')->class('form-label') }}
-          {{ html()->file('profile_pic')->class('form-control') }}
-
-        </div>
-
       </div>
       <!-- end card body -->
     </div>
     <!-- end card -->
 
-    <div class="card">
-      <div class="card-header card-primary">
-        <h5 class="card-title mb-0">Address Detail</h5>
-      </div>
-      <div class="card-body row gy-2">
-        {{-- <div class="col-md-4">
-          {{ html()->label('Country')->class('form-label') }}
-          {{ html()->select('country_id', ['Nepal'])->class('form-select')->placeholder('Select Country') }}
-        </div> --}}
 
-        <div class="col-md-4">
-          {{ html()->label('State')->class('form-label') }}
-          {{ html()->select('state_id', ['Nepal'])->class('form-select')->placeholder('Select State') }}
-        </div>
-
-        <div class="col-md-4">
-          {{ html()->label('District name')->class('form-label') }}
-          {{ html()->select('district_id', [])->class('form-select')->placeholder('Select District') }}
-        </div>
-
-        <div class="col-md-4">
-          {{ html()->label('City')->class('form-label') }}
-          {{ html()->text('last_name')->class('form-control')->placeholder('Enter City Name') }}
-        </div>
-
-        <div class="col-md-4">
-          {{ html()->label('municipality')->class('form-label') }}
-          {{ html()->select('municipality_id', [])->class('form-select')->placeholder('Select Municipality') }}
-        </div>
-
-        <div class="col-md-4">
-          {{ html()->label('Ward')->class('form-label') }}
-          {{ html()->text('ward')->class('form-control')->placeholder('Enter Ward no') }}
-        </div>
-
-        <div class="col-md-4">
-          {{ html()->label('Permanent Address')->class('form-label') }}
-          {{ html()->text('perm_address')->class('form-control')->placeholder('Enter Permanent Address') }}
-        </div>
-
-        <div class="col-md-4">
-          {{ html()->label('Temporary Address')->class('form-label') }}
-          {{ html()->text('temp_address')->class('form-control')->placeholder('Enter Temporary Address') }}
-        </div>
-
-      </div>
-    </div>
-
-    <div class="card">
-      <div class="card-header card-primary">
-        <h5 class="card-title mb-0">Organization Detail</h5>
-      </div>
-      <div class="card-body row gy-2">
-        <div class="col-md-4">
-          {{ html()->label('Department')->class('form-label') }}
-          {{ html()->select('department_id', ['Nepal'])->class('form-select')->placeholder('Select Department') }}
-        </div>
-
-        <div class="col-md-4">
-          {{ html()->label('Designation')->class('form-label') }}
-          {{ html()->select('designation_id', ['Nepal'])->class('form-select')->placeholder('Select Designation') }}
-        </div>
-
-        <div class="col-md-4">
-          {{ html()->label('Join Date')->class('form-label') }}
-          {{ html()->date('join_date')->class('form-control')->placeholder('Choose Join Date') }}
-        </div>
-
-
-        <div class="col-md-8">
-          {{ html()->label('Remarks')->class('form-label') }}
-          {{ html()->textarea('remark')->class('form-control')->placeholder('Enter Remarks') }}
-        </div>
-
-      </div>
-    </div>
-    <!-- end card -->
     <div class="mb-4 text-end">
       <button type="submit" class="btn btn-success w-sm">Save</button>
     </div>

Modules/Employee/resources/views/partials/action.blade.php.bak

@@ -0,0 +1,128 @@
+<div class="row">
+  <div class="col-lg-12">
+    <div class="card">
+      <div class="card-header card-primary">
+        <h4 class="card-title mb-0">Personal Details</h4>
+      </div>
+
+      <div class="card-body row gy-4">
+
+        <div class="col-md-4">
+          {{ html()->label('First name')->class('form-label') }}
+          {{ html()->text('first_name')->class('form-control')->placeholder('Enter First Name')->required() }}
+        </div>
+
+        <div class="col-md-4">
+          {{ html()->label('Middle name')->class('form-label') }}
+          {{ html()->text('middle_name')->class('form-control')->placeholder('Enter Middle Name') }}
+        </div>
+
+        <div class="col-md-4">
+          {{ html()->label('Last name')->class('form-label') }}
+          {{ html()->text('last_name')->class('form-control')->placeholder('Enter Last Name')->required() }}
+          {{ html()->div('Please enter last name')->class('invalid-feedback') }}
+        </div>
+
+        <div class="col-md-4">
+          {{ html()->label('Gender')->class('form-label') }}
+          {{ html()->select('gender', ['male', 'female'])->class('form-select')->placeholder('Select Gender') }}
+        </div>
+
+        <div class="col-md-4">
+          {{ html()->label('Date of Birth')->class('form-label') }}
+          {{ html()->date('dob')->class('form-control')->placeholder('Choose Date of Birth')->required() }}
+          {{ html()->div('Please choose dob')->class('invalid-feedback') }}
+
+        </div>
+
+        <div class="col-md-4">
+          {{ html()->label('Nationality')->class('form-label') }}
+          {{ html()->select('nationality', ['Nepal', 'Other'])->class('form-control')->placeholder('Select Nationality') }}
+        </div>
+
+        <div class="col-md-4">
+          {{ html()->label('Email')->class('form-label') }}
+          {{ html()->email('email')->class('form-control')->placeholder('Enter Email')->required() }}
+          {{ html()->div('Please enter email')->class('invalid-feedback') }}
+        </div>
+
+        <div class="col-md-4">
+          {{ html()->label('Phone Number')->class('form-label') }}
+          {{ html()->text('phone')->class('form-control')->placeholder('Enter Phone Number') }}
+        </div>
+
+        <div class="col-md-4">
+          {{ html()->label('Upload Profile Pic')->class('form-label') }}
+          {{ html()->file('profile_pic')->class('form-control') }}
+
+        </div>
+
+      </div>
+      <!-- end card body -->
+    </div>
+    <!-- end card -->
+
+    <div class="card">
+      <div class="card-header card-primary">
+        <h5 class="card-title mb-0">Address Detail</h5>
+      </div>
+      <div class="card-body row gy-2">
+
+        <div class="col-md-4">
+          {{ html()->label('Municipality')->class('form-label') }}
+          {{ html()->select('municipality_id', [])->class('form-select')->placeholder('Select Municipality') }}
+        </div>
+
+        <div class="col-md-4">
+          {{ html()->label('Ward')->class('form-label') }}
+          {{ html()->text('ward')->class('form-control')->placeholder('Enter Ward no') }}
+        </div>
+
+        <div class="col-md-4">
+          {{ html()->label('Permanent Address')->class('form-label') }}
+          {{ html()->text('perm_address')->class('form-control')->placeholder('Enter Permanent Address') }}
+        </div>
+
+        <div class="col-md-4">
+          {{ html()->label('Temporary Address')->class('form-label') }}
+          {{ html()->text('temp_address')->class('form-control')->placeholder('Enter Temporary Address') }}
+        </div>
+
+      </div>
+    </div>
+
+    <div class="card">
+      <div class="card-header card-primary">
+        <h5 class="card-title mb-0">Organization Detail</h5>
+      </div>
+      <div class="card-body row gy-2">
+        <div class="col-md-4">
+          {{ html()->label('Department')->class('form-label') }}
+          {{ html()->select('department_id', ['Nepal'])->class('form-select')->placeholder('Select Department') }}
+        </div>
+
+        <div class="col-md-4">
+          {{ html()->label('Designation')->class('form-label') }}
+          {{ html()->select('designation_id', ['Nepal'])->class('form-select')->placeholder('Select Designation') }}
+        </div>
+
+        <div class="col-md-4">
+          {{ html()->label('Join Date')->class('form-label') }}
+          {{ html()->date('join_date')->class('form-control')->placeholder('Choose Join Date') }}
+        </div>
+
+
+        <div class="col-md-8">
+          {{ html()->label('Remarks')->class('form-label') }}
+          {{ html()->textarea('remark')->class('form-control')->placeholder('Enter Remarks') }}
+        </div>
+
+      </div>
+    </div>
+    <!-- end card -->
+    <div class="mb-4 text-end">
+      <button type="submit" class="btn btn-success w-sm">Save</button>
+    </div>
+  </div>
+
+</div>

Modules/Employee/routes/web.php

@@ -12,8 +12,18 @@ use Modules\Employee\Http\Controllers\EmployeeController;
 | routes are loaded by the RouteServiceProvider within a group which
 | contains the "web" middleware group. Now create something great!
 |
-*/
+ */
 
-Route::group([], function () {
-    Route::resource('employee', EmployeeController::class)->names('employee');
-});
+Route::middleware('auth')->group(
+    function () {
+
+        Route::prefix('employee')->as('employee.')->group(function () {
+
+            Route::post('assignRole', [EmployeeController::class, 'assignRole'])->name('assignRole');
+            Route::post('changePassword', [EmployeeController::class, 'changePassword'])->name('assignRole');
+        });
+
+        Route::resource('employee', EmployeeController::class)->names('employee');
+
+    }
+);

Modules/Leave/app/Http/Controllers/LeaveController.php

@@ -5,16 +5,19 @@ namespace Modules\Leave\Http\Controllers;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Modules\Employee\Repositories\EmployeeInterface;
 use Modules\Leave\Repositories\LeaveInterface;
 use Yoeunes\Toastr\Facades\Toastr;
 
 class LeaveController extends Controller
 {
-    private LeaveInterface $leaveRepository;
+    private $leaveRepository;
+    private $employeeRepository;
 
-    public function __construct(LeaveInterface $leaveRepository)
+    public function __construct(LeaveInterface $leaveRepository, EmployeeInterface $employeeRepository)
     {
         $this->leaveRepository = $leaveRepository;
+        $this->employeeRepository = $employeeRepository;
 
         $this->middleware('role_or_permission:access leaves|create leaves|edit leaves|delete leaves', ['only' => ['index', 'show']]);
         $this->middleware('role_or_permission:create leaves', ['only' => ['create', 'store']]);
@@ -29,7 +32,8 @@ class LeaveController extends Controller
     public function index()
     {
         $data['leaves'] = $this->leaveRepository->findAll();
-        return view('leave::index',$data);
+        $data['employeeList'] = $this->employeeRepository->pluck();
+        return view('leave::leave.index', $data);
     }
 
     /**
@@ -38,7 +42,8 @@ class LeaveController extends Controller
     public function create()
     {
         $data['title'] = 'Create Leave';
-        return view('leave::create', $data);
+        $data['employeeList'] = $this->employeeRepository->pluck();
+        return view('leave::leave.create', $data);
     }
 
     /**
@@ -49,7 +54,7 @@ class LeaveController extends Controller
         $inputData = $request->all();
         try {
             $this->leaveRepository->create($inputData);
-            Toastr()->success('Leave Created Succesfully');
+            toastr()->success('Leave Created Succesfully');
         } catch (\Throwable $th) {
             toastr()->error($th->getMessage());
         }
@@ -61,7 +66,7 @@ class LeaveController extends Controller
      */
     public function show($id)
     {
-        return view('leave::show');
+        return view('leave::leave.show');
     }
 
     /**
@@ -70,8 +75,10 @@ class LeaveController extends Controller
     public function edit($id)
     {
         $data['title'] = 'Edit Leave';
+
         $data['leave'] = $this->leaveRepository->getLeaveById($id);
-        return view('leave::edit',$data);
+
+        return view('leave::leave.edit', $data);
     }
 
     /**
@@ -81,8 +88,10 @@ class LeaveController extends Controller
     {
         $inputData = $request->all();
         try {
-            $this->leaveRepository->update($id,$inputData);
+
+            $this->leaveRepository->update($id, $inputData);
             toastr()->success('Leave Updated Succesfully');
+
         } catch (\Throwable $th) {
             toastr()->error($th->getMessage());
         }
@@ -95,6 +104,7 @@ class LeaveController extends Controller
     public function destroy($id)
     {
         $this->leaveRepository->delete($id);
+
         toastr()->success('Leave Deleted Succesfully');
     }
 }

Modules/Leave/app/Http/Controllers/LeaveTypeController.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace Modules\Leave\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Modules\Leave\Repositories\LeaveInterface;
+use Modules\Leave\Repositories\LeaveTypeInterface;
+
+class LeaveTypeController extends Controller
+{
+
+    private $leaveRepository;
+    private $leaveTypeRepository;
+
+    public function __construct(LeaveInterface $leaveRepository, LeaveTypeInterface $leaveTypeRepository)
+    {
+        $this->leaveRepository = $leaveRepository;
+        $this->leaveTypeRepository = $leaveTypeRepository;
+    }
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        $data['leaveTypes'] = $this->leaveTypeRepository->findAll();
+        return view('leave::leave-type.index', $data);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        $data['title'] = 'Create Leave Type';
+        return view('leave::leave-type.create', $data);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request): RedirectResponse
+    {
+        //
+    }
+
+    /**
+     * Show the specified resource.
+     */
+    public function show($id)
+    {
+        return view('leave::leave-type.show');
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit($id)
+    {
+        return view('leave::leave-type.edit');
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, $id): RedirectResponse
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}

Modules/Leave/app/Http/Requests/LeaveTypeRequest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Modules\Leave\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class LeaveTypeRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     */
+    public function rules(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+}

Modules/Leave/app/Models/Leave.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class Leave extends Model
 {
-    protected $table = 'leaves';
+    protected $table = 'tbl_leaves';
     protected $primaryKey = 'leave_id';
     protected $guarded = [];
 

Modules/Leave/app/Models/LeaveType.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Modules\Leave\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Modules\Leave\Database\factories\LeaveTypeFactory;
+
+class LeaveType extends Model
+{
+    use HasFactory;
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $fillable = [];
+    
+    protected static function newFactory(): LeaveTypeFactory
+    {
+        //return LeaveTypeFactory::new();
+    }
+}

Modules/Leave/app/Providers/LeaveServiceProvider.php

@@ -6,7 +6,8 @@ use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
 use Modules\Leave\Repositories\LeaveInterface;
 use Modules\Leave\Repositories\LeaveRepository;
-
+use Modules\Leave\Repositories\LeaveTypeInterface;
+use Modules\Leave\Repositories\LeaveTypeRepository;
 
 class LeaveServiceProvider extends ServiceProvider
 {
@@ -33,6 +34,8 @@ class LeaveServiceProvider extends ServiceProvider
     public function register(): void
     {
         $this->app->bind(LeaveInterface::class, LeaveRepository::class);
+        $this->app->bind(LeaveTypeInterface::class, LeaveTypeRepository::class);
+
         $this->app->register(RouteServiceProvider::class);
     }
 
@@ -60,7 +63,7 @@ class LeaveServiceProvider extends ServiceProvider
      */
     public function registerTranslations(): void
     {
-        $langPath = resource_path('lang/modules/'.$this->moduleNameLower);
+        $langPath = resource_path('lang/modules/' . $this->moduleNameLower);
 
         if (is_dir($langPath)) {
             $this->loadTranslationsFrom($langPath, $this->moduleNameLower);
@@ -76,7 +79,7 @@ class LeaveServiceProvider extends ServiceProvider
      */
     protected function registerConfig(): void
     {
-        $this->publishes([module_path($this->moduleName, 'config/config.php') => config_path($this->moduleNameLower.'.php')], 'config');
+        $this->publishes([module_path($this->moduleName, 'config/config.php') => config_path($this->moduleNameLower . '.php')], 'config');
         $this->mergeConfigFrom(module_path($this->moduleName, 'config/config.php'), $this->moduleNameLower);
     }
 
@@ -85,14 +88,14 @@ class LeaveServiceProvider extends ServiceProvider
      */
     public function registerViews(): void
     {
-        $viewPath = resource_path('views/modules/'.$this->moduleNameLower);
+        $viewPath = resource_path('views/modules/' . $this->moduleNameLower);
         $sourcePath = module_path($this->moduleName, 'resources/views');
 
-        $this->publishes([$sourcePath => $viewPath], ['views', $this->moduleNameLower.'-module-views']);
+        $this->publishes([$sourcePath => $viewPath], ['views', $this->moduleNameLower . '-module-views']);
 
         $this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->moduleNameLower);
 
-        $componentNamespace = str_replace('/', '\\', config('modules.namespace').'\\'.$this->moduleName.'\\'.ltrim(config('modules.paths.generator.component-class.path'), config('modules.paths.app_folder','')));
+        $componentNamespace = str_replace('/', '\\', config('modules.namespace') . '\\' . $this->moduleName . '\\' . ltrim(config('modules.paths.generator.component-class.path'), config('modules.paths.app_folder', '')));
         Blade::componentNamespace($componentNamespace, $this->moduleNameLower);
     }
 
@@ -108,8 +111,8 @@ class LeaveServiceProvider extends ServiceProvider
     {
         $paths = [];
         foreach (config('view.paths') as $path) {
-            if (is_dir($path.'/modules/'.$this->moduleNameLower)) {
-                $paths[] = $path.'/modules/'.$this->moduleNameLower;
+            if (is_dir($path . '/modules/' . $this->moduleNameLower)) {
+                $paths[] = $path . '/modules/' . $this->moduleNameLower;
             }
         }
 

Modules/Leave/app/Repositories/LeaveTypeInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Modules\Leave\Repositories;
+
+interface LeaveTypeInterface
+{
+    public function findAll();
+    public function getLeaveById($leaveId);
+    public function delete($leaveId);
+    public function create(array $LeaveDetails);
+    public function update($leaveId, array $newDetails);
+}

Modules/Leave/app/Repositories/LeaveTypeRepository.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Modules\Leave\Repositories;
+
+use Modules\Leave\Models\LeaveType;
+
+class LeaveTypeRepository implements LeaveTypeInterface
+{
+    public function findAll()
+    {
+        return LeaveType::get();
+    }
+
+    public function getLeaveById($leaveId)
+    {
+        return LeaveType::findOrFail($leaveId);
+    }
+
+    public function delete($leaveId)
+    {
+        LeaveType::destroy($leaveId);
+    }
+
+    public function create(array $leaveDetails)
+    {
+        return LeaveType::create($leaveDetails);
+    }
+
+    public function update($leaveId, array $newDetails)
+    {
+        return LeaveType::where('leave_id', $leaveId)->update($newDetails);
+    }
+
+}

Modules/Leave/database/migrations/2024_04_04_102430_create_leaves_table.php

@@ -11,11 +11,12 @@ return new class extends Migration
      */
     public function up(): void
     {
-        Schema::create('leaves', function (Blueprint $table) {
+        Schema::create('tbl_leaves', function (Blueprint $table) {
             $table->tinyInteger('leave_id')->unsigned()->autoIncrement();
-            $table->integer('employee_id');
-            $table->date('start_date');
-            $table->date('end_date');
+            $table->unsignedBigInteger('employee_id');
+            $table->unsignedBigInteger('leave_type_id');
+            $table->date('start_date')->nullable();
+            $table->date('end_date')->nullable();
             $table->timestamps();
         });
     }
@@ -25,6 +26,6 @@ return new class extends Migration
      */
     public function down(): void
     {
-        Schema::dropIfExists('leaves');
+        Schema::dropIfExists('tbl_leaves');
     }
 };

Modules/Leave/database/migrations/2024_04_11_110941_create_leave_types_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('tbl_leave_types', function (Blueprint $table) {
+            $table->tinyInteger('leave_type_id')->unsigned()->autoIncrement();
+            $table->string('title');
+            $table->integer('status')->default(11);
+            $table->integer('createdBy')->nullable();
+            $table->integer('updatedBy')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('tbl_leave_types');
+    }
+};

Modules/Leave/resources/views/leave-type/create.blade.php

@@ -0,0 +1,30 @@
+@extends('layouts.app')
+
+@section('content')
+  <div class="page-content">
+    <div class="container-fluid">
+      <!-- start page title -->
+      @include('layouts.partials.breadcrumb', ['title' => $title])
+      <!-- end page title -->
+      <div class="row">
+        <div class="col-lg-8">
+          <div class="card">
+            <div class="card-body">
+              <form action="{{ route('leaveType.store') }}" class="needs-validation" novalidate method="post">
+                @csrf
+                @include('leave::leave.partials.action')
+              </form>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!--end row-->
+
+    </div>
+    <!-- container-fluid -->
+  </div>
+@endsection
+
+@push('js')
+  <script src="{{ asset('assets/js/pages/form-validation.init.js') }}"></script>
+@endpush

Modules/Leave/resources/views/leave-type/edit.blade.php

@@ -24,13 +24,13 @@
         <div class="col-lg-8">
           <div class="card">
             <div class="card-body">
-              <form action="{{ route('leave.update', $leave->leave_id) }}" class="needs-validation" novalidate
-                method="post">
-                @csrf
-                @method('put')
-                <input type="hidden" name="leave_id" value="{{ $leave->leave_id }}">
-                @include('leave::partials.action')
-              </form>
+
+              {{ html()->modelForm($leave, 'PUT')->route('leave.update', $leave->id)->class(['needs-validation'])->attributes(['novalidate'])->open() }}
+
+              @include('leave::leave.partials.action')
+
+              {{ html()->closeModelForm() }}
+
             </div>
           </div>
         </div>

Modules/Leave/resources/views/leave-type/index.blade.php

@@ -0,0 +1,68 @@
+@extends('layouts.app')
+
+@section('content')
+  <div class="page-content">
+    <div class="container-fluid">
+
+
+      <div class="row">
+        <div class="col-lg-12">
+          <div class="card">
+            <div class="card-header align-items-center d-flex">
+              <h5 class="card-title flex-grow-1 mb-0">Leave Lists</h5>
+              <div class="flex-shrink-0">
+                <a href="{{ route('leaveType.create') }}" class="btn btn-success waves-effect waves-light"><i
+                    class="ri-add-fill me-1 align-bottom"></i> Add</a>
+              </div>
+            </div>
+
+            <div class="card-body">
+              <div class="table-responsive">
+                <table id="buttons-datatables" class="display table-sm table-bordered table" style="width:100%">
+                  <thead>
+                    <tr>
+                      <th>S.N</th>
+                      <th>Leave Type</th>
+                      <th>Created By</th>
+                      <th>Status</th>
+                      <th>Action</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    @forelse ($leaveTypes as $key => $leaveType)
+                      <tr>
+                        <td>{{ $key + 1 }}</td>
+                        <td>{{ $leaveType->employee_id }}</td>
+                        <td>{{ $leaveType->start_date }}</td>
+                        <td>{{ $leaveType->end_date }}</td>
+                        <td>{{ $leaveType->created_at }}</td>
+                        <td>
+                          <div class="hstack flex-wrap gap-3">
+                            <a href="javascript:void(0);" class="link-info fs-15 view-item-btn" data-bs-toggle="modal"
+                              data-bs-target="#viewModal">
+                              <i class="ri-eye-line"></i>
+                            </a>
+                            <a href="{{ route('leaveType.edit', $leaveType->leaveType_id) }}"
+                              class="link-success fs-15 edit-item-btn"><i class="ri-edit-2-line"></i></a>
+
+                            <a href="javascript:void(0);"
+                              data-link="{{ route('leaveType.destroy', $leaveType->leaveType_id) }}"
+                              data-id="{{ $leaveType->leave_id }}" class="link-danger fs-15 remove-item-btn"><i
+                                class="ri-delete-bin-line"></i></a>
+
+                          </div>
+                        </td>
+                      </tr>
+                    @empty
+                    @endforelse
+                  </tbody>
+                </table>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!--end row-->
+    </div>
+  </div>
+@endsection

Modules/Leave/resources/views/leave-type/partials/action.blade.php

@@ -1,15 +1,8 @@
 <div class="mb-3">
+
   <label for="employee_id" class="form-label">Employee Name</label>
-  <input type="text" class="form-control" id="employee_id" placeholder="Enter employee name" name="employee_id"
-    value="{{ old('end_date', $leave->employee_id ?? '') }}" required>
-  <div class="invalid-feedback">
-    Please enter employee name.
-  </div>
+  {{ html()->select('employee_id', $employeeList)->class('form-select')->placeholder('Select Employee') }}
 </div>
-{{-- <div class="mb-3">
-  <label for="employeeUrl" class="form-label">Employee Department URL</label>
-  <input type="url" class="form-control" id="employeeUrl" placeholder="Enter emploree url" name="employeeUrl">
-</div> --}}
 
 <div class="mb-3">
   <label for="start_date" class="form-label">Start Leave Date</label>
@@ -23,12 +16,6 @@
     value="{{ old('end_date', $leave->end_date ?? '') }}">
 </div>
 
-{{--
-<div class="mb-3">
-  <label for="VertimeassageInput" class="form-label">Message</label>
-  <textarea class="form-control" id="VertimeassageInput" rows="3" placeholder="Enter your message" name="remark"></textarea>
-</div> --}}
-
 <div class="text-end">
   <button type="submit" class="btn btn-primary">{{ isset($leave) ? 'Update' : 'Add Leave' }}</button>
 </div>

Modules/Leave/resources/views/leave-type/partials/view.blade.php

@@ -8,7 +8,7 @@
       <div class="modal-body">
         <form action="{{ route('leave.store') }}" class="needs-validation" novalidate method="post">
           @csrf
-          @include('leave::partials.action')
+          @include('leave::leave.partials.action')
         </form>
       </div>
     </div>

Modules/Leave/resources/views/leave/create.blade.php

@@ -12,7 +12,7 @@
             <div class="card-body">
               <form action="{{ route('leave.store') }}" class="needs-validation" novalidate method="post">
                 @csrf
-                @include('leave::partials.action')
+                @include('leave::leave.partials.action')
               </form>
             </div>
           </div>

Modules/Leave/resources/views/leave/edit.blade.php

@@ -0,0 +1,47 @@
+@extends('layouts.app')
+
+@section('content')
+  <div class="page-content">
+    <div class="container-fluid">
+      <!-- start page title -->
+      <div class="row">
+        <div class="col-12">
+          <div class="page-title-box d-sm-flex align-items-center justify-content-between">
+            <h4 class="mb-sm-0">{{ $title }}</h4>
+
+            <div class="page-title-right">
+              <ol class="breadcrumb m-0">
+                <li class="breadcrumb-item"><a href="javascript: void(0);">Dashboards</a></li>
+                <li class="breadcrumb-item active">{{ $title }}</li>
+              </ol>
+            </div>
+
+          </div>
+        </div>
+      </div>
+      <!-- end page title -->
+      <div class="row">
+        <div class="col-lg-8">
+          <div class="card">
+            <div class="card-body">
+
+              {{ html()->modelForm($leave, 'PUT')->route('leave.update', $leave->id)->class(['needs-validation'])->attributes(['novalidate'])->open() }}
+
+              @include('leave::leave.partials.action')
+
+              {{ html()->closeModelForm() }}
+
+            </div>
+          </div>
+        </div>
+      </div>
+      <!--end row-->
+
+    </div>
+    <!-- container-fluid -->
+  </div>
+@endsection
+
+@push('js')
+  <script src="{{ asset('assets/js/pages/form-validation.init.js') }}"></script>
+@endpush

Modules/Leave/resources/views/leave/index.blade.php

@@ -49,7 +49,7 @@
             <div class="card-header align-items-center d-flex">
               <h5 class="card-title flex-grow-1 mb-0">Leave Lists</h5>
               <div class="flex-shrink-0">
-                <a href="{{ route('leave.create') }}" class="btn btn-success waves-effect waves-light btn-sm"><i
+                <a href="{{ route('leave.create') }}" class="btn btn-success waves-effect waves-light"><i
                     class="ri-add-fill me-1 align-bottom"></i> Add</a>
               </div>
             </div>
@@ -104,5 +104,5 @@
     </div>
   </div>
   <!-- container-fluid -->
-  @include('leave::partials.view')
+  @include('leave::leave.partials.view')
 @endsection