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

4
app/Models/Banking/Account.php
View File

@ -51,12 +51,12 @@ class Account extends Model
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 transactions()

6
app/Models/Banking/Transaction.php
View File

@ -98,7 +98,7 @@ class Transaction extends Model
public function bill()
{
return $this->belongsTo('App\Models\Document\Document', 'document_id');
return $this->belongsTo('App\Models\Document\Document', 'document_id')->withoutGlobalScope('App\Scopes\Document');
}
public function category()
@ -123,12 +123,12 @@ class Transaction extends Model
public function invoice()
{
return $this->belongsTo('App\Models\Document\Document', 'document_id');
return $this->belongsTo('App\Models\Document\Document', 'document_id')->withoutGlobalScope('App\Scopes\Document');
}
public function document()
{
return $this->belongsTo('App\Models\Document\Document', 'document_id');
return $this->belongsTo('App\Models\Document\Document', 'document_id')->withoutGlobalScope('App\Scopes\Document');
}
public function parent()

36
app/Models/Banking/Transfer.php
View File

@ -54,34 +54,42 @@ class Transfer extends Model
public function expense_transaction()
{
return $this->belongsTo('App\Models\Banking\Transaction', 'expense_transaction_id')->withDefault(['name' => trans('general.na')]);
return $this->belongsTo('App\Models\Banking\Transaction', 'expense_transaction_id')
->withoutGlobalScope('App\Scopes\Transaction')
->withDefault(['name' => trans('general.na')]);
}
public function expense_account()
{
return $this->belongsToThrough(
'App\Models\Banking\Account',
'App\Models\Banking\Transaction',
null,
'',
['App\Models\Banking\Transaction' => 'expense_transaction_id']
)->withDefault(['name' => trans('general.na')]);
'App\Models\Banking\Account',
'App\Models\Banking\Transaction',
null,
'',
['App\Models\Banking\Transaction' => 'expense_transaction_id']
)
->withoutGlobalScope('App\Scopes\Transaction')
->withDefault(['name' => trans('general.na')]);
}
public function income_transaction()
{
return $this->belongsTo('App\Models\Banking\Transaction', 'income_transaction_id')->withDefault(['name' => trans('general.na')]);
return $this->belongsTo('App\Models\Banking\Transaction', 'income_transaction_id')
->withoutGlobalScope('App\Scopes\Transaction')
->withDefault(['name' => trans('general.na')]);
}
public function income_account()
{
return $this->belongsToThrough(
'App\Models\Banking\Account',
'App\Models\Banking\Transaction',
null,
'',
['App\Models\Banking\Transaction' => 'income_transaction_id']
)->withDefault(['name' => trans('general.na')]);
'App\Models\Banking\Account',
'App\Models\Banking\Transaction',
null,
'',
['App\Models\Banking\Transaction' => 'income_transaction_id']
)
->withoutGlobalScope('App\Scopes\Transaction')
->withDefault(['name' => trans('general.na')]);
}
/**

8
app/Models/Common/Contact.php
View File

@ -94,7 +94,7 @@ class Contact extends Model
public function bills()
{
return $this->documents()->where('type', Document::BILL_TYPE);
return $this->documents()->where('documents.type', Document::BILL_TYPE);
}
public function currency()
@ -104,17 +104,17 @@ class Contact extends Model
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()

2
app/Models/Document/DocumentHistory.php
View File

@ -17,7 +17,7 @@ class DocumentHistory extends Model
public function document()
{
return $this->belongsTo('App\Models\Document\Document');
return $this->belongsTo('App\Models\Document\Document')->withoutGlobalScope('App\Scopes\Document');
}
public function scopeType(Builder $query, string $type)

2
app/Models/Document/DocumentItem.php
View File

@ -69,7 +69,7 @@ class DocumentItem extends Model
public function document()
{
return $this->belongsTo('App\Models\Document\Document');
return $this->belongsTo('App\Models\Document\Document')->withoutGlobalScope('App\Scopes\Document');
}
public function item()

2
app/Models/Document/DocumentItemTax.php
View File

@ -26,7 +26,7 @@ class DocumentItemTax extends Model
public function document()
{
return $this->belongsTo('App\Models\Document\Document');
return $this->belongsTo('App\Models\Document\Document')->withoutGlobalScope('App\Scopes\Document');
}
public function item()

2
app/Models/Document/DocumentTotal.php
View File

@ -29,7 +29,7 @@ class DocumentTotal extends Model
public function document()
{
return $this->belongsTo('App\Models\Document\Document');
return $this->belongsTo('App\Models\Document\Document')->withoutGlobalScope('App\Scopes\Document');
}
public function scopeType(Builder $query, string $type)

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)