diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index e8aea5395052..01976d36ffbf 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -104,6 +104,7 @@ class Import implements ShouldQueue * @var array */ private $available_imports = [ + 'account', 'company', 'users', 'payment_terms', @@ -225,6 +226,13 @@ class Import implements ShouldQueue }); } + private function processAccount(array $data) :void + { + $account = $this->company->account; + $account->fill($data); + $account->save(); + } + /** * @param array $data * @throws Exception diff --git a/app/Models/Company.php b/app/Models/Company.php index 1a00725cebf1..2f769887b229 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -79,6 +79,7 @@ class Company extends BaseModel 'invoice_task_timelog', 'auto_start_tasks', 'is_disabled', + 'default_task_is_date_based', ]; protected $hidden = [ diff --git a/app/Models/Task.php b/app/Models/Task.php index 39fd8127888c..d290bcadef8d 100644 --- a/app/Models/Task.php +++ b/app/Models/Task.php @@ -38,6 +38,7 @@ class Task extends BaseModel 'invoice_documents', 'rate', 'number', + 'is_date_based', ]; protected $touches = []; diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index c2e21c9229a5..46eb495b7dd8 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -146,6 +146,7 @@ class CompanyTransformer extends EntityTransformer 'invoice_task_documents' => (bool) $company->invoice_task_documents, 'show_tasks_table' => (bool) $company->show_tasks_table, 'use_credits_payment' => 'always', //todo remove + 'default_task_is_date_based' => (bool)$company->default_task_is_date_based, ]; } diff --git a/app/Transformers/TaskTransformer.php b/app/Transformers/TaskTransformer.php index 427c7a86b222..3b3ea7309830 100644 --- a/app/Transformers/TaskTransformer.php +++ b/app/Transformers/TaskTransformer.php @@ -66,6 +66,7 @@ class TaskTransformer extends EntityTransformer 'custom_value4' => $task->custom_value4 ?: '', 'status_id' => $this->encodePrimaryKey($task->status_id) ?: '', 'status_sort_order' => (int) $task->status_sort_order, + 'is_date_based' => (bool) $task->is_date_based, ]; } }