Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use Company ScopeS

Browse Source
This commit is contained in:
David Bomba 2019-05-01 12:23:13 +10:00
parent b276cc729f
commit 568fbdf6c8
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/BaseModel.php
View File

@ -6,11 +6,13 @@ use App\Filters\QueryFilters;
use App\Utils\Traits\UserSessionAttributes;
use Hashids\Hashids;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Facades\Log;
class BaseModel extends Model
{
use UserSessionAttributes;
use SoftDeletes;
public function __call($method, $params)
{
@ -29,6 +31,12 @@ class BaseModel extends Model
return parent::__call($method, $params);
}
public function scopeCompany($query, $company_id)
{
$query->where('company_id', $company_id);
return $query;
}
public function scopeScope($query)
{

2
app/Models/CompanyToken.php
View File

@ -4,7 +4,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class CompanyToken extends BaseModel
class CompanyToken extends Model
{
/**
* @var bool

2
app/Models/Country.php
View File

@ -4,7 +4,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class Country extends BaseModel
class Country extends Model
{
public $timestamps = false;

2
app/Models/Timezone.php
View File

@ -4,7 +4,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class Timezone extends BaseModel
class Timezone extends Model
{
/**
* @var bool

8
app/Utils/Traits/GeneratesNumberCounter.php
View File

@ -40,13 +40,13 @@ trait GeneratesNumberCounter
}
if ($entity == Client::class) {
$check = Client::whereIdNumber($number)->withTrashed()->first();
$check = Client::company($this->company_id)->whereIdNumber($number)->withTrashed()->first();
} elseif ($entity == Invoice::class) {
$check = Invoice::whereInvoiceNumber($number)->withTrashed()->first();
$check = Invoice::company($this->company_id)->whereInvoiceNumber($number)->withTrashed()->first();
} elseif ($entity == Quote::class) {
$check = Quote::whereQuoteNumber($number)->withTrashed()->first();
$check = Quote::company($this->company_id)->whereQuoteNumber($number)->withTrashed()->first();
} elseif ($entity == Credit::class) {
$check = Credit::whereCreditNumber($number)->withTrashed()->first();
$check = Credit::company($this->company_id)->whereCreditNumber($number)->withTrashed()->first();
}
$counter++;