This commit is contained in:
James Cole
2021-07-04 07:58:11 +02:00
parent d35b0ea279
commit a09d831613
4 changed files with 23 additions and 10 deletions

View File

@@ -23,6 +23,7 @@
declare(strict_types=1);
namespace FireflyIII\Repositories\PiggyBank;
use Carbon\Carbon;
use Exception;
use FireflyIII\Exceptions\FireflyException;
@@ -90,7 +91,7 @@ trait ModifiesPiggyBanks
$leftOnAccount = $this->leftOnAccount($piggyBank, today(config('app.timezone')));
$savedSoFar = (string)$this->getRepetition($piggyBank)->currentamount;
$leftToSave = bcsub($piggyBank->targetamount, $savedSoFar);
$maxAmount = (string)min(round((float)$leftOnAccount, 12), round((float)$leftToSave, 12));
$maxAmount = 1 === bccomp($leftOnAccount, $leftToSave) ? $leftToSave : $leftOnAccount;
$compare = bccomp($amount, $maxAmount);
$result = $compare <= 0;

View File

@@ -58,9 +58,9 @@ class ExpandedForm
unset($options['currency'], $options['placeholder']);
// make sure value is formatted nicely:
if (null !== $value && '' !== $value) {
$value = round((float)$value, 8);
}
//if (null !== $value && '' !== $value) {
//$value = round((float)$value, 8);
//}
try {
$html = prefixView('form.amount-no-currency', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
@@ -224,6 +224,7 @@ class ExpandedForm
}
$selectList[$entryId] = $title;
}
return $selectList;
}
@@ -246,7 +247,7 @@ class ExpandedForm
// make sure value is formatted nicely:
if (null !== $value && '' !== $value) {
$value = round((float)$value, $selectedCurrency->decimal_places);
// $value = round((float)$value, $selectedCurrency->decimal_places);
}
try {
$html = prefixView('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render();

View File

@@ -130,8 +130,8 @@ trait ModelInformation
$billTriggers = ['currency_is', 'amount_more', 'amount_less', 'description_contains'];
$values = [
$bill->transactionCurrency()->first()->name,
round((float)$bill->amount_min, 12),
round((float)$bill->amount_max, 12),
round((float)$bill->amount_min, 24),
round((float)$bill->amount_max, 24),
$bill->name,
];
foreach ($billTriggers as $index => $trigger) {

View File

@@ -8,7 +8,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Added
- A few new pages for the new v2 layout. Thanks @alex6480!
- Feature to be able to rebuild Docker images and show security warnings in new builds.
- Added a new currency yay!
- You can now manage loans and debts a little better.
@@ -16,10 +15,22 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- A better cache routine for layout v2 pages.
- All LDAP libraries have been upgrade.
### Deprecated
- Initial release.
### Removed
- All telemetry options have been removed.
### Fixed
- #4894 Bad number comparison
- Various Sonarqube issues, thanks @hazma-fadil!
- Correct menu display, thanks @vonsogt!
### Security
- Feature to be able to rebuild Docker images and show security warnings in new builds.
### API
- You can disable webhooks with an extra field in API submissions.
- There is a static cron token (see `.env.example`) which is useful for Docker.