diff --git a/VERSION.txt b/VERSION.txt index 9b455dc8badd..b0c32105423b 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.5.110 \ No newline at end of file +5.5.111 \ No newline at end of file diff --git a/app/Console/Commands/MobileLocalization.php b/app/Console/Commands/MobileLocalization.php index 482cf9042ade..e4d12c98bc33 100644 --- a/app/Console/Commands/MobileLocalization.php +++ b/app/Console/Commands/MobileLocalization.php @@ -93,6 +93,17 @@ class MobileLocalization extends Command $text = str_replace(['', ''], '', $text); $text = str_replace(['', ''], '', $text); +//replace the three lines above with this +// if($language->locale == 'ar') { +// $text = str_replace('\n', " ", $text); +// } + +// $text = str_replace(['', '','', '','', ''], '', $text); +// $text = str_replace('"', "'", $text); + + + + echo "'$key': '$text',\n"; } 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/ClientTransformer.php b/app/Transformers/ClientTransformer.php index f1d031022c53..1a6f36bb945a 100644 --- a/app/Transformers/ClientTransformer.php +++ b/app/Transformers/ClientTransformer.php @@ -150,7 +150,7 @@ class ClientTransformer extends EntityTransformer 'has_valid_vat_number' => (bool) $client->has_valid_vat_number, 'is_tax_exempt' => (bool) $client->is_tax_exempt, 'routing_id' => (string) $client->routing_id, - 'tax_data' => $client->tax_data ?: '', + // 'tax_data' => $client->tax_data ?: '', ]; } } 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; } diff --git a/app/Transformers/InvoiceTransformer.php b/app/Transformers/InvoiceTransformer.php index 5e3b0a93955d..b76d3d6cfddb 100644 --- a/app/Transformers/InvoiceTransformer.php +++ b/app/Transformers/InvoiceTransformer.php @@ -149,7 +149,7 @@ class InvoiceTransformer extends EntityTransformer 'paid_to_date' => (float) $invoice->paid_to_date, 'subscription_id' => $this->encodePrimaryKey($invoice->subscription_id), 'auto_bill_enabled' => (bool) $invoice->auto_bill_enabled, - 'tax_data' => $invoice->tax_data ?: '', + // 'tax_data' => $invoice->tax_data ?: '', ]; } } diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index f16aa8589a11..76186c9e9016 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -84,16 +84,12 @@ class HtmlEngine switch ($this->invitation) { case ($this->invitation instanceof InvoiceInvitation): return 'invoice'; - break; case ($this->invitation instanceof CreditInvitation): return 'credit'; - break; case ($this->invitation instanceof QuoteInvitation): return 'quote'; - break; case ($this->invitation instanceof RecurringInvoiceInvitation): return 'recurring_invoice'; - break; default: # code... break; @@ -145,7 +141,7 @@ class HtmlEngine $data['$invoice.po_number'] = ['value' => $this->entity->po_number ?: ' ', 'label' => ctrans('texts.po_number')]; $data['$poNumber'] = &$data['$invoice.po_number']; $data['$po_number'] = &$data['$invoice.po_number']; - $data['$entity.datetime'] = ['value' => $this->formatDatetime($this->entity->created_at, $this->client->date_format(), $this->client->locale()), 'label' => ctrans('texts.date')]; + $data['$entity.datetime'] = ['value' => $this->formatDatetime($this->entity->created_at, $this->client->date_format()), 'label' => ctrans('texts.date')]; $data['$invoice.datetime'] = &$data['$entity.datetime']; $data['$quote.datetime'] = &$data['$entity.datetime']; $data['$credit.datetime'] = &$data['$entity.datetime']; diff --git a/app/Utils/VendorHtmlEngine.php b/app/Utils/VendorHtmlEngine.php index 0910c318c2ff..67bd20d7bf25 100644 --- a/app/Utils/VendorHtmlEngine.php +++ b/app/Utils/VendorHtmlEngine.php @@ -90,19 +90,14 @@ class VendorHtmlEngine switch ($this->invitation) { case ($this->invitation instanceof InvoiceInvitation): return 'invoice'; - break; case ($this->invitation instanceof CreditInvitation): return 'credit'; - break; case ($this->invitation instanceof QuoteInvitation): return 'quote'; - break; case ($this->invitation instanceof RecurringInvoiceInvitation): return 'recurring_invoice'; - break; case ($this->invitation instanceof PurchaseOrderInvitation): return 'purchase_order'; - break; default: # code... break; @@ -839,14 +834,14 @@ html { '; - return ' - - - - -
- '. $text .' -
- '; + // return ' + // + // + // + // + //
+ // '. $text .' + //
+ // '; } } diff --git a/config/ninja.php b/config/ninja.php index a99013135258..72b7ced1ab9f 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -15,8 +15,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => '5.5.110', - 'app_tag' => '5.5.110', + 'app_version' => '5.5.111', + 'app_tag' => '5.5.111', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''), diff --git a/phpstan.neon b/phpstan.neon index e426a63268c0..8c380f84e481 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -7,6 +7,8 @@ parameters: - '#Call to an undefined method Illuminate\Database\Eloquent\Builder::exclude#' level: 4 paths: - - app + - 'app/' + excludePaths: + - 'vendor/' universalObjectCratesClasses: - App\DataMapper\Tax\RuleInterface \ No newline at end of file