From ae52ce5a430b92e829f21c0a3555ed3c67c6d94a Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 16 Oct 2017 01:06:49 +0300 Subject: [PATCH] fixed #51 --- app/Models/Setting/Tax.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/app/Models/Setting/Tax.php b/app/Models/Setting/Tax.php index 59ae5f43c..665f20b38 100644 --- a/app/Models/Setting/Tax.php +++ b/app/Models/Setting/Tax.php @@ -3,9 +3,6 @@ namespace App\Models\Setting; use App\Models\Model; -use App\Models\Item\Item; -use App\Models\Expense\Bill; -use App\Models\Income\Invoice; class Tax extends Model { @@ -31,14 +28,14 @@ class Tax extends Model return $this->hasMany('App\Models\Item\Item'); } - public function bills() + public function bill_items() { - return $this->hasMany('App\Models\Expense\Bill'); + return $this->hasMany('App\Models\Expense\BillItem'); } - public function invoices() + public function invoice_items() { - return $this->hasMany('App\Models\Income\Invoice'); + return $this->hasMany('App\Models\Income\InvoiceItem'); } public function canDelete() @@ -49,11 +46,11 @@ class Tax extends Model $error['items'] = $items; } - if ($bills = $this->bills()->count()) { + if ($bills = $this->bill_items()->count()) { $error['bills'] = $bills; } - if ($invoices = $this->invoices()->count()) { + if ($invoices = $this->invoice_items()->count()) { $error['invoices'] = $invoices; }