diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 89ccb171618a..ca694e6103ab 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -24,7 +24,6 @@ class SearchController extends Controller /** @var \App\Models\User $user */ $user = auth()->user(); - // $search = collect([Client::class, Invoice::class])->each(function ) return response()->json([ 'clients' => $this->clientMap($user), 'client_contacts' => $this->clientContactMap($user), @@ -45,9 +44,9 @@ class SearchController extends Controller ->map(function ($client){ return [ 'name' => $client->present()->name(), - 'type' => 'client', + 'type' => '/client', 'id' => $client->hashed_id, - 'path' => "clients/{$client->hashed_id}/edit" + 'path' => "/clients/{$client->hashed_id}/edit" ]; }); } @@ -64,9 +63,9 @@ class SearchController extends Controller ->map(function ($contact){ return [ 'name' => $contact->present()->search_display(), - 'type' => 'client_contact', + 'type' => '/client_contact', 'id' => $contact->client->hashed_id, - 'path' => "clients/{$contact->client->hashed_id}" + 'path' => "/clients/{$contact->client->hashed_id}" ]; }); } @@ -83,9 +82,9 @@ class SearchController extends Controller ->map(function ($invoice){ return [ 'name' => $invoice->client->present()->name() . ' - ' . $invoice->number, - 'type' => 'invoice', + 'type' => '/invoice', 'id' => $invoice->hashed_id, - 'path' => "clients/{$invoice->hashed_id}/edit" + 'path' => "/clients/{$invoice->hashed_id}/edit" ]; }); } @@ -93,74 +92,74 @@ class SearchController extends Controller private function settingsMap() { $paths = [ - 'user_details' => 'settings/user_details', - 'password' => 'settings/user_details/password', - 'connect' => 'settings/user_details/connect', - 'accent_color' => 'settings/user_details/accent_color', - 'notifications' => 'settings/user_details/notifications', - 'enable_two_factor' => 'settings/user_details/enable_two_factor', - 'custom_fields' => 'settings/user_details/custom_fields', - 'preferences' => 'settings/user_details/preferences', - 'company_details' => 'settings/company_details', - 'company_details,details' => 'settings/company_details/details', - 'company_details,address' => 'settings/company_details/address', - 'company_details,logo' => 'settings/company_details/logo', - 'company_details,defaults' => 'settings/company_details/defaults', - 'company_details,documents' => 'settings/company_details/documents', - 'company_details,custom_fields' => 'settings/company_details/custom_fields', - 'localization' => 'settings/localization', - 'localization,custom_labels' => 'settings/localization/custom_labels', - 'online_payments' => 'settings/online_payments', - 'tax_settings' => 'settings/tax_settings', - 'product_settings' => 'settings/product_settings', - 'task_settings' => 'settings/task_settings', - 'expense_settings' => 'settings/expense_settings', - 'workflow_settings' => 'settings/workflow_settings', - 'import_export' => 'settings/import_export', - 'account_management' => 'settings/account_management', - 'account_management,overview' => 'settings/account_management/overview', - 'account_management,enabled_modules' => 'settings/account_management/enabled_modules', - 'account_management,integrations' => 'settings/account_management/integrations', - 'account_management,security_settings' => 'settings/account_management/security_settings', - 'account_management,danger_zone' => 'settings/account_management/danger_zone', - 'backup_restore' => 'settings/backup_restore', - 'backup_restore,restore' => 'settings/backup_restore/restore', - 'backup_restore,backup' => 'settings/backup_restore/backup', - 'custom_fields' => 'settings/custom_fields', - 'custom_fields,company' => 'settings/custom_fields/company', - 'custom_fields,clients' => 'settings/custom_fields/clients', - 'custom_fields,products' => 'settings/custom_fields/products', - 'custom_fields,invoices' => 'settings/custom_fields/invoices', - 'custom_fields,payments' => 'settings/custom_fields/payments', - 'custom_fields,projects' => 'settings/custom_fields/projects', - 'custom_fields,tasks' => 'settings/custom_fields/tasks', - 'custom_fields,vendors' => 'settings/custom_fields/vendors', - 'custom_fields,expenses' => 'settings/custom_fields/expenses', - 'custom_fields,users' => 'settings/custom_fields/users', - 'custom_fields,quotes' => 'settings/custom_fields/quotes', - 'custom_fields,credits' => 'settings/custom_fields/credits', - 'generated_numbers' => 'settings/generated_numbers', - 'client_portal' => 'settings/client_portal', - 'email_settings' => 'settings/email_settings', - 'templates_and_reminders' => 'settings/templates_and_reminders', - 'bank_accounts' => 'settings/bank_accounts', - 'group_settings' => 'settings/group_settings', - 'subscriptions' => 'settings/subscriptions', - 'schedules' => 'settings/schedules', - 'users' => 'settings/users', - 'system_logs' => 'settings/system_logs', - 'payment_terms' => 'settings/payment_terms', - 'tax_rates' => 'settings/tax_rates', - 'task_statuses' => 'settings/task_statuses', - 'expense_categories' => 'settings/expense_categories', - 'integrations' => 'settings/integrations', - 'integrations,api_tokens' => 'settings/integrations/api_tokens', - 'integrations,api_webhooks' => 'settings/integrations/api_webhooks', - 'integrations,analytics' => 'settings/integrations/analytics', - 'gateways' => 'settings/gateways', - 'gateways,create' => 'settings/gateways/create', - 'bank_accounts,transaction_rules' => 'settings/bank_accounts/transaction_rules', - 'bank_accounts,transaction_rules/create' => 'settings/bank_accounts/transaction_rules/create', + 'user_details' => '/settings/user_details', + 'password' => '/settings/user_details/password', + 'connect' => '/settings/user_details/connect', + 'accent_color' => '/settings/user_details/accent_color', + 'notifications' => '/settings/user_details/notifications', + 'enable_two_factor' => '/settings/user_details/enable_two_factor', + 'custom_fields' => '/settings/user_details/custom_fields', + 'preferences' => '/settings/user_details/preferences', + 'company_details' => '/settings/company_details', + 'company_details,details' => '/settings/company_details/details', + 'company_details,address' => '/settings/company_details/address', + 'company_details,logo' => '/settings/company_details/logo', + 'company_details,defaults' => '/settings/company_details/defaults', + 'company_details,documents' => '/settings/company_details/documents', + 'company_details,custom_fields' => '/settings/company_details/custom_fields', + 'localization' => '/settings/localization', + 'localization,custom_labels' => '/settings/localization/custom_labels', + 'online_payments' => '/settings/online_payments', + 'tax_settings' => '/settings/tax_settings', + 'product_settings' => '/settings/product_settings', + 'task_settings' => '/settings/task_settings', + 'expense_settings' => '/settings/expense_settings', + 'workflow_settings' => '/settings/workflow_settings', + 'import_export' => '/settings/import_export', + 'account_management' => '/settings/account_management', + 'account_management,overview' => '/settings/account_management/overview', + 'account_management,enabled_modules' => '/settings/account_management/enabled_modules', + 'account_management,integrations' => '/settings/account_management/integrations', + 'account_management,security_settings' => '/settings/account_management/security_settings', + 'account_management,danger_zone' => '/settings/account_management/danger_zone', + 'backup_restore' => '/settings/backup_restore', + 'backup_restore,restore' => '/settings/backup_restore/restore', + 'backup_restore,backup' => '/settings/backup_restore/backup', + 'custom_fields' => '/settings/custom_fields', + 'custom_fields,company' => '/settings/custom_fields/company', + 'custom_fields,clients' => '/settings/custom_fields/clients', + 'custom_fields,products' => '/settings/custom_fields/products', + 'custom_fields,invoices' => '/settings/custom_fields/invoices', + 'custom_fields,payments' => '/settings/custom_fields/payments', + 'custom_fields,projects' => '/settings/custom_fields/projects', + 'custom_fields,tasks' => '/settings/custom_fields/tasks', + 'custom_fields,vendors' => '/settings/custom_fields/vendors', + 'custom_fields,expenses' => '/settings/custom_fields/expenses', + 'custom_fields,users' => '/settings/custom_fields/users', + 'custom_fields,quotes' => '/settings/custom_fields/quotes', + 'custom_fields,credits' => '/settings/custom_fields/credits', + 'generated_numbers' => '/settings/generated_numbers', + 'client_portal' => '/settings/client_portal', + 'email_settings' => '/settings/email_settings', + 'templates_and_reminders' => '/settings/templates_and_reminders', + 'bank_accounts' => '/settings/bank_accounts', + 'group_settings' => '/settings/group_settings', + 'subscriptions' => '/settings/subscriptions', + 'schedules' => '/settings/schedules', + 'users' => '/settings/users', + 'system_logs' => '/settings/system_logs', + 'payment_terms' => '/settings/payment_terms', + 'tax_rates' => '/settings/tax_rates', + 'task_statuses' => '/settings/task_statuses', + 'expense_categories' => '/settings/expense_categories', + 'integrations' => '/settings/integrations', + 'integrations,api_tokens' => '/settings/integrations/api_tokens', + 'integrations,api_webhooks' => '/settings/integrations/api_webhooks', + 'integrations,analytics' => '/settings/integrations/analytics', + 'gateways' => '/settings/gateways', + 'gateways,create' => '/settings/gateways/create', + 'bank_accounts,transaction_rules' => '/settings/bank_accounts/transaction_rules', + 'bank_accounts,transaction_rules/create' => '/settings/bank_accounts/transaction_rules/create', ]; $data = []; @@ -175,8 +174,12 @@ class SearchController extends Controller $translation = rtrim($translation, " "); - $data[$translation] = $value; - + $data[] = [ + 'id' => $translation, + 'path' => $value, + 'type' => $transkey, + 'name' => $translation, + ]; } ksort($data); diff --git a/app/Http/Requests/Client/BulkClientRequest.php b/app/Http/Requests/Client/BulkClientRequest.php index b77c09a5277d..c18ac8fa3d10 100644 --- a/app/Http/Requests/Client/BulkClientRequest.php +++ b/app/Http/Requests/Client/BulkClientRequest.php @@ -31,8 +31,11 @@ class BulkClientRequest extends Request public function rules() { + /** @var \App\Models\User $user */ + $user = auth()->user(); + return [ - 'ids' => ['required','bail','array',Rule::exists('clients', 'id')->where('company_id', auth()->user()->company()->id)], + 'ids' => ['required','bail','array',Rule::exists('clients', 'id')->where('company_id', $user->company()->id)], 'action' => 'in:archive,restore,delete' ]; } diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php index def035b0c98d..2fb9a589e082 100644 --- a/app/Http/Requests/Request.php +++ b/app/Http/Requests/Request.php @@ -20,7 +20,7 @@ class Request extends FormRequest use MakesHash; use RuntimeFormRequest; - protected $file_validation = 'sometimes|file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx,webp,xml,zip|max:100000'; + protected $file_validation = 'sometimes|file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx,webp,xml,zip,csv|max:100000'; /** * Get the validation rules that apply to the request. *