From 42b3272920caa3b1d2ba020c4db88d79607736a2 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 10 Sep 2021 21:40:49 +1000 Subject: [PATCH] Fixes for appends on tax_rates model --- app/Models/Company.php | 8 ++++---- app/Models/TaxRate.php | 2 +- app/Transformers/CompanyTransformer.php | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/Models/Company.php b/app/Models/Company.php index 44985046cab8..cc3c69bc687a 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -281,7 +281,7 @@ class Company extends BaseModel */ 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() { - return $this->hasMany(TaxRate::class); + return $this->hasMany(TaxRate::class)->withTrashed(); } /** @@ -297,7 +297,7 @@ class Company extends BaseModel */ 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() { - return $this->hasMany(GroupSetting::class); + return $this->hasMany(GroupSetting::class)->withTrashed(); } public function timezone() diff --git a/app/Models/TaxRate.php b/app/Models/TaxRate.php index 0ecf6e854cc8..b2737c6b6cc1 100644 --- a/app/Models/TaxRate.php +++ b/app/Models/TaxRate.php @@ -24,7 +24,7 @@ class TaxRate extends BaseModel 'rate', ]; - protected $appends = ['tax_rate_id']; + // protected $appends = ['tax_rate_id']; public function getEntityType() { diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index 637f2d2ea0a3..d28c00159548 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -53,7 +53,6 @@ class CompanyTransformer extends EntityTransformer */ protected $defaultIncludes = [ 'documents', - 'tax_rates', ]; /**