shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved default scopes

Browse Source
This commit is contained in:
Denis Duliçi
2022-06-10 19:26:32 +03:00
parent 5890a99bf9
commit 92065bd49d
13 changed files with 68 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/Setting/Category.php
View File

@ -112,22 +112,22 @@ class Category extends Model
public function bills()
{
return $this->documents()->where('type', Document::BILL_TYPE);
return $this->documents()->where('documents.type', Document::BILL_TYPE);
}
public function expense_transactions()
{
return $this->transactions()->whereIn('type', (array) $this->getExpenseTypes());
return $this->transactions()->whereIn('transactions.type', (array) $this->getExpenseTypes());
}
public function income_transactions()
{
return $this->transactions()->whereIn('type', (array) $this->getIncomeTypes());
return $this->transactions()->whereIn('transactions.type', (array) $this->getIncomeTypes());
}
public function invoices()
{
return $this->documents()->where('type', Document::INVOICE_TYPE);
return $this->documents()->where('documents.type', Document::INVOICE_TYPE);
}
public function items()

12
app/Models/Setting/Currency.php
View File

@ -63,7 +63,7 @@ class Currency extends Model
public function bills()
{
return $this->documents()->where('type', Document::BILL_TYPE);
return $this->documents()->where('documents.type', Document::BILL_TYPE);
}
public function contacts()
@ -73,22 +73,22 @@ class Currency extends Model
public function customers()
{
return $this->contacts()->whereIn('type', (array) $this->getCustomerTypes());
return $this->contacts()->whereIn('contacts.type', (array) $this->getCustomerTypes());
}
public function expense_transactions()
{
return $this->transactions()->whereIn('type', (array) $this->getExpenseTypes());
return $this->transactions()->whereIn('transactions.type', (array) $this->getExpenseTypes());
}
public function income_transactions()
{
return $this->transactions()->whereIn('type', (array) $this->getIncomeTypes());
return $this->transactions()->whereIn('transactions.type', (array) $this->getIncomeTypes());
}
public function invoices()
{
return $this->documents()->where('type', Document::INVOICE_TYPE);
return $this->documents()->where('documents.type', Document::INVOICE_TYPE);
}
public function transactions()
@ -98,7 +98,7 @@ class Currency extends Model
public function vendors()
{
return $this->contacts()->whereIn('type', (array) $this->getVendorTypes());
return $this->contacts()->whereIn('contacts.type', (array) $this->getVendorTypes());
}
/**

4
app/Models/Setting/Tax.php
View File

@ -55,12 +55,12 @@ class Tax extends Model
public function bill_items()
{
return $this->document_items()->where('type', Document::BILL_TYPE);
return $this->document_items()->where('documents.type', Document::BILL_TYPE);
}
public function invoice_items()
{
return $this->document_items()->where('type', Document::INVOICE_TYPE);
return $this->document_items()->where('documents.type', Document::INVOICE_TYPE);
}
public function scopeName($query, $name)