diff --git a/app/Http/Controllers/PrintStatementController.php b/app/Http/Controllers/PrintStatementController.php index 1049af9..858438c 100644 --- a/app/Http/Controllers/PrintStatementController.php +++ b/app/Http/Controllers/PrintStatementController.php @@ -30,7 +30,10 @@ ->orderBy('name') ->get(); - return view('webstatement::statements.index', compact('branches')); + $branch = Branch::find(Auth::user()->branch_id); + $multiBranch = session('MULTI_BRANCH') ?? false; + + return view('webstatement::statements.index', compact('branches', 'branch', 'multiBranch')); } /** @@ -341,7 +344,10 @@ $query = PrintStatementLog::query(); if (!auth()->user()->hasRole('administrator')) { - $query->where('user_id', Auth::id()); + $query->where(function($q) { + $q->where('user_id', Auth::id()) + ->orWhere('branch_code', Auth::user()->branch->code); + }); } // Apply search filter if provided diff --git a/app/Http/Requests/PrintStatementRequest.php b/app/Http/Requests/PrintStatementRequest.php index c6d4698..c39803f 100644 --- a/app/Http/Requests/PrintStatementRequest.php +++ b/app/Http/Requests/PrintStatementRequest.php @@ -35,6 +35,7 @@ class PrintStatementRequest extends FormRequest function ($attribute, $value, $fail) { $query = Statement::where('account_number', $this->input('account_number')) ->where('authorization_status', '!=', 'rejected') + ->where('is_available', true) ->where('period_from', $value); // If this is an update request, exclude the current record diff --git a/resources/views/statements/index.blade.php b/resources/views/statements/index.blade.php index 0546ca2..88cc931 100644 --- a/resources/views/statements/index.blade.php +++ b/resources/views/statements/index.blade.php @@ -11,26 +11,59 @@
| - - | -- ID - - | -- Branch - - | -- Account Number - - | -- Period - - | -- Available - - | -- Notes - - | -- Created At - - | -Action | -
|---|---|---|---|---|---|---|---|---|
| + + | ++ ID + + | ++ Branch + + | ++ Account Number + + | ++ Period + + | ++ Available + + | ++ Notes + + | ++ Created At + + | +Action | +