kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-25 06:51:08 +00:00
Code Issues Projects Releases Wiki Activity

Some small fixes.

Browse Source
This commit is contained in:
James Cole
2016-02-04 17:57:36 +01:00
parent dbd32abdd1
commit ee8c83bbd8
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Export/Collector/AttachmentCollector.php
View File

@@ -45,7 +45,8 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
if (file_exists($originalFile)) { if (file_exists($originalFile)) {
Log::debug('Stored 1 attachment'); Log::debug('Stored 1 attachment');
$decrypted = Crypt::decrypt(file_get_contents($originalFile)); $decrypted = Crypt::decrypt(file_get_contents($originalFile));
$newFile = storage_path('export') . DIRECTORY_SEPARATOR . $this->job->key . '-Attachment nr. ' . $attachment->id . ' - ' . $attachment->filename; $newFile = storage_path('export') . DIRECTORY_SEPARATOR . $this->job->key . '-Attachment nr. ' . $attachment->id . ' - '
. $attachment->filename;
file_put_contents($newFile, $decrypted); file_put_contents($newFile, $decrypted);
$this->getFiles()->push($newFile); $this->getFiles()->push($newFile);
} }

10
app/Http/Controllers/ExportController.php
View File

@@ -88,17 +88,11 @@ class ExportController extends Controller
$accounts = $repository->getAccounts(['Default account', 'Asset account']); $accounts = $repository->getAccounts(['Default account', 'Asset account']);
$formats = array_keys(Config::get('firefly.export_formats')); $formats = array_keys(Config::get('firefly.export_formats'));
$defaultFormat = Preferences::get('export_format', Config::get('firefly.default_export_format'))->data; $defaultFormat = Preferences::get('export_format', Config::get('firefly.default_export_format'))->data;
//$first = session('first')->format('Y-m-d'); $first = session('first')->format('Y-m-d');
$first = Carbon::create()->startOfYear()->format('Y-m-d'); $today = Carbon::create()->format('Y-m-d');
$today = Carbon::create()->format('Y-m-d');
return view('export.index', compact('accounts', 'job', 'formats', 'defaultFormat', 'first', 'today')); return view('export.index', compact('accounts', 'job', 'formats', 'defaultFormat', 'first', 'today'));
// select date range
// format
// select accounts
// include attachments
// include uploaded CSV files (if any)
} }
/** /**