kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 02:45:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix linking piggy banks to transactions.

Browse Source
This commit is contained in:
James Cole
2025-01-02 04:54:29 +01:00
parent f727a38b69
commit e878d5ce07
3 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/Repositories/PiggyBank/PiggyBankRepository.php
View File

@@ -154,20 +154,31 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
/** @var Transaction $destination */ /** @var Transaction $destination */
$destination = $journal->transactions()->with(['account'])->where('amount', '>', 0)->first(); $destination = $journal->transactions()->with(['account'])->where('amount', '>', 0)->first();
$hits = 0;
foreach($piggyBank->accounts as $account) {
// matches source, which means amount will be removed from piggy: // matches source, which means amount will be removed from piggy:
if ($source->account_id === $piggyBank->account_id) { if($account->id === $source->account_id) {
$operator = 'negative'; $operator = 'negative';
$currency = $accountRepos->getAccountCurrency($source->account) ?? $defaultCurrency; $currency = $accountRepos->getAccountCurrency($source->account) ?? $defaultCurrency;
app('log')->debug(sprintf('Currency will draw money out of piggy bank. Source currency is %s', $currency->code)); app('log')->debug(sprintf('Currency will draw money out of piggy bank. Source currency is %s', $currency->code));
$hits++;
}
// matches destination, which means amount will be added to piggy.
if ($account->id === $destination->account_id) {
$operator = 'positive';
$currency = $accountRepos->getAccountCurrency($destination->account) ?? $defaultCurrency;
app('log')->debug(sprintf('Currency will add money to piggy bank. Destination currency is %s', $currency->code));
$hits++;
}
}
if ($hits > 1) {
app('log')->debug(sprintf('Transaction journal is related to %d of the accounts, cannot determine what to do. Return "0".', $hits));
return '0';
} }
// matches destination, which means amount will be added to piggy.
if ($destination->account_id === $piggyBank->account_id) {
$operator = 'positive';
$currency = $accountRepos->getAccountCurrency($destination->account) ?? $defaultCurrency;
app('log')->debug(sprintf('Currency will add money to piggy bank. Destination currency is %s', $currency->code));
}
if (null === $operator || null === $currency) { if (null === $operator || null === $currency) {
app('log')->debug('Currency is NULL and operator is NULL, return "0".'); app('log')->debug('Currency is NULL and operator is NULL, return "0".');

19
app/Rules/BelongsUser.php
View File

@@ -80,19 +80,30 @@ class BelongsUser implements ValidationRule
private function validatePiggyBankId(int $value): bool private function validatePiggyBankId(int $value): bool
{ {
$count = PiggyBank::leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')
$count = PiggyBank
::leftJoin('account_piggy_bank','account_piggy_bank.piggy_bank_id','=','piggy_banks.id')
->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
->where('piggy_banks.id', '=', $value) ->where('piggy_banks.id', '=', $value)
->where('accounts.user_id', '=', auth()->user()->id)->count() ->where('accounts.user_id', '=', auth()->user()->id)->count()
; ;
return 1 === $count; return $count > 0;
} }
private function validatePiggyBankName(string $value): bool private function validatePiggyBankName(string $value): bool
{ {
$count = $this->countField(PiggyBank::class, 'name', $value); $count = PiggyBank
::leftJoin('account_piggy_bank','account_piggy_bank.piggy_bank_id','=','piggy_banks.id')
->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
->where('piggy_banks.name', '=', $value)
->where('accounts.user_id', '=', auth()->user()->id)->count()
;
return 1 === $count; return $count>0;
} }
protected function countField(string $class, string $field, string $value): int protected function countField(string $class, string $field, string $value): int

5
resources/views/list/piggy-bank-events.twig
View File

@@ -23,11 +23,10 @@
</td> </td>
<td style="text-align: right;"> <td style="text-align: right;">
{% if event.amount < 0 %} {% if event.amount < 0 %}
<span class="text-danger money-negative">{{ trans('firefly.removed_amount', {amount: formatAmountBySymbol(event.amount,event.piggyBank.transactionCurrency.symbol, false)})|raw }}</span> <span class="text-danger money-negative">{{ trans('firefly.removed_amount', {amount: formatAmountBySymbol(event.amount,event.piggyBank.transactionCurrency.symbol, event.piggyBank.transactionCurrency.decimal_places, false)})|raw }}</span>
{% else %} {% else %}
<span class="text-success money-positive">{{ trans('firefly.added_amount', {amount: formatAmountBySymbol(event.amount, event.piggyBank.transactionCurrency.symbol, false)})|raw }}</span> <span class="text-success money-positive">{{ trans('firefly.added_amount', {amount: formatAmountBySymbol(event.amount, event.piggyBank.transactionCurrency.symbol, event.piggyBank.transactionCurrency.decimal_places, false)})|raw }}</span>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>