kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Update configuration and fix some files.

Browse Source
This commit is contained in:
James Cole
2025-05-27 17:02:18 +02:00
parent c074fec0a7
commit d8f512ca3a
31 changed files with 154 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Console/Commands/Export/ExportsData.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\Export;
use FireflyIII\Models\TransactionJournal;
use Carbon\Carbon;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Console\Commands\VerifiesAccessToken;
@@ -38,6 +39,8 @@ use Illuminate\Support\Collection;
use Exception;
use InvalidArgumentException;
use function Safe\file_put_contents;
class ExportsData extends Command
{
use ShowsFriendlyMessages;
@@ -203,7 +206,7 @@ class ExportsData extends Command
if (true === $error && 'start' === $field) {
$journal = $this->journalRepository->firstNull();
$date = null === $journal ? today(config('app.timezone'))->subYear() : $journal->date;
$date = $journal instanceof TransactionJournal ? $journal->date : today(config('app.timezone'))->subYear();
$date->startOfDay();
return $date;
@@ -275,7 +278,7 @@ class ExportsData extends Command
*/
private function exportData(array $options, array $data): void
{
$date = date('Y_m_d');
$date = Carbon::now()->format('Y_m_d');
foreach ($data as $key => $content) {
$file = sprintf('%s%s_%s.csv', $options['directory'], $date, $key);
if (false === $options['force'] && file_exists($file)) {
@@ -285,7 +288,7 @@ class ExportsData extends Command
$this->friendlyWarning(sprintf('File "%s" exists already but will be replaced.', $file));
}
// continue to write to file.
\Safe\file_put_contents($file, $content);
file_put_contents($file, $content);
$this->friendlyPositive(sprintf('Wrote %s-export to file "%s".', $key, $file));
}
}