Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5-develop' into email_refactor

Browse Source
This commit is contained in:
David Bomba 2023-03-08 18:02:12 +11:00
commit f98118728e
5 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Export/CSV/ProductExport.php
View File

@ -26,7 +26,7 @@ class ProductExport extends BaseExport
private $entity_transformer; private $entity_transformer;
public $date_key = 'created_at'; public string $date_key = 'created_at';
public array $entity_keys = [ public array $entity_keys = [
'project' => 'project_id', 'project' => 'project_id',

2
app/Export/CSV/TaskExport.php
View File

@ -28,7 +28,7 @@ class TaskExport extends BaseExport
private $entity_transformer; private $entity_transformer;
public $date_key = 'created_at'; public string $date_key = 'created_at';
private string $date_format = 'YYYY-MM-DD'; private string $date_format = 'YYYY-MM-DD';

6
app/Models/Company.php
View File

@ -368,9 +368,6 @@ class Company extends BaseModel
return $this->hasMany(Product::class)->withTrashed(); return $this->hasMany(Product::class)->withTrashed();
} }
/**
* @return BelongsTo
*/
public function country() public function country()
{ {
$companies = Cache::get('countries'); $companies = Cache::get('countries');
@ -429,9 +426,6 @@ class Company extends BaseModel
return $this->hasMany(PaymentTerm::class); return $this->hasMany(PaymentTerm::class);
} }
/**
* @return BelongsTo
*/
public function language() public function language()
{ {
$languages = Cache::get('languages'); $languages = Cache::get('languages');

2
app/Models/CompanyUser.php
View File

@ -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'); return $this->hasOne(User::class)->withPivot('permissions', 'settings', 'react_settings', 'is_admin', 'is_owner', 'is_locked', 'slack_webhook_url', 'migrating');
} }
public function company_pivot() public function company_pivot()
{ {
return $this->hasOne(Company::class)->withPivot('permissions', 'settings', 'react_settings', 'is_admin', 'is_owner', 'is_locked', 'slack_webhook_url', 'migrating'); return $this->hasOne(Company::class)->withPivot('permissions', 'settings', 'react_settings', 'is_admin', 'is_owner', 'is_locked', 'slack_webhook_url', 'migrating');

8
app/Transformers/BankTransactionTransformer.php
View File

@ -35,7 +35,6 @@ class BankTransactionTransformer extends EntityTransformer
*/ */
protected $availableIncludes = [ protected $availableIncludes = [
'company', 'company',
'account',
'expense', 'expense',
'payment', 'payment',
'vendor', '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) public function includeCompany(BankTransaction $bank_transaction)
{ {
$transformer = new CompanyTransformer($this->serializer); $transformer = new CompanyTransformer($this->serializer);