Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Email error if import fails

Browse Source
This commit is contained in:
Hillel Coren 2017-06-26 23:44:55 +03:00
parent 2542b1a640
commit 2fb227714a
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/Jobs/ImportData.php
View File

@ -67,24 +67,30 @@ class ImportData extends Job implements ShouldQueue
$this->user->account->loadLocalizationSettings(); $this->user->account->loadLocalizationSettings();
} }
if ($this->type === IMPORT_JSON) { try {
$includeData = $this->settings['include_data']; if ($this->type === IMPORT_JSON) {
$includeSettings = $this->settings['include_settings']; $includeData = $this->settings['include_data'];
$files = $this->settings['files']; $includeSettings = $this->settings['include_settings'];
$results = $importService->importJSON($files[IMPORT_JSON], $includeData, $includeSettings); $files = $this->settings['files'];
} elseif ($this->type === IMPORT_CSV) { $results = $importService->importJSON($files[IMPORT_JSON], $includeData, $includeSettings);
$map = $this->settings['map']; } elseif ($this->type === IMPORT_CSV) {
$headers = $this->settings['headers']; $map = $this->settings['map'];
$timestamp = $this->settings['timestamp']; $headers = $this->settings['headers'];
$results = $importService->importCSV($map, $headers, $timestamp); $timestamp = $this->settings['timestamp'];
} else { $results = $importService->importCSV($map, $headers, $timestamp);
$source = $this->settings['source']; } else {
$files = $this->settings['files']; $source = $this->settings['source'];
$results = $importService->importFiles($source, $files); $files = $this->settings['files'];
$results = $importService->importFiles($source, $files);
}
$subject = trans('texts.import_complete');
$message = $importService->presentResults($results, $includeSettings);
} catch (Exception $exception) {
$subject = trans('texts.import_failed');
$message = $exception->getMessage();
} }
$subject = trans('texts.import_complete');
$message = $importService->presentResults($results, $includeSettings);
$userMailer->sendMessage($this->user, $subject, $message); $userMailer->sendMessage($this->user, $subject, $message);
if (App::runningInConsole()) { if (App::runningInConsole()) {

2
app/Listeners/HandleUserLoggedIn.php
View File

@ -43,7 +43,7 @@ class HandleUserLoggedIn
{ {
$account = Auth::user()->account; $account = Auth::user()->account;
if (empty($account->last_login)) { if (! Utils::isNinja() && empty($account->last_login)) {
event(new UserSignedUp()); event(new UserSignedUp());
} }

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

@ -2289,7 +2289,7 @@ $LANG = array(
'deleted_recurring_expense' => 'Successfully deleted :count projects', 'deleted_recurring_expense' => 'Successfully deleted :count projects',
'view_recurring_expense' => 'View Recurring Expense', 'view_recurring_expense' => 'View Recurring Expense',
'other' => 'Other', 'other' => 'Other',
'import_failed' => 'Import Failed',
); );