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

added custom transaction types

Browse Source
This commit is contained in:
Denis Duliçi
2020-08-26 15:14:16 +03:00
parent d64917a3e0
commit 68f31b895f
11 changed files with 115 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,9 +3,12 @@
namespace App\Models\Banking;
use App\Abstracts\Model;
use App\Traits\Transactions;
class Account extends Model
{
use Transactions;
protected $table = 'accounts';
/**
@ -36,12 +39,12 @@ class Account extends Model
public function expense_transactions()
{
return $this->transactions()->where('type', 'expense');
return $this->transactions()->whereIn('type', (array) $this->getExpenseTypes());
}
public function income_transactions()
{
return $this->transactions()->where('type', 'income');
return $this->transactions()->whereIn('type', (array) $this->getIncomeTypes());
}
public function transactions()

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

@ -8,11 +8,13 @@ use App\Traits\Currencies;
use App\Traits\DateTime;
use App\Traits\Media;
use App\Traits\Recurring;
use App\Traits\Transactions;
use Bkwld\Cloner\Cloneable;
use Illuminate\Support\Str;
class Transaction extends Model
{
use Cloneable, Currencies, DateTime, Media, Recurring;
use Cloneable, Currencies, DateTime, Media, Recurring, Transactions;
protected $table = 'transactions';
@ -103,7 +105,7 @@ class Transaction extends Model
*/
public function scopeIncome($query)
{
return $query->where($this->table . '.type', '=', 'income');
return $query->whereIn($this->table . '.type', (array) $this->getIncomeTypes());
}
/**
@ -114,7 +116,7 @@ class Transaction extends Model
*/
public function scopeExpense($query)
{
return $query->where($this->table . '.type', '=', 'expense');
return $query->whereIn($this->table . '.type', (array) $this->getExpenseTypes());
}
/**
@ -279,4 +281,14 @@ class Transaction extends Model
return $this->getMedia('attachment')->last();
}
/**
* Get the title of type.
*
* @return string
*/
public function getTypeTitleAttribute($value)
{
return $value ?? trans_choice('general.' . Str::plural($this->type), 1);
}
}

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

@ -2,8 +2,10 @@
namespace App\Models\Common;
use App\Traits\Contacts;
use App\Traits\Media;
use App\Traits\Tenants;
use App\Traits\Transactions;
use Illuminate\Database\Eloquent\Model as Eloquent;
use Illuminate\Database\Eloquent\SoftDeletes;
use Kyslik\ColumnSortable\Sortable;
@ -11,7 +13,7 @@ use Lorisleiva\LaravelSearchString\Concerns\SearchString;
class Company extends Eloquent
{
use Media, SearchString, SoftDeletes, Sortable, Tenants;
use Contacts, Media, SearchString, SoftDeletes, Sortable, Tenants, Transactions;
protected $table = 'companies';
@ -92,7 +94,7 @@ class Company extends Eloquent
public function customers()
{
return $this->contacts()->where('type', 'customer');
return $this->contacts()->whereIn('type', (array) $this->getCustomerTypes());
}
public function dashboards()
@ -107,12 +109,12 @@ class Company extends Eloquent
public function expense_transactions()
{
return $this->transactions()->where('type', 'expense');
return $this->transactions()->whereIn('type', (array) $this->getExpenseTypes());
}
public function income_transactions()
{
return $this->transactions()->where('type', 'income');
return $this->transactions()->whereIn('type', (array) $this->getIncomeTypes());
}
public function invoices()
@ -197,7 +199,7 @@ class Company extends Eloquent
public function vendors()
{
return $this->contacts()->where('type', 'vendor');
return $this->contacts()->whereIn('type', (array) $this->getVendorTypes());
}
public function widgets()

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

@ -7,11 +7,12 @@ use Bkwld\Cloner\Cloneable;
use App\Traits\Contacts;
use App\Traits\Currencies;
use App\Traits\Media;
use App\Traits\Transactions;
use Illuminate\Notifications\Notifiable;
class Contact extends Model
{
use Cloneable, Contacts, Currencies, Media, Notifiable;
use Cloneable, Contacts, Currencies, Media, Notifiable, Transactions;
protected $table = 'contacts';
@ -41,12 +42,12 @@ class Contact extends Model
public function expense_transactions()
{
return $this->transactions()->where('type', 'expense');
return $this->transactions()->whereIn('type', (array) $this->getExpenseTypes());
}
public function income_transactions()
{
return $this->transactions()->where('type', 'income');
return $this->transactions()->whereIn('type', (array) $this->getIncomeTypes());
}
public function invoices()

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

@ -3,9 +3,12 @@
namespace App\Models\Setting;
use App\Abstracts\Model;
use App\Traits\Transactions;
class Category extends Model
{
use Transactions;
protected $table = 'categories';
/**
@ -29,12 +32,12 @@ class Category extends Model
public function expense_transactions()
{
return $this->transactions()->where('type', 'expense');
return $this->transactions()->whereIn('type', (array) $this->getExpenseTypes());
}
public function income_transactions()
{
return $this->transactions()->where('type', 'income');
return $this->transactions()->whereIn('type', (array) $this->getIncomeTypes());
}
public function invoices()

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

@ -3,9 +3,12 @@
namespace App\Models\Setting;
use App\Abstracts\Model;
use App\Traits\Contacts;
use App\Traits\Transactions;
class Currency extends Model
{
use Contacts, Transactions;
protected $table = 'currencies';
@ -40,17 +43,17 @@ class Currency extends Model
public function customers()
{
return $this->contacts()->where('type', 'customer');
return $this->contacts()->whereIn('type', (array) $this->getCustomerTypes());
}
public function expense_transactions()
{
return $this->transactions()->where('type', 'expense');
return $this->transactions()->whereIn('type', (array) $this->getExpenseTypes());
}
public function income_transactions()
{
return $this->transactions()->where('type', 'income');
return $this->transactions()->whereIn('type', (array) $this->getIncomeTypes());
}
public function invoices()
@ -65,7 +68,7 @@ class Currency extends Model
public function vendors()
{
return $this->contacts()->where('type', 'vendor');
return $this->contacts()->whereIn('type', (array) $this->getVendorTypes());
}
/**