diff --git a/app/Export/CSV/DocumentExport.php b/app/Export/CSV/DocumentExport.php index 9748e5e1137f..35387e294dc2 100644 --- a/app/Export/CSV/DocumentExport.php +++ b/app/Export/CSV/DocumentExport.php @@ -25,7 +25,7 @@ class DocumentExport extends BaseExport private $entity_transformer; - public $date_key = 'created_at'; + public string $date_key = 'created_at'; public array $entity_keys = [ 'record_type' => 'record_type', diff --git a/app/Export/CSV/ExpenseExport.php b/app/Export/CSV/ExpenseExport.php index b1ac4bee85fe..704753dfc208 100644 --- a/app/Export/CSV/ExpenseExport.php +++ b/app/Export/CSV/ExpenseExport.php @@ -25,7 +25,7 @@ class ExpenseExport extends BaseExport private $expense_transformer; - public $date_key = 'date'; + public string $date_key = 'date'; public array $entity_keys = [ 'amount' => 'amount', diff --git a/app/Export/CSV/ProductExport.php b/app/Export/CSV/ProductExport.php index ec8e03ea8bff..30cc17950585 100644 --- a/app/Export/CSV/ProductExport.php +++ b/app/Export/CSV/ProductExport.php @@ -26,7 +26,7 @@ class ProductExport extends BaseExport private $entity_transformer; - public $date_key = 'created_at'; + public string $date_key = 'created_at'; public array $entity_keys = [ 'project' => 'project_id', diff --git a/app/Export/CSV/TaskExport.php b/app/Export/CSV/TaskExport.php index d7a8e537613f..e28140e6ffec 100644 --- a/app/Export/CSV/TaskExport.php +++ b/app/Export/CSV/TaskExport.php @@ -28,7 +28,7 @@ class TaskExport extends BaseExport private $entity_transformer; - public $date_key = 'created_at'; + public string $date_key = 'created_at'; private string $date_format = 'YYYY-MM-DD'; diff --git a/app/Models/Company.php b/app/Models/Company.php index ccb8514a6592..bb3ed5625cc8 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -368,9 +368,6 @@ class Company extends BaseModel return $this->hasMany(Product::class)->withTrashed(); } - /** - * @return BelongsTo - */ public function country() { $companies = Cache::get('countries'); @@ -429,9 +426,6 @@ class Company extends BaseModel return $this->hasMany(PaymentTerm::class); } - /** - * @return BelongsTo - */ public function language() { $languages = Cache::get('languages'); diff --git a/app/Models/CompanyUser.php b/app/Models/CompanyUser.php index 24e4935a705a..4262a4197612 100644 --- a/app/Models/CompanyUser.php +++ b/app/Models/CompanyUser.php @@ -74,7 +74,7 @@ class CompanyUser extends Pivot { return $this->hasOne(User::class)->withPivot('permissions', 'settings', 'react_settings', 'is_admin', 'is_owner', 'is_locked', 'slack_webhook_url', 'migrating'); } - + public function company_pivot() { return $this->hasOne(Company::class)->withPivot('permissions', 'settings', 'react_settings', 'is_admin', 'is_owner', 'is_locked', 'slack_webhook_url', 'migrating'); diff --git a/app/Transformers/BankTransactionTransformer.php b/app/Transformers/BankTransactionTransformer.php index e4ef35eba5f2..8cb2e8ce3e09 100644 --- a/app/Transformers/BankTransactionTransformer.php +++ b/app/Transformers/BankTransactionTransformer.php @@ -35,7 +35,6 @@ class BankTransactionTransformer extends EntityTransformer */ protected $availableIncludes = [ 'company', - 'account', 'expense', 'payment', 'vendor', @@ -76,13 +75,6 @@ class BankTransactionTransformer extends EntityTransformer ]; } - public function includeAccount(BankTransaction $bank_transaction) - { - $transformer = new AccountTransformer($this->serializer); - - return $this->includeItem($bank_transaction->account, $transformer, Account::class); - } - public function includeCompany(BankTransaction $bank_transaction) { $transformer = new CompanyTransformer($this->serializer);