Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on import

Browse Source
This commit is contained in:
Hillel Coren 2017-04-02 20:19:10 +03:00
parent ab67faf362
commit 5791e2bc9f
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/ImportController.php
View File

@ -37,7 +37,7 @@ class ImportController extends BaseController
$destinationPath = storage_path() . '/import';
$extension = $file->getClientOriginalExtension();
if (! in_array($extension, ['csv', 'xls', 'json'])) {
if (! in_array($extension, ['csv', 'xls', 'xlsx', 'json'])) {
continue;
}
@ -72,7 +72,7 @@ class ImportController extends BaseController
'include_settings' => $includeSettings,
];
$this->dispatch(new ImportData(Auth::user(), IMPORT_JSON, $settings));
$message = 'started...';
$message = trans('texts.import_started');
}
} else {
if (config('queue.default') === 'sync') {
@ -84,7 +84,7 @@ class ImportController extends BaseController
'source' => $source,
];
$this->dispatch(new ImportData(Auth::user(), false, $settings));
$message = 'started...';
$message = trans('texts.import_started');
}
}
return redirect('/settings/' . ACCOUNT_IMPORT_EXPORT)->withWarning($message);
@ -112,7 +112,7 @@ class ImportController extends BaseController
'headers' => $headers,
];
$this->dispatch(new ImportData(Auth::user(), IMPORT_CSV, $settings));
$message = 'started...';
$message = trans('texts.import_started');
}
return redirect('/settings/' . ACCOUNT_IMPORT_EXPORT)->withWarning($message);

6
app/Services/ImportService.php
View File

@ -229,7 +229,7 @@ class ImportService
}
}
unlink($fileName);
@unlink($fileName);
return $this->results;
}
@ -321,7 +321,7 @@ class ImportService
}
}
unlink($fileName);
@unlink($fileName);
return $results;
}
@ -726,7 +726,7 @@ class ImportService
}
}
unlink($fileName);
@unlink(storage_path() . '/import/' . $fileName);
return $results;
}

1
resources/lang/en/texts.php
View File

@ -2462,6 +2462,7 @@ $LANG = array(
'bcc_email_help' => 'Privately include this address with client emails.',
'import_complete' => 'Your import has successfully completed.',
'confirm_account_to_import' => 'Please confirm your account to import data.',
'import_started' => 'Your import has started, we\'ll send you an email once it completes.',
);