v5.0.0 update

This commit is contained in:
Mohit Panjwani
2021-11-30 18:58:19 +05:30
parent d332712c22
commit 082d5cacf2
1253 changed files with 88309 additions and 71741 deletions

View File

@ -24,6 +24,11 @@ class ExpenseCategory extends Model
return $this->hasMany(Expense::class);
}
public function company()
{
return $this->belongsTo(Company::class);
}
public function getFormattedCreatedAtAttribute($value)
{
$dateFormat = CompanySetting::getSetting('carbon_date_format', $this->company_id);
@ -36,9 +41,9 @@ class ExpenseCategory extends Model
return $this->expenses()->sum('amount');
}
public function scopeWhereCompany($query, $company_id)
public function scopeWhereCompany($query)
{
$query->where('company_id', $company_id);
$query->where('company_id', request()->header('company'));
}
public function scopeWhereCategory($query, $category_id)
@ -71,7 +76,7 @@ class ExpenseCategory extends Model
public function scopePaginateData($query, $limit)
{
if ($limit == 'all') {
return collect(['data' => $query->get()]);
return $query->get();
}
return $query->paginate($limit);