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 pull request #6617 from turbo124/v5-develop

Browse Source 
Fixes for appends on tax_rates model
This commit is contained in:
David Bomba 2021-09-10 21:43:24 +10:00 committed by GitHub
commit d974505ed0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/Company.php
View File

@ -281,7 +281,7 @@ class Company extends BaseModel
*/ */
public function company_gateways() public function company_gateways()
{ {
return $this->hasMany(CompanyGateway::class); return $this->hasMany(CompanyGateway::class)->withTrashed();
} }
/** /**
@ -289,7 +289,7 @@ class Company extends BaseModel
*/ */
public function tax_rates() public function tax_rates()
{ {
return $this->hasMany(TaxRate::class); return $this->hasMany(TaxRate::class)->withTrashed();
} }
/** /**
@ -297,7 +297,7 @@ class Company extends BaseModel
*/ */
public function products() public function products()
{ {
return $this->hasMany(Product::class); return $this->hasMany(Product::class)->withTrashed();
} }
/** /**
@ -311,7 +311,7 @@ class Company extends BaseModel
public function group_settings() public function group_settings()
{ {
return $this->hasMany(GroupSetting::class); return $this->hasMany(GroupSetting::class)->withTrashed();
} }
public function timezone() public function timezone()

2
app/Models/TaxRate.php
View File

@ -24,7 +24,7 @@ class TaxRate extends BaseModel
'rate', 'rate',
]; ];
protected $appends = ['tax_rate_id']; // protected $appends = ['tax_rate_id'];
public function getEntityType() public function getEntityType()
{ {

1
app/Transformers/CompanyTransformer.php
View File

@ -53,7 +53,6 @@ class CompanyTransformer extends EntityTransformer
*/ */
protected $defaultIncludes = [ protected $defaultIncludes = [
'documents', 'documents',
'tax_rates',
]; ];
/** /**