Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 02:54:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add payment terms to transformers (#3738)

Browse Source
This commit is contained in:
David Bomba 2020-05-23 13:33:44 +10:00 committed by GitHub
parent 970c9bb87d
commit 8129a5b49d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/BaseController.php
View File

@ -265,6 +265,7 @@ class BaseController extends Controller
'company.quotes.invitations.contact', 'company.quotes.invitations.contact',
'company.quotes.invitations.company', 'company.quotes.invitations.company',
'company.credits', 'company.credits',
'company.payment_terms',
//'company.credits.invitations.contact', //'company.credits.invitations.contact',
//'company.credits.invitations.company', //'company.credits.invitations.company',
'company.vendors.contacts', 'company.vendors.contacts',
@ -282,6 +283,7 @@ class BaseController extends Controller
'company.users.company_user', 'company.users.company_user',
'company.tax_rates', 'company.tax_rates',
'company.groups', 'company.groups',
'company.payment_terms',
]; ];
/** /**

5
app/Models/Company.php
View File

@ -284,6 +284,11 @@ class Company extends BaseModel
return $this->hasMany(Design::class)->whereCompanyId($this->id)->orWhere('company_id', null); 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 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/ */

10
app/Transformers/CompanyTransformer.php
View File

@ -23,6 +23,7 @@ use App\Models\Design;
use App\Models\Expense; use App\Models\Expense;
use App\Models\GroupSetting; use App\Models\GroupSetting;
use App\Models\Payment; use App\Models\Payment;
use App\Models\PaymentTerm;
use App\Models\Product; use App\Models\Product;
use App\Models\Project; use App\Models\Project;
use App\Models\Quote; use App\Models\Quote;
@ -31,6 +32,7 @@ use App\Models\TaxRate;
use App\Models\User; use App\Models\User;
use App\Transformers\CompanyLedgerTransformer; use App\Transformers\CompanyLedgerTransformer;
use App\Transformers\CreditTransformer; use App\Transformers\CreditTransformer;
use App\Transformers\PaymentTermTransformer;
use App\Transformers\TaskTransformer; use App\Transformers\TaskTransformer;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
@ -65,6 +67,7 @@ class CompanyTransformer extends EntityTransformer
'expenses', 'expenses',
'vendors', 'vendors',
'payments', 'payments',
'payment_terms',
'company_user', 'company_user',
'groups', 'groups',
'company_gateways', 'company_gateways',
@ -253,4 +256,11 @@ class CompanyTransformer extends EntityTransformer
return $this->includeCollection($company->ledger, $transformer, CompanyLedger::class); 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);
}
} }