mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Use Company ScopeS
This commit is contained in:
parent
b276cc729f
commit
568fbdf6c8
@ -6,11 +6,13 @@ use App\Filters\QueryFilters;
|
|||||||
use App\Utils\Traits\UserSessionAttributes;
|
use App\Utils\Traits\UserSessionAttributes;
|
||||||
use Hashids\Hashids;
|
use Hashids\Hashids;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
|
|
||||||
class BaseModel extends Model
|
class BaseModel extends Model
|
||||||
{
|
{
|
||||||
use UserSessionAttributes;
|
use UserSessionAttributes;
|
||||||
|
use SoftDeletes;
|
||||||
|
|
||||||
public function __call($method, $params)
|
public function __call($method, $params)
|
||||||
{
|
{
|
||||||
@ -29,6 +31,12 @@ class BaseModel extends Model
|
|||||||
return parent::__call($method, $params);
|
return parent::__call($method, $params);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function scopeCompany($query, $company_id)
|
||||||
|
{
|
||||||
|
$query->where('company_id', $company_id);
|
||||||
|
return $query;
|
||||||
|
}
|
||||||
|
|
||||||
public function scopeScope($query)
|
public function scopeScope($query)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ namespace App\Models;
|
|||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class CompanyToken extends BaseModel
|
class CompanyToken extends Model
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var bool
|
* @var bool
|
||||||
|
@ -4,7 +4,7 @@ namespace App\Models;
|
|||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class Country extends BaseModel
|
class Country extends Model
|
||||||
{
|
{
|
||||||
public $timestamps = false;
|
public $timestamps = false;
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ namespace App\Models;
|
|||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class Timezone extends BaseModel
|
class Timezone extends Model
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var bool
|
* @var bool
|
||||||
|
@ -40,13 +40,13 @@ trait GeneratesNumberCounter
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($entity == Client::class) {
|
if ($entity == Client::class) {
|
||||||
$check = Client::whereIdNumber($number)->withTrashed()->first();
|
$check = Client::company($this->company_id)->whereIdNumber($number)->withTrashed()->first();
|
||||||
} elseif ($entity == Invoice::class) {
|
} elseif ($entity == Invoice::class) {
|
||||||
$check = Invoice::whereInvoiceNumber($number)->withTrashed()->first();
|
$check = Invoice::company($this->company_id)->whereInvoiceNumber($number)->withTrashed()->first();
|
||||||
} elseif ($entity == Quote::class) {
|
} elseif ($entity == Quote::class) {
|
||||||
$check = Quote::whereQuoteNumber($number)->withTrashed()->first();
|
$check = Quote::company($this->company_id)->whereQuoteNumber($number)->withTrashed()->first();
|
||||||
} elseif ($entity == Credit::class) {
|
} elseif ($entity == Credit::class) {
|
||||||
$check = Credit::whereCreditNumber($number)->withTrashed()->first();
|
$check = Credit::company($this->company_id)->whereCreditNumber($number)->withTrashed()->first();
|
||||||
}
|
}
|
||||||
|
|
||||||
$counter++;
|
$counter++;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user