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

Support setting file import path

Browse Source
This commit is contained in:
Hillel Coren 2017-04-28 14:20:17 +03:00
parent 3d95f6b8b0
commit 81d9e4994c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Services/ImportService.php
View File

@ -148,7 +148,7 @@ class ImportService
public function importJSON($file, $includeData, $includeSettings)
{
$this->initMaps();
$fileName = storage_path() . '/import/' . $file;
$fileName = $this->getFullPath($file);
$this->checkForFile($fileName);
$file = file_get_contents($fileName);
$json = json_decode($file, true);
@ -287,7 +287,7 @@ class ImportService
// Convert the data
$row_list = [];
$fileName = storage_path() . '/import/' . $file;
$fileName = $this->getFullPath($file);
$this->checkForFile($fileName);
Excel::load($fileName, function ($reader) use ($source, $entityType, &$row_list, &$results) {
@ -590,7 +590,7 @@ class ImportService
{
require_once app_path().'/Includes/parsecsv.lib.php';
$fileName = storage_path() . '/import/' . $fileName;
$fileName = $this->getFullPath($fileName);
$this->checkForFile($fileName);
$csv = new parseCSV();
@ -726,7 +726,7 @@ class ImportService
}
}
@unlink(storage_path() . '/import/' . $fileName);
@unlink($this->getFullPath($fileName));
return $results;
}
@ -956,4 +956,9 @@ class ImportService
return true;
}
public function getFullPath($fileName)
{
return (env('FILE_IMPORT_PATH') ?: storage_path() . '/import') . '/' . $fileName;
}
}