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

small fixes #392

Browse Source
This commit is contained in:
denisdulici 2018-06-23 16:45:03 +03:00
parent 912f085ea9
commit 9566464938
3 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Expenses/Bills.php
View File

@ -298,9 +298,7 @@ class Bills extends Controller
$import->each(function ($sheet) use (&$success) { $import->each(function ($sheet) use (&$success) {
$slug = 'Expense\\' . str_singular(studly_case($sheet->getTitle())); $slug = 'Expense\\' . str_singular(studly_case($sheet->getTitle()));
$success = Import::createFromSheet($sheet, $slug); if (!$success = Import::createFromSheet($sheet, $slug)) {
if (!$success) {
return false; return false;
} }
}); });

4
app/Http/Controllers/Incomes/Invoices.php
View File

@ -319,9 +319,7 @@ class Invoices extends Controller
$import->each(function ($sheet) use (&$success) { $import->each(function ($sheet) use (&$success) {
$slug = 'Income\\' . str_singular(studly_case($sheet->getTitle())); $slug = 'Income\\' . str_singular(studly_case($sheet->getTitle()));
$success = Import::createFromSheet($sheet, $slug); if (!$success = Import::createFromSheet($sheet, $slug)) {
if (!$success) {
return false; return false;
} }
}); });

14
app/Utilities/Import.php
View File

@ -13,21 +13,9 @@ class Import
// Loop through all sheets // Loop through all sheets
$import->each(function ($sheet) use (&$success, $slug) { $import->each(function ($sheet) use (&$success, $slug) {
$model = '\App\Models\\' . $slug; if (!$success = static::createFromSheet($sheet, $slug)) {
$request = '\App\Http\Requests\\' . $slug;
if (!class_exists($model) || !class_exists($request)) {
return false; 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; return $success;