diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index 585deebab093..0b2293328edf 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -265,6 +265,7 @@ class BaseController extends Controller 'company.quotes.invitations.contact', 'company.quotes.invitations.company', 'company.credits', + 'company.payment_terms', //'company.credits.invitations.contact', //'company.credits.invitations.company', 'company.vendors.contacts', @@ -282,6 +283,7 @@ class BaseController extends Controller 'company.users.company_user', 'company.tax_rates', 'company.groups', + 'company.payment_terms', ]; /** diff --git a/app/Models/Company.php b/app/Models/Company.php index 9f3856ab1fd4..f71eb5491900 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -284,6 +284,11 @@ class Company extends BaseModel return $this->hasMany(Design::class)->whereCompanyId($this->id)->orWhere('company_id', null); } + public function payment_terms() + { + return $this->hasMany(PaymentTerm::class)->whereCompanyId($this->id)->orWhere('company_id', null); + } + /** * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index 5565a316bf2c..ab72a3b0bdd6 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -23,6 +23,7 @@ use App\Models\Design; use App\Models\Expense; use App\Models\GroupSetting; use App\Models\Payment; +use App\Models\PaymentTerm; use App\Models\Product; use App\Models\Project; use App\Models\Quote; @@ -31,6 +32,7 @@ use App\Models\TaxRate; use App\Models\User; use App\Transformers\CompanyLedgerTransformer; use App\Transformers\CreditTransformer; +use App\Transformers\PaymentTermTransformer; use App\Transformers\TaskTransformer; use App\Utils\Traits\MakesHash; @@ -65,6 +67,7 @@ class CompanyTransformer extends EntityTransformer 'expenses', 'vendors', 'payments', + 'payment_terms', 'company_user', 'groups', 'company_gateways', @@ -253,4 +256,11 @@ class CompanyTransformer extends EntityTransformer return $this->includeCollection($company->ledger, $transformer, CompanyLedger::class); } + + public function includePaymentTerms(Company $company) + { + $transformer = new PaymentTermTransformer($this->serializer); + + return $this->includeCollection($company->payment_terms()->get(), $transformer, PaymentTerm::class); + } }