diff --git a/app/Models/Account.php b/app/Models/Account.php index 97d9941e2d94..7eb5f80e1eea 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -71,16 +71,12 @@ use Laracasts\Presenter\PresentableTrait; * @property int $account_sms_verified * @property string|null $bank_integration_account_id * @property int $is_trial - * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations * @property-read int|null $bank_integrations_count - * @property-read \Illuminate\Database\Eloquent\Collection $companies * @property-read int|null $companies_count - * @property-read \Illuminate\Database\Eloquent\Collection $company_users * @property-read int|null $company_users_count * @property-read \App\Models\Company|null $default_company * @property-read mixed $hashed_id * @property-read \App\Models\Payment|null $payment - * @property-read \Illuminate\Database\Eloquent\Collection $users * @property-read int|null $users_count * @method static \Illuminate\Database\Eloquent\Builder|BaseModel company() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel exclude($columns) @@ -131,6 +127,7 @@ use Laracasts\Presenter\PresentableTrait; * @method static \Illuminate\Database\Eloquent\Builder|Account whereUtmSource($value) * @method static \Illuminate\Database\Eloquent\Builder|Account whereUtmTerm($value) * @method static \Illuminate\Database\Eloquent\Builder|Account first() + * @method static \Illuminate\Database\Eloquent\Builder|Account with() * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations * @property-read \Illuminate\Database\Eloquent\Collection $companies * @property-read \Illuminate\Database\Eloquent\Collection $company_users diff --git a/app/Models/Company.php b/app/Models/Company.php index 40dd21aef776..35b0ca524071 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -104,6 +104,7 @@ use Laracasts\Presenter\PresentableTrait; * @property int $convert_expense_currency * @property int $notify_vendor_when_paid * @property int $invoice_task_hours + * @property int $deleted_at * @property-read \App\Models\Account $account * @property-read \Illuminate\Database\Eloquent\Collection $activities * @property-read int|null $activities_count @@ -327,498 +328,6 @@ use Laracasts\Presenter\PresentableTrait; * @property-read \Illuminate\Database\Eloquent\Collection $webhooks * @property int $calculate_taxes * @property mixed $tax_data - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_documents - * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions - * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $clients - * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways - * @property-read \Illuminate\Database\Eloquent\Collection $company_users - * @property-read \Illuminate\Database\Eloquent\Collection $contacts - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $designs - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $group_settings - * @property-read \Illuminate\Database\Eloquent\Collection $groups - * @property-read \Illuminate\Database\Eloquent\Collection $invoices - * @property-read \Illuminate\Database\Eloquent\Collection $ledger - * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $products - * @property-read \Illuminate\Database\Eloquent\Collection $projects - * @property-read \Illuminate\Database\Eloquent\Collection $purchase_orders - * @property-read \Illuminate\Database\Eloquent\Collection $quotes - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_expenses - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices - * @property-read \Illuminate\Database\Eloquent\Collection $schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $subscriptions - * @property-read \Illuminate\Database\Eloquent\Collection $system_log_relation - * @property-read \Illuminate\Database\Eloquent\Collection $system_logs - * @property-read \Illuminate\Database\Eloquent\Collection $task_schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $task_statuses - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $tax_rates - * @property-read \Illuminate\Database\Eloquent\Collection $tokens - * @property-read \Illuminate\Database\Eloquent\Collection $tokens_hashed - * @property-read \Illuminate\Database\Eloquent\Collection $user_designs - * @property-read \Illuminate\Database\Eloquent\Collection $user_payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $users - * @property-read \Illuminate\Database\Eloquent\Collection $vendors - * @property-read \Illuminate\Database\Eloquent\Collection $webhooks - * @method static \Illuminate\Database\Eloquent\Builder|Company whereCalculateTaxes($value) - * @method static \Illuminate\Database\Eloquent\Builder|Company whereTaxAllProducts($value) - * @method static \Illuminate\Database\Eloquent\Builder|Company whereTaxData($value) - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_documents - * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions - * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $clients - * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways - * @property-read \Illuminate\Database\Eloquent\Collection $company_users - * @property-read \Illuminate\Database\Eloquent\Collection $contacts - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $designs - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $group_settings - * @property-read \Illuminate\Database\Eloquent\Collection $groups - * @property-read \Illuminate\Database\Eloquent\Collection $invoices - * @property-read \Illuminate\Database\Eloquent\Collection $ledger - * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $products - * @property-read \Illuminate\Database\Eloquent\Collection $projects - * @property-read \Illuminate\Database\Eloquent\Collection $purchase_orders - * @property-read \Illuminate\Database\Eloquent\Collection $quotes - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_expenses - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices - * @property-read \Illuminate\Database\Eloquent\Collection $schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $subscriptions - * @property-read \Illuminate\Database\Eloquent\Collection $system_log_relation - * @property-read \Illuminate\Database\Eloquent\Collection $system_logs - * @property-read \Illuminate\Database\Eloquent\Collection $task_schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $task_statuses - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $tax_rates - * @property-read \Illuminate\Database\Eloquent\Collection $tokens - * @property-read \Illuminate\Database\Eloquent\Collection $tokens_hashed - * @property-read \Illuminate\Database\Eloquent\Collection $user_designs - * @property-read \Illuminate\Database\Eloquent\Collection $user_payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $users - * @property-read \Illuminate\Database\Eloquent\Collection $vendors - * @property-read \Illuminate\Database\Eloquent\Collection $webhooks - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_documents - * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions - * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $clients - * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways - * @property-read \Illuminate\Database\Eloquent\Collection $company_users - * @property-read \Illuminate\Database\Eloquent\Collection $contacts - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $designs - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $group_settings - * @property-read \Illuminate\Database\Eloquent\Collection $groups - * @property-read \Illuminate\Database\Eloquent\Collection $invoices - * @property-read \Illuminate\Database\Eloquent\Collection $ledger - * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $products - * @property-read \Illuminate\Database\Eloquent\Collection $projects - * @property-read \Illuminate\Database\Eloquent\Collection $purchase_orders - * @property-read \Illuminate\Database\Eloquent\Collection $quotes - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_expenses - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices - * @property-read \Illuminate\Database\Eloquent\Collection $schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $subscriptions - * @property-read \Illuminate\Database\Eloquent\Collection $system_log_relation - * @property-read \Illuminate\Database\Eloquent\Collection $system_logs - * @property-read \Illuminate\Database\Eloquent\Collection $task_schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $task_statuses - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $tax_rates - * @property-read \Illuminate\Database\Eloquent\Collection $tokens - * @property-read \Illuminate\Database\Eloquent\Collection $tokens_hashed - * @property-read \Illuminate\Database\Eloquent\Collection $user_designs - * @property-read \Illuminate\Database\Eloquent\Collection $user_payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $users - * @property-read \Illuminate\Database\Eloquent\Collection $vendors - * @property-read \Illuminate\Database\Eloquent\Collection $webhooks - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_documents - * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions - * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $clients - * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways - * @property-read \Illuminate\Database\Eloquent\Collection $company_users - * @property-read \Illuminate\Database\Eloquent\Collection $contacts - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $designs - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $group_settings - * @property-read \Illuminate\Database\Eloquent\Collection $groups - * @property-read \Illuminate\Database\Eloquent\Collection $invoices - * @property-read \Illuminate\Database\Eloquent\Collection $ledger - * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $products - * @property-read \Illuminate\Database\Eloquent\Collection $projects - * @property-read \Illuminate\Database\Eloquent\Collection $purchase_orders - * @property-read \Illuminate\Database\Eloquent\Collection $quotes - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_expenses - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices - * @property-read \Illuminate\Database\Eloquent\Collection $schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $subscriptions - * @property-read \Illuminate\Database\Eloquent\Collection $system_log_relation - * @property-read \Illuminate\Database\Eloquent\Collection $system_logs - * @property-read \Illuminate\Database\Eloquent\Collection $task_schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $task_statuses - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $tax_rates - * @property-read \Illuminate\Database\Eloquent\Collection $tokens - * @property-read \Illuminate\Database\Eloquent\Collection $tokens_hashed - * @property-read \Illuminate\Database\Eloquent\Collection $user_designs - * @property-read \Illuminate\Database\Eloquent\Collection $user_payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $users - * @property-read \Illuminate\Database\Eloquent\Collection $vendors - * @property-read \Illuminate\Database\Eloquent\Collection $webhooks - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_documents - * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions - * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $clients - * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways - * @property-read \Illuminate\Database\Eloquent\Collection $company_users - * @property-read \Illuminate\Database\Eloquent\Collection $contacts - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $designs - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $group_settings - * @property-read \Illuminate\Database\Eloquent\Collection $groups - * @property-read \Illuminate\Database\Eloquent\Collection $invoices - * @property-read \Illuminate\Database\Eloquent\Collection $ledger - * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $products - * @property-read \Illuminate\Database\Eloquent\Collection $projects - * @property-read \Illuminate\Database\Eloquent\Collection $purchase_orders - * @property-read \Illuminate\Database\Eloquent\Collection $quotes - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_expenses - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices - * @property-read \Illuminate\Database\Eloquent\Collection $schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $subscriptions - * @property-read \Illuminate\Database\Eloquent\Collection $system_log_relation - * @property-read \Illuminate\Database\Eloquent\Collection $system_logs - * @property-read \Illuminate\Database\Eloquent\Collection $task_schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $task_statuses - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $tax_rates - * @property-read \Illuminate\Database\Eloquent\Collection $tokens - * @property-read \Illuminate\Database\Eloquent\Collection $tokens_hashed - * @property-read \Illuminate\Database\Eloquent\Collection $user_designs - * @property-read \Illuminate\Database\Eloquent\Collection $user_payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $users - * @property-read \Illuminate\Database\Eloquent\Collection $vendors - * @property-read \Illuminate\Database\Eloquent\Collection $webhooks - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_documents - * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions - * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $clients - * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways - * @property-read \Illuminate\Database\Eloquent\Collection $company_users - * @property-read \Illuminate\Database\Eloquent\Collection $contacts - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $designs - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $group_settings - * @property-read \Illuminate\Database\Eloquent\Collection $groups - * @property-read \Illuminate\Database\Eloquent\Collection $invoices - * @property-read \Illuminate\Database\Eloquent\Collection $ledger - * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $products - * @property-read \Illuminate\Database\Eloquent\Collection $projects - * @property-read \Illuminate\Database\Eloquent\Collection $purchase_orders - * @property-read \Illuminate\Database\Eloquent\Collection $quotes - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_expenses - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices - * @property-read \Illuminate\Database\Eloquent\Collection $schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $subscriptions - * @property-read \Illuminate\Database\Eloquent\Collection $system_log_relation - * @property-read \Illuminate\Database\Eloquent\Collection $system_logs - * @property-read \Illuminate\Database\Eloquent\Collection $task_schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $task_statuses - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $tax_rates - * @property-read \Illuminate\Database\Eloquent\Collection $tokens - * @property-read \Illuminate\Database\Eloquent\Collection $tokens_hashed - * @property-read \Illuminate\Database\Eloquent\Collection $user_designs - * @property-read \Illuminate\Database\Eloquent\Collection $user_payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $users - * @property-read \Illuminate\Database\Eloquent\Collection $vendors - * @property-read \Illuminate\Database\Eloquent\Collection $webhooks - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_documents - * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions - * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $clients - * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways - * @property-read \Illuminate\Database\Eloquent\Collection $company_users - * @property-read \Illuminate\Database\Eloquent\Collection $contacts - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $designs - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $group_settings - * @property-read \Illuminate\Database\Eloquent\Collection $groups - * @property-read \Illuminate\Database\Eloquent\Collection $invoices - * @property-read \Illuminate\Database\Eloquent\Collection $ledger - * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $products - * @property-read \Illuminate\Database\Eloquent\Collection $projects - * @property-read \Illuminate\Database\Eloquent\Collection $purchase_orders - * @property-read \Illuminate\Database\Eloquent\Collection $quotes - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_expenses - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices - * @property-read \Illuminate\Database\Eloquent\Collection $schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $subscriptions - * @property-read \Illuminate\Database\Eloquent\Collection $system_log_relation - * @property-read \Illuminate\Database\Eloquent\Collection $system_logs - * @property-read \Illuminate\Database\Eloquent\Collection $task_schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $task_statuses - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $tax_rates - * @property-read \Illuminate\Database\Eloquent\Collection $tokens - * @property-read \Illuminate\Database\Eloquent\Collection $tokens_hashed - * @property-read \Illuminate\Database\Eloquent\Collection $user_designs - * @property-read \Illuminate\Database\Eloquent\Collection $user_payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $users - * @property-read \Illuminate\Database\Eloquent\Collection $vendors - * @property-read \Illuminate\Database\Eloquent\Collection $webhooks - * @property int $tax_all_products - * @property string $e_invoice_type - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_documents - * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions - * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $clients - * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways - * @property-read \Illuminate\Database\Eloquent\Collection $company_users - * @property-read \Illuminate\Database\Eloquent\Collection $contacts - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $designs - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $group_settings - * @property-read \Illuminate\Database\Eloquent\Collection $groups - * @property-read \Illuminate\Database\Eloquent\Collection $invoices - * @property-read \Illuminate\Database\Eloquent\Collection $ledger - * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $products - * @property-read \Illuminate\Database\Eloquent\Collection $projects - * @property-read \Illuminate\Database\Eloquent\Collection $purchase_orders - * @property-read \Illuminate\Database\Eloquent\Collection $quotes - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_expenses - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices - * @property-read \Illuminate\Database\Eloquent\Collection $schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $subscriptions - * @property-read \Illuminate\Database\Eloquent\Collection $system_log_relation - * @property-read \Illuminate\Database\Eloquent\Collection $system_logs - * @property-read \Illuminate\Database\Eloquent\Collection $task_schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $task_statuses - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $tax_rates - * @property-read \Illuminate\Database\Eloquent\Collection $tokens - * @property-read \Illuminate\Database\Eloquent\Collection $tokens_hashed - * @property-read \Illuminate\Database\Eloquent\Collection $user_designs - * @property-read \Illuminate\Database\Eloquent\Collection $user_payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $users - * @property-read \Illuminate\Database\Eloquent\Collection $vendors - * @property-read \Illuminate\Database\Eloquent\Collection $webhooks - * @method static \Illuminate\Database\Eloquent\Builder|Company whereUseXinvoice($value) - * @method static \Illuminate\Database\Eloquent\Builder|Company whereXinvoiceType($value) - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_documents - * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions - * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $clients - * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways - * @property-read \Illuminate\Database\Eloquent\Collection $company_users - * @property-read \Illuminate\Database\Eloquent\Collection $contacts - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $designs - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $group_settings - * @property-read \Illuminate\Database\Eloquent\Collection $groups - * @property-read \Illuminate\Database\Eloquent\Collection $invoices - * @property-read \Illuminate\Database\Eloquent\Collection $ledger - * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $products - * @property-read \Illuminate\Database\Eloquent\Collection $projects - * @property-read \Illuminate\Database\Eloquent\Collection $purchase_orders - * @property-read \Illuminate\Database\Eloquent\Collection $quotes - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_expenses - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices - * @property-read \Illuminate\Database\Eloquent\Collection $schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $subscriptions - * @property-read \Illuminate\Database\Eloquent\Collection $system_log_relation - * @property-read \Illuminate\Database\Eloquent\Collection $system_logs - * @property-read \Illuminate\Database\Eloquent\Collection $task_schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $task_statuses - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $tax_rates - * @property-read \Illuminate\Database\Eloquent\Collection $tokens - * @property-read \Illuminate\Database\Eloquent\Collection $tokens_hashed - * @property-read \Illuminate\Database\Eloquent\Collection $user_designs - * @property-read \Illuminate\Database\Eloquent\Collection $user_payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $users - * @property-read \Illuminate\Database\Eloquent\Collection $vendors - * @property-read \Illuminate\Database\Eloquent\Collection $webhooks - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_documents - * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions - * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $clients - * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways - * @property-read \Illuminate\Database\Eloquent\Collection $company_users - * @property-read \Illuminate\Database\Eloquent\Collection $contacts - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $designs - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $group_settings - * @property-read \Illuminate\Database\Eloquent\Collection $groups - * @property-read \Illuminate\Database\Eloquent\Collection $invoices - * @property-read \Illuminate\Database\Eloquent\Collection $ledger - * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $products - * @property-read \Illuminate\Database\Eloquent\Collection $projects - * @property-read \Illuminate\Database\Eloquent\Collection $purchase_orders - * @property-read \Illuminate\Database\Eloquent\Collection $quotes - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_expenses - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices - * @property-read \Illuminate\Database\Eloquent\Collection $schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $subscriptions - * @property-read \Illuminate\Database\Eloquent\Collection $system_log_relation - * @property-read \Illuminate\Database\Eloquent\Collection $system_logs - * @property-read \Illuminate\Database\Eloquent\Collection $task_schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $task_statuses - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $tax_rates - * @property-read \Illuminate\Database\Eloquent\Collection $tokens - * @property-read \Illuminate\Database\Eloquent\Collection $tokens_hashed - * @property-read \Illuminate\Database\Eloquent\Collection $user_designs - * @property-read \Illuminate\Database\Eloquent\Collection $user_payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $users - * @property-read \Illuminate\Database\Eloquent\Collection $vendors - * @property-read \Illuminate\Database\Eloquent\Collection $webhooks - * @method static \Illuminate\Database\Eloquent\Builder|Company whereEnableEInvoice($value) - * @property-read \Illuminate\Database\Eloquent\Collection $activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_activities - * @property-read \Illuminate\Database\Eloquent\Collection $all_documents - * @property-read \Illuminate\Database\Eloquent\Collection $bank_integrations - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transaction_rules - * @property-read \Illuminate\Database\Eloquent\Collection $bank_transactions - * @property-read \Illuminate\Database\Eloquent\Collection $client_contacts - * @property-read \Illuminate\Database\Eloquent\Collection $client_gateway_tokens - * @property-read \Illuminate\Database\Eloquent\Collection $clients - * @property-read \Illuminate\Database\Eloquent\Collection $company_gateways - * @property-read \Illuminate\Database\Eloquent\Collection $company_users - * @property-read \Illuminate\Database\Eloquent\Collection $contacts - * @property-read \Illuminate\Database\Eloquent\Collection $credits - * @property-read \Illuminate\Database\Eloquent\Collection $designs - * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @property-read \Illuminate\Database\Eloquent\Collection $expense_categories - * @property-read \Illuminate\Database\Eloquent\Collection $expenses - * @property-read \Illuminate\Database\Eloquent\Collection $group_settings - * @property-read \Illuminate\Database\Eloquent\Collection $groups - * @property-read \Illuminate\Database\Eloquent\Collection $invoices - * @property-read \Illuminate\Database\Eloquent\Collection $ledger - * @property-read \Illuminate\Database\Eloquent\Collection $payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $payments - * @property-read \Illuminate\Database\Eloquent\Collection $products - * @property-read \Illuminate\Database\Eloquent\Collection $projects - * @property-read \Illuminate\Database\Eloquent\Collection $purchase_orders - * @property-read \Illuminate\Database\Eloquent\Collection $quotes - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_expenses - * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices - * @property-read \Illuminate\Database\Eloquent\Collection $schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $subscriptions - * @property-read \Illuminate\Database\Eloquent\Collection $system_log_relation - * @property-read \Illuminate\Database\Eloquent\Collection $system_logs - * @property-read \Illuminate\Database\Eloquent\Collection $task_schedulers - * @property-read \Illuminate\Database\Eloquent\Collection $task_statuses - * @property-read \Illuminate\Database\Eloquent\Collection $tasks - * @property-read \Illuminate\Database\Eloquent\Collection $tax_rates - * @property-read \Illuminate\Database\Eloquent\Collection $tokens - * @property-read \Illuminate\Database\Eloquent\Collection $tokens_hashed - * @property-read \Illuminate\Database\Eloquent\Collection $user_designs - * @property-read \Illuminate\Database\Eloquent\Collection $user_payment_terms - * @property-read \Illuminate\Database\Eloquent\Collection $users - * @property-read \Illuminate\Database\Eloquent\Collection $vendors - * @property-read \Illuminate\Database\Eloquent\Collection $webhooks * @method \App\Models\User|null owner() * @mixin \Eloquent */ diff --git a/app/Models/User.php b/app/Models/User.php index 62bc06e240c4..9fd05311598c 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -36,6 +36,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable; * * @property int $id * @property int $account_id + * @property int $company_id * @property string|null $first_name * @property string|null $last_name * @property string|null $phone diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index 37c1e8011a48..eff5e27b6be7 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -11,40 +11,43 @@ namespace App\Transformers; -use App\Models\Account; -use App\Models\Activity; -use App\Models\BankIntegration; -use App\Models\BankTransaction; +use stdClass; +use App\Models\Task; +use App\Models\User; +use App\Models\Quote; use App\Models\Client; -use App\Models\Company; -use App\Models\CompanyGateway; -use App\Models\CompanyLedger; -use App\Models\CompanyToken; -use App\Models\CompanyUser; use App\Models\Credit; use App\Models\Design; -use App\Models\Document; +use App\Models\Vendor; +use App\Models\Account; +use App\Models\Company; use App\Models\Expense; -use App\Models\ExpenseCategory; -use App\Models\GroupSetting; +use App\Models\Invoice; use App\Models\Payment; -use App\Models\PaymentTerm; use App\Models\Product; use App\Models\Project; +use App\Models\TaxRate; +use App\Models\Webhook; +use App\Models\Activity; +use App\Models\Document; +use App\Models\Scheduler; +use App\Models\SystemLog; +use App\Models\TaskStatus; +use App\Models\CompanyUser; +use App\Models\PaymentTerm; +use App\Models\CompanyToken; +use App\Models\GroupSetting; +use App\Models\Subscription; +use App\Models\CompanyLedger; use App\Models\PurchaseOrder; -use App\Models\Quote; +use App\Models\CompanyGateway; +use App\Models\BankIntegration; +use App\Models\BankTransaction; +use App\Models\ExpenseCategory; +use App\Utils\Traits\MakesHash; use App\Models\RecurringExpense; use App\Models\RecurringInvoice; -use App\Models\Scheduler; -use App\Models\Subscription; -use App\Models\SystemLog; -use App\Models\Task; -use App\Models\TaskStatus; -use App\Models\TaxRate; -use App\Models\User; -use App\Models\Webhook; -use App\Utils\Traits\MakesHash; -use stdClass; +use App\Models\BankTransactionRule; /** * Class CompanyTransformer. @@ -130,7 +133,7 @@ class CompanyTransformer extends EntityTransformer 'show_product_details' => (bool) $company->show_product_details, 'enable_product_quantity' => (bool) $company->enable_product_quantity, 'default_quantity' => (bool) $company->default_quantity, - 'custom_fields' => $company->custom_fields ?: $std, + 'custom_fields' => $company->custom_fields ?? $std, 'size_id' => (string) $company->size_id ?: '', 'industry_id' => (string) $company->industry_id ?: '', 'first_month_of_year' => (string) $company->first_month_of_year ?: '', @@ -138,7 +141,7 @@ class CompanyTransformer extends EntityTransformer 'subdomain' => (string) $company->subdomain ?: '', 'portal_mode' => (string) $company->portal_mode ?: '', 'portal_domain' => (string) $company->portal_domain ?: '', - 'settings' => $company->settings ?: '', + 'settings' => $company->settings ?? '', 'enabled_tax_rates' => (int) $company->enabled_tax_rates, 'enabled_modules' => (int) $company->enabled_modules, 'updated_at' => (int) $company->updated_at, @@ -201,8 +204,11 @@ class CompanyTransformer extends EntityTransformer private function isLarge(Company $company): bool { + /** @var \App\Models\User $user */ + $user = auth()->user(); + //if the user is attached to more than one company AND they are not an admin across all companies - if ($company->is_large || (auth()->user()->company_users()->count() > 1 && (auth()->user()->company_users()->where('is_admin', 1)->count() != auth()->user()->company_users()->count()))) + if ($company->is_large || ($user->company_users()->count() > 1 && ($user->company_users()->where('is_admin', 1)->count() != $user->company_users()->count()))) { return true; }