kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-24 04:41:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into feature/credit_calc

Browse Source 
# Conflicts:
#	app/Factory/TransactionJournalMetaFactory.php
#	app/Repositories/Account/AccountRepository.php
#	app/Transformers/AccountTransformer.php
#	config/firefly.php
#	frontend/src/components/accounts/Create.vue
This commit is contained in:
James Cole
2021-04-27 06:54:38 +02:00
parent 8ef6595ced f03b0569cf
commit 65c49c7a71
259 changed files with 3163 additions and 2520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Factory/TransactionCurrencyFactory.php
View File

@@ -46,7 +46,7 @@ class TransactionCurrencyFactory
public function create(array $data): TransactionCurrency
{
try {
/** @var TransactionCurrency $currency */
/** @var TransactionCurrency $result */
$result = TransactionCurrency::create(
[
'name' => $data['name'],

2
app/Factory/TransactionJournalFactory.php
View File

@@ -543,7 +543,7 @@ class TransactionJournalFactory
'data' => (string)($data[$field] ?? ''),
];
Log::debug(sprintf('Going to store meta-field "%s", with value "%s".', $set['name'], $set['data']));
//Log::debug(sprintf('Going to store meta-field "%s", with value "%s".', $set['name'], $set['data']));
/** @var TransactionJournalMetaFactory $factory */
$factory = app(TransactionJournalMetaFactory::class);

2
app/Factory/TransactionJournalMetaFactory.php
View File

@@ -61,7 +61,7 @@ class TransactionJournalMetaFactory
$value = $data['data']->toW3cString();
}
if ('' === (string)$value) {
//Log::debug('Is an empty string.');
// Log::debug('Is an empty string.');
// don't store blank strings.
if (null !== $entry) {
Log::debug('Will not store empty strings, delete meta value');