From 9566464938f566ed3670e4c1b9a5269ba0153bb4 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Sat, 23 Jun 2018 16:45:03 +0300
Subject: [PATCH] small fixes #392

---
 app/Http/Controllers/Expenses/Bills.php   |  4 +---
 app/Http/Controllers/Incomes/Invoices.php |  4 +---
 app/Utilities/Import.php                  | 14 +-------------
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php
index fab91f2af..40e27405d 100644
--- a/app/Http/Controllers/Expenses/Bills.php
+++ b/app/Http/Controllers/Expenses/Bills.php
@@ -298,9 +298,7 @@ class Bills extends Controller
         $import->each(function ($sheet) use (&$success) {
             $slug = 'Expense\\' . str_singular(studly_case($sheet->getTitle()));
 
-            $success = Import::createFromSheet($sheet, $slug);
-
-            if (!$success) {
+            if (!$success = Import::createFromSheet($sheet, $slug)) {
                 return false;
             }
         });
diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php
index d8c5f995b..f0b7b3346 100644
--- a/app/Http/Controllers/Incomes/Invoices.php
+++ b/app/Http/Controllers/Incomes/Invoices.php
@@ -319,9 +319,7 @@ class Invoices extends Controller
         $import->each(function ($sheet) use (&$success) {
             $slug = 'Income\\' . str_singular(studly_case($sheet->getTitle()));
 
-            $success = Import::createFromSheet($sheet, $slug);
-
-            if (!$success) {
+            if (!$success = Import::createFromSheet($sheet, $slug)) {
                 return false;
             }
         });
diff --git a/app/Utilities/Import.php b/app/Utilities/Import.php
index 1c035f72d..8e0367967 100644
--- a/app/Utilities/Import.php
+++ b/app/Utilities/Import.php
@@ -13,21 +13,9 @@ class Import
 
         // Loop through all sheets
         $import->each(function ($sheet) use (&$success, $slug) {
-            $model = '\App\Models\\' . $slug;
-            $request = '\App\Http\Requests\\' . $slug;
-
-            if (!class_exists($model) || !class_exists($request)) {
+            if (!$success = static::createFromSheet($sheet, $slug)) {
                 return false;
             }
-
-            $tmp = explode('\\', $slug);
-            $file_name = str_plural(strtolower($tmp[1]));
-
-            if ($sheet->getTitle() != $file_name) {
-                return false;
-            }
-
-            $success = static::createFromSheet($sheet, $slug);
         });
 
         return $success;