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

Auto commit for release 'develop' on 2024-11-03

Browse Source
This commit is contained in:
github-actions
2024-11-03 09:01:53 +01:00
parent 2c1b9534f3
commit ab31a72199
11 changed files with 315 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/TransactionRules/Actions/UpdatePiggybank.php
View File

@@ -102,7 +102,7 @@ class UpdatePiggybank implements ActionInterface
}
if ($destination->account_id === $piggyBank->account_id) {
app('log')->debug('Piggy bank account is linked to source, so add amount to piggy bank.');
$this->addAmount($piggyBank,$journal, $journalObj, $destination->amount);
$this->addAmount($piggyBank, $journal, $journalObj, $destination->amount);
event(
new TriggeredAuditLog(
@@ -111,10 +111,10 @@ class UpdatePiggybank implements ActionInterface
'add_to_piggy',
null,
[
'currency_symbol' => $journalObj->transactionCurrency->symbol,
'decimal_places' => $journalObj->transactionCurrency->decimal_places,
'amount' => $destination->amount,
'piggy' => $piggyBank->name,
'currency_symbol' => $journalObj->transactionCurrency->symbol,
'decimal_places' => $journalObj->transactionCurrency->decimal_places,
'amount' => $destination->amount,
'piggy' => $piggyBank->name,
'piggy_id' => $piggyBank->id,
]
)
@@ -163,7 +163,7 @@ class UpdatePiggybank implements ActionInterface
// make sure we can remove amount:
if (false === $repository->canRemoveAmount($piggyBank, $amount)) {
app('log')->warning(sprintf('Cannot remove %s from piggy bank.', $amount));
event(new RuleActionFailedOnArray($this->action, $array, trans('rules.cannot_remove_from_piggy', ['amount' => $amount,'name' => $piggyBank->name])));
event(new RuleActionFailedOnArray($this->action, $array, trans('rules.cannot_remove_from_piggy', ['amount' => $amount, 'name' => $piggyBank->name])));
return;
}
@@ -194,13 +194,14 @@ class UpdatePiggybank implements ActionInterface
if (0 === bccomp('0', $amount)) {
app('log')->warning('Amount left is zero, stop.');
event(new RuleActionFailedOnArray($this->action, $array, trans('rules.cannot_add_zero_piggy', ['name' => $piggyBank->name])));
return;
}
// make sure we can add amount:
if (false === $repository->canAddAmount($piggyBank, $amount)) {
app('log')->warning(sprintf('Cannot add %s to piggy bank.', $amount));
event(new RuleActionFailedOnArray($this->action, $array, trans('rules.cannot_add_to_piggy', ['amount' => $amount,'name' => $piggyBank->name])));
event(new RuleActionFailedOnArray($this->action, $array, trans('rules.cannot_add_to_piggy', ['amount' => $amount, 'name' => $piggyBank->name])));
return;
}