Merge branch 'feature/ManagerCartable' into 'develop'

Feature/manager cartable See merge request witelgroup/rms_v2!150
2025-08-05 12:00:31 +00:00
parent 86ddf431de eac948829c
commit b4cb38fbf2
2 changed files with 6 additions and 4 deletions
--- a/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php
+++ b/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php
@@ -25,10 +25,9 @@ class GeneralManagerController extends Controller
    use ApiResponse;
    public function index(Request $request): JsonResponse
    {
-        $user = auth()->user();
        $query = Harim::query()
-            ->where('state_id', '=', HarimStates::BARESI_TAVASOT_MODIR_KOL->value)
-            ->where('edareh_shahri_id', '=', $user->edarate_shahri_id);
+            ->whereIn('state_id', [HarimStates::BARESI_TAVASOT_MODIR_KOL->value, HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MODIR_KOL->value])
+            ->where('edareh_shahri_id', '=', auth()->user()->edarate_shahri_id);

        $data = DataTableFacade::run(
            $query,