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

used qualifyColumn to prefix columns

Browse Source
This commit is contained in:
Denis Duliçi 2021-09-10 09:41:15 +03:00
parent f77b6475ff
commit 91907067a2
14 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Abstracts/Model.php
View File

@ -103,7 +103,7 @@ abstract class Model extends Eloquent implements Ownable
*/
public function scopeCompanyId($query, $company_id)
{
return $query->where($this->table . '.company_id', '=', $company_id);
return $query->where($this->getTable() . '.company_id', '=', $company_id);
}
/**
@ -177,7 +177,7 @@ abstract class Model extends Eloquent implements Ownable
*/
public function scopeEnabled($query)
{
return $query->where($this->table . '.enabled', 1);
return $query->where($this->qualifyColumn('enabled'), 1);
}
/**
@ -188,7 +188,7 @@ abstract class Model extends Eloquent implements Ownable
*/
public function scopeDisabled($query)
{
return $query->where($this->table . '.enabled', 0);
return $query->where($this->qualifyColumn('enabled'), 0);
}
/**
@ -200,7 +200,7 @@ abstract class Model extends Eloquent implements Ownable
*/
public function scopeReconciled($query, $value = 1)
{
return $query->where($this->table . '.reconciled', $value);
return $query->where($this->qualifyColumn('reconciled'), $value);
}
public function scopeAccount($query, $accounts)
@ -209,7 +209,7 @@ abstract class Model extends Eloquent implements Ownable
return $query;
}
return $query->whereIn($this->table . '.account_id', (array) $accounts);
return $query->whereIn($this->qualifyColumn('account_id'), (array) $accounts);
}
public function scopeContact($query, $contacts)
@ -218,22 +218,22 @@ abstract class Model extends Eloquent implements Ownable
return $query;
}
return $query->whereIn($this->table . '.contact_id', (array) $contacts);
return $query->whereIn($this->qualifyColumn('contact_id'), (array) $contacts);
}
public function scopeSource($query, $source)
{
return $query->where($this->table . '.created_from', $source);
return $query->where($this->qualifyColumn('created_from'), $source);
}
public function scopeIsOwner($query)
{
return $query->where($this->table . '.created_by', user_id());
return $query->where($this->qualifyColumn('created_by'), user_id());
}
public function scopeIsNotOwner($query)
{
return $query->where($this->table . '.created_by', '<>', user_id());
return $query->where($this->qualifyColumn('created_by'), '<>', user_id());
}
public function ownerKey($owner)

6
app/Models/Auth/User.php
View File

@ -262,17 +262,17 @@ class User extends Authenticatable implements HasLocalePreference
public function scopeSource($query, $source)
{
return $query->where($this->table . '.created_from', $source);
return $query->where($this->qualifyColumn('created_from'), $source);
}
public function scopeIsOwner($query)
{
return $query->where($this->table . '.created_by', user_id());
return $query->where($this->qualifyColumn('created_by'), user_id());
}
public function scopeIsNotOwner($query)
{
return $query->where($this->table . '.created_by', '<>', user_id());
return $query->where($this->qualifyColumn('created_by'), '<>', user_id());
}
public function ownerKey($owner)

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

@ -139,7 +139,7 @@ class Transaction extends Model
return $query;
}
return $query->whereIn($this->table . '.type', (array) $types);
return $query->whereIn($this->qualifyColumn('type'), (array) $types);
}
/**
@ -150,7 +150,7 @@ class Transaction extends Model
*/
public function scopeIncome($query)
{
return $query->whereIn($this->table . '.type', (array) $this->getIncomeTypes());
return $query->whereIn($this->qualifyColumn('type'), (array) $this->getIncomeTypes());
}
/**
@ -161,7 +161,7 @@ class Transaction extends Model
*/
public function scopeExpense($query)
{
return $query->whereIn($this->table . '.type', (array) $this->getExpenseTypes());
return $query->whereIn($this->qualifyColumn('type'), (array) $this->getExpenseTypes());
}
/**

6
app/Models/Common/Company.php
View File

@ -557,17 +557,17 @@ class Company extends Eloquent implements Ownable
public function scopeSource($query, $source)
{
return $query->where($this->table . '.created_from', $source);
return $query->where($this->qualifyColumn('created_from'), $source);
}
public function scopeIsOwner($query)
{
return $query->where($this->table . '.created_by', user_id());
return $query->where($this->qualifyColumn('created_by'), user_id());
}
public function scopeIsNotOwner($query)
{
return $query->where($this->table . '.created_by', '<>', user_id());
return $query->where($this->qualifyColumn('created_by'), '<>', user_id());
}
public function ownerKey($owner)

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

@ -133,7 +133,7 @@ class Contact extends Model
return $query;
}
return $query->whereIn($this->table . '.type', (array) $types);
return $query->whereIn($this->qualifyColumn('type'), (array) $types);
}
/**
@ -144,7 +144,7 @@ class Contact extends Model
*/
public function scopeVendor($query)
{
return $query->whereIn($this->table . '.type', (array) $this->getVendorTypes());
return $query->whereIn($this->qualifyColumn('type'), (array) $this->getVendorTypes());
}
/**
@ -155,7 +155,7 @@ class Contact extends Model
*/
public function scopeCustomer($query)
{
return $query->whereIn($this->table . '.type', (array) $this->getCustomerTypes());
return $query->whereIn($this->qualifyColumn('type'), (array) $this->getCustomerTypes());
}
public function scopeEmail($query, $email)

6
app/Models/Document/Document.php
View File

@ -172,17 +172,17 @@ class Document extends Model
public function scopeType(Builder $query, string $type)
{
return $query->where($this->table . '.type', '=', $type);
return $query->where($this->qualifyColumn('type'), '=', $type);
}
public function scopeInvoice(Builder $query)
{
return $query->where($this->table . '.type', '=', self::INVOICE_TYPE);
return $query->where($this->qualifyColumn('type'), '=', self::INVOICE_TYPE);
}
public function scopeBill(Builder $query)
{
return $query->where($this->table . '.type', '=', self::BILL_TYPE);
return $query->where($this->qualifyColumn('type'), '=', self::BILL_TYPE);
}
/**

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

@ -22,16 +22,16 @@ class DocumentHistory extends Model
public function scopeType(Builder $query, string $type)
{
return $query->where($this->table . '.type', '=', $type);
return $query->where($this->qualifyColumn('type'), '=', $type);
}
public function scopeInvoice(Builder $query)
{
return $query->where($this->table . '.type', '=', Document::INVOICE_TYPE);
return $query->where($this->qualifyColumn('type'), '=', Document::INVOICE_TYPE);
}
public function scopeBill(Builder $query)
{
return $query->where($this->table . '.type', '=', Document::BILL_TYPE);
return $query->where($this->qualifyColumn('type'), '=', Document::BILL_TYPE);
}
}

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

@ -78,17 +78,17 @@ class DocumentItem extends Model
public function scopeType(Builder $query, string $type)
{
return $query->where($this->table . '.type', '=', $type);
return $query->where($this->qualifyColumn('type'), '=', $type);
}
public function scopeInvoice(Builder $query)
{
return $query->where($this->table . '.type', '=', Document::INVOICE_TYPE);
return $query->where($this->qualifyColumn('type'), '=', Document::INVOICE_TYPE);
}
public function scopeBill(Builder $query)
{
return $query->where($this->table . '.type', '=', Document::BILL_TYPE);
return $query->where($this->qualifyColumn('type'), '=', Document::BILL_TYPE);
}
public function getDiscountAttribute(): string

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

@ -41,16 +41,16 @@ class DocumentItemTax extends Model
public function scopeType(Builder $query, string $type)
{
return $query->where($this->table . '.type', '=', $type);
return $query->where($this->qualifyColumn('type'), '=', $type);
}
public function scopeInvoice(Builder $query)
{
return $query->where($this->table . '.type', '=', Document::INVOICE_TYPE);
return $query->where($this->qualifyColumn('type'), '=', Document::INVOICE_TYPE);
}
public function scopeBill(Builder $query)
{
return $query->where($this->table . '.type', '=', Document::BILL_TYPE);
return $query->where($this->qualifyColumn('type'), '=', Document::BILL_TYPE);
}
}

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

@ -34,17 +34,17 @@ class DocumentTotal extends Model
public function scopeType(Builder $query, string $type)
{
return $query->where($this->table . '.type', '=', $type);
return $query->where($this->qualifyColumn('type'), '=', $type);
}
public function scopeInvoice(Builder $query)
{
return $query->where($this->table . '.type', '=', Document::INVOICE_TYPE);
return $query->where($this->qualifyColumn('type'), '=', Document::INVOICE_TYPE);
}
public function scopeBill(Builder $query)
{
return $query->where($this->table . '.type', '=', Document::BILL_TYPE);
return $query->where($this->qualifyColumn('type'), '=', Document::BILL_TYPE);
}
public function scopeCode($query, $code)

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

@ -84,7 +84,7 @@ class Category extends Model
return $query;
}
return $query->whereIn($this->table . '.type', (array) $types);
return $query->whereIn($this->qualifyColumn('type'), (array) $types);
}
/**
@ -95,7 +95,7 @@ class Category extends Model
*/
public function scopeIncome($query)
{
return $query->where($this->table . '.type', '=', 'income');
return $query->where($this->qualifyColumn('type'), '=', 'income');
}
/**
@ -106,7 +106,7 @@ class Category extends Model
*/
public function scopeExpense($query)
{
return $query->where($this->table . '.type', '=', 'expense');
return $query->where($this->qualifyColumn('type'), '=', 'expense');
}
/**
@ -117,7 +117,7 @@ class Category extends Model
*/
public function scopeItem($query)
{
return $query->where($this->table . '.type', '=', 'item');
return $query->where($this->qualifyColumn('type'), '=', 'item');
}
/**
@ -128,7 +128,7 @@ class Category extends Model
*/
public function scopeOther($query)
{
return $query->where($this->table . '.type', '=', 'other');
return $query->where($this->qualifyColumn('type'), '=', 'other');
}
public function scopeName($query, $name)

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

@ -180,7 +180,7 @@ class Currency extends Model
*/
public function scopeCode($query, $code)
{
return $query->where($this->table . '.code', $code);
return $query->where($this->qualifyColumn('code'), $code);
}
/**

2
app/Models/Setting/Setting.php
View File

@ -77,6 +77,6 @@ class Setting extends Eloquent
*/
public function scopeCompanyId($query, $company_id)
{
return $query->where($this->table . '.company_id', '=', $company_id);
return $query->where($this->qualifyColumn('company_id'), '=', $company_id);
}
}

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

@ -84,37 +84,37 @@ class Tax extends Model
return $query;
}
return $query->whereIn($this->table . '.type', (array) $types);
return $query->whereIn($this->qualifyColumn('type'), (array) $types);
}
public function scopeFixed($query)
{
return $query->where($this->table . '.type', '=', 'fixed');
return $query->where($this->qualifyColumn('type'), '=', 'fixed');
}
public function scopeNormal($query)
{
return $query->where($this->table . '.type', '=', 'normal');
return $query->where($this->qualifyColumn('type'), '=', 'normal');
}
public function scopeInclusive($query)
{
return $query->where($this->table . '.type', '=', 'inclusive');
return $query->where($this->qualifyColumn('type'), '=', 'inclusive');
}
public function scopeCompound($query)
{
return $query->where($this->table . '.type', '=', 'compound');
return $query->where($this->qualifyColumn('type'), '=', 'compound');
}
public function scopeWithholding($query)
{
return $query->where($this->table . '.type', '=', 'withholding');
return $query->where($this->qualifyColumn('type'), '=', 'withholding');
}
public function scopeNotWithholding($query)
{
return $query->where($this->table . '.type', '<>', 'withholding');
return $query->where($this->qualifyColumn('type'), '<>', 'withholding');
}
/**