diff --git a/app/Filters/UserFilters.php b/app/Filters/UserFilters.php index b0079e339189..20d2a7ce777f 100644 --- a/app/Filters/UserFilters.php +++ b/app/Filters/UserFilters.php @@ -89,6 +89,15 @@ class UserFilters extends QueryFilters ->where('account_id', auth()->user()->account_id); } + public function sending_users(string $value = ''): Builder + { + if (strlen($value) == 0 || $value != 'true') { + return $this->builder; + } + + return $this->builder->whereNotNull('oauth_user_refresh_token'); + } + /** * Exclude a list of user_ids, can pass multiple * user IDs by separating them with a comma. diff --git a/app/Http/Requests/Report/GenericReportRequest.php b/app/Http/Requests/Report/GenericReportRequest.php index 3e95479d23b5..d18bb516c233 100644 --- a/app/Http/Requests/Report/GenericReportRequest.php +++ b/app/Http/Requests/Report/GenericReportRequest.php @@ -33,7 +33,7 @@ class GenericReportRequest extends Request 'start_date' => 'bail|required_if:date_range,custom|nullable|date', 'report_keys' => 'present|array', 'send_email' => 'required|bool', - 'status' => 'sometimes|string|nullable|in:all,draft,sent,viewed,paid,unpaid,overdue', + // 'status' => 'sometimes|string|nullable|in:all,draft,sent,viewed,paid,unpaid,overdue', ]; }