From 5c106c4fef377519a26c1e01903a6e858f8bf649 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Tue, 26 Sep 2017 01:05:21 +0300 Subject: [PATCH] canDelete --- app/Models/Banking/Account.php | 20 ++++++++------------ app/Models/Expense/Vendor.php | 10 ++++------ app/Models/Income/Customer.php | 10 ++++------ app/Models/Item/Item.php | 10 ++++------ app/Models/Setting/Category.php | 15 ++++++--------- app/Models/Setting/Tax.php | 15 ++++++--------- 6 files changed, 32 insertions(+), 48 deletions(-) diff --git a/app/Models/Banking/Account.php b/app/Models/Banking/Account.php index 587906615..b4f24f609 100644 --- a/app/Models/Banking/Account.php +++ b/app/Models/Banking/Account.php @@ -74,24 +74,20 @@ class Account extends Model { $error = false; - $bill_payments = $this->bill_payments(); - if ($bill_payments->count()) { - $error['bills'] = $bill_payments->count(); + if ($bill_payments = $this->bill_payments()->count()) { + $error['bills'] = $bill_payments; } - $payments = $this->payments(); - if ($payments->count()) { - $error['payments'] = $payments->count(); + if ($payments = $this->payments()->count()) { + $error['payments'] = $payments; } - $invoice_payments = $this->invoice_payments(); - if ($invoice_payments->count()) { - $error['invoices'] = $invoice_payments->count(); + if ($invoice_payments = $this->invoice_payments()->count()) { + $error['invoices'] = $invoice_payments; } - $revenues = $this->revenues(); - if ($revenues->count()) { - $error['revenues'] = $revenues->count(); + if ($revenues = $this->revenues()->count()) { + $error['revenues'] = $revenues; } if ($error) { diff --git a/app/Models/Expense/Vendor.php b/app/Models/Expense/Vendor.php index 94c6a74e6..608003db9 100644 --- a/app/Models/Expense/Vendor.php +++ b/app/Models/Expense/Vendor.php @@ -57,14 +57,12 @@ class Vendor extends Model { $error = false; - $bills = $this->bills(); - if ($bills->count()) { - $error['bills'] = $bills->count(); + if ($bills = $this->bills()->count()) { + $error['bills'] = $bills; } - $payments = $this->payments(); - if ($payments->count()) { - $error['payments'] = $payments->count(); + if ($payments = $this->payments()->count()) { + $error['payments'] = $payments; } if ($error) { diff --git a/app/Models/Income/Customer.php b/app/Models/Income/Customer.php index d6471540c..dbd01427b 100644 --- a/app/Models/Income/Customer.php +++ b/app/Models/Income/Customer.php @@ -64,14 +64,12 @@ class Customer extends Model { $error = false; - $invoices = $this->invoices(); - if ($invoices->count()) { - $error['invoices'] = $invoices->count(); + if ($invoices = $this->invoices()->count()) { + $error['invoices'] = $invoices; } - $revenues = $this->revenues(); - if ($revenues->count()) { - $error['revenues'] = $revenues->count(); + if ($revenues = $this->revenues()->count()) { + $error['revenues'] = $revenues; } if ($error) { diff --git a/app/Models/Item/Item.php b/app/Models/Item/Item.php index a7cc21dd9..42f218240 100644 --- a/app/Models/Item/Item.php +++ b/app/Models/Item/Item.php @@ -85,14 +85,12 @@ class Item extends Model { $error = false; - $bills = $this->bills(); - if ($bills->count()) { - $error['bills'] = $bills->count(); + if ($bills = $this->bills()->count()) { + $error['bills'] = $bills; } - $invoices = $this->invoices(); - if ($invoices->count()) { - $error['invoices'] = $invoices->count(); + if ($invoices = $this->invoices()->count()) { + $error['invoices'] = $invoices; } if ($error) { diff --git a/app/Models/Setting/Category.php b/app/Models/Setting/Category.php index 23d39129b..5bad536aa 100644 --- a/app/Models/Setting/Category.php +++ b/app/Models/Setting/Category.php @@ -44,19 +44,16 @@ class Category extends Model { $error = false; - $items = $this->items(); - if ($items->count()) { - $error['items'] = $items->count(); + if ($items = $this->items()->count()) { + $error['items'] = $items; } - $payments = $this->payments(); - if ($payments->count()) { - $error['payments'] = $payments->count(); + if ($payments = $this->payments()->count()) { + $error['payments'] = $payments; } - $revenues = $this->revenues(); - if ($revenues->count()) { - $error['revenues'] = $revenues->count(); + if ($revenues = $this->revenues()->count()) { + $error['revenues'] = $revenues; } if ($error) { diff --git a/app/Models/Setting/Tax.php b/app/Models/Setting/Tax.php index 8dd5fb33e..59ae5f43c 100644 --- a/app/Models/Setting/Tax.php +++ b/app/Models/Setting/Tax.php @@ -45,19 +45,16 @@ class Tax extends Model { $error = false; - $items = $this->items(); - if ($items->count()) { - $error['items'] = $items->count(); + if ($items = $this->items()->count()) { + $error['items'] = $items; } - $bills = $this->bills(); - if ($bills->count()) { - $error['bills'] = $bills->count(); + if ($bills = $this->bills()->count()) { + $error['bills'] = $bills; } - $invoices = $this->invoices(); - if ($invoices->count()) { - $error['invoices'] = $invoices->count(); + if ($invoices = $this->invoices()->count()) { + $error['invoices'] = $invoices; } if ($error) {