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

Clean up for #2662

Browse Source
This commit is contained in:
James Cole
2019-09-27 20:36:52 +02:00
parent 21f98be3e7
commit 7337d73c1d
1 changed files with 14 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
app/Http/Controllers/PiggyBankController.php
View File

@@ -89,14 +89,7 @@ class PiggyBankController extends Controller
$savedSoFar = $this->piggyRepos->getCurrentAmount($piggyBank); $savedSoFar = $this->piggyRepos->getCurrentAmount($piggyBank);
$leftToSave = bcsub($piggyBank->targetamount, $savedSoFar); $leftToSave = bcsub($piggyBank->targetamount, $savedSoFar);
$maxAmount = min($leftOnAccount, $leftToSave); $maxAmount = min($leftOnAccount, $leftToSave);
$currency = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
// get currency:
$currency = app('amount')->getDefaultCurrency();
// TODO we can use getAccountCurrency() instead
$currencyId = (int)$this->accountRepos->getMetaValue($piggyBank->account, 'currency_id');
if ($currencyId > 0) {
$currency = $this->currencyRepos->findNull($currencyId);
}
return view('piggy-banks.add', compact('piggyBank', 'maxAmount', 'currency')); return view('piggy-banks.add', compact('piggyBank', 'maxAmount', 'currency'));
} }
@@ -116,14 +109,7 @@ class PiggyBankController extends Controller
$savedSoFar = $this->piggyRepos->getCurrentAmount($piggyBank); $savedSoFar = $this->piggyRepos->getCurrentAmount($piggyBank);
$leftToSave = bcsub($piggyBank->targetamount, $savedSoFar); $leftToSave = bcsub($piggyBank->targetamount, $savedSoFar);
$maxAmount = min($leftOnAccount, $leftToSave); $maxAmount = min($leftOnAccount, $leftToSave);
$currency = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
// get currency:
$currency = app('amount')->getDefaultCurrency();
// TODO we can use getAccountCurrency() instead
$currencyId = (int)$this->accountRepos->getMetaValue($piggyBank->account, 'currency_id');
if ($currencyId > 0) {
$currency = $this->currencyRepos->findNull($currencyId);
}
return view('piggy-banks.add-mobile', compact('piggyBank', 'maxAmount', 'currency')); return view('piggy-banks.add-mobile', compact('piggyBank', 'maxAmount', 'currency'));
} }
@@ -292,12 +278,11 @@ class PiggyBankController extends Controller
*/ */
public function postAdd(Request $request, PiggyBank $piggyBank): RedirectResponse public function postAdd(Request $request, PiggyBank $piggyBank): RedirectResponse
{ {
$amount = $request->get('amount') ?? '0'; $amount = $request->get('amount') ?? '0';
$currency = app('amount')->getDefaultCurrency(); $currency = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
// TODO we can use getAccountCurrency() instead // if amount is negative, make positive and continue:
$currencyId = (int)$this->accountRepos->getMetaValue($piggyBank->account, 'currency_id'); if (-1 === bccomp($amount, '0')) {
if ($currencyId > 0) { $amount = bcmul($amount, '-1');
$currency = $this->currencyRepos->findNull($currencyId);
} }
if ($this->piggyRepos->canAddAmount($piggyBank, $amount)) { if ($this->piggyRepos->canAddAmount($piggyBank, $amount)) {
$this->piggyRepos->addAmount($piggyBank, $amount); $this->piggyRepos->addAmount($piggyBank, $amount);
@@ -335,12 +320,11 @@ class PiggyBankController extends Controller
*/ */
public function postRemove(Request $request, PiggyBank $piggyBank): RedirectResponse public function postRemove(Request $request, PiggyBank $piggyBank): RedirectResponse
{ {
$amount = $request->get('amount') ?? '0'; $amount = $request->get('amount') ?? '0';
$currency = app('amount')->getDefaultCurrency(); $currency = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
// TODO we can use getAccountCurrency() instead // if amount is negative, make positive and continue:
$currencyId = (int)$this->accountRepos->getMetaValue($piggyBank->account, 'currency_id'); if (-1 === bccomp($amount, '0')) {
if ($currencyId > 0) { $amount = bcmul($amount, '-1');
$currency = $this->currencyRepos->findNull($currencyId);
} }
if ($this->piggyRepos->canRemoveAmount($piggyBank, $amount)) { if ($this->piggyRepos->canRemoveAmount($piggyBank, $amount)) {
$this->piggyRepos->removeAmount($piggyBank, $amount); $this->piggyRepos->removeAmount($piggyBank, $amount);
@@ -379,13 +363,7 @@ class PiggyBankController extends Controller
public function remove(PiggyBank $piggyBank) public function remove(PiggyBank $piggyBank)
{ {
$repetition = $this->piggyRepos->getRepetition($piggyBank); $repetition = $this->piggyRepos->getRepetition($piggyBank);
// get currency: $currency = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
$currency = app('amount')->getDefaultCurrency();
// TODO we can use getAccountCurrency() instead
$currencyId = (int)$this->accountRepos->getMetaValue($piggyBank->account, 'currency_id');
if ($currencyId > 0) {
$currency = $this->currencyRepos->findNull($currencyId);
}
return view('piggy-banks.remove', compact('piggyBank', 'repetition', 'currency')); return view('piggy-banks.remove', compact('piggyBank', 'repetition', 'currency'));
} }
@@ -400,14 +378,7 @@ class PiggyBankController extends Controller
public function removeMobile(PiggyBank $piggyBank) public function removeMobile(PiggyBank $piggyBank)
{ {
$repetition = $this->piggyRepos->getRepetition($piggyBank); $repetition = $this->piggyRepos->getRepetition($piggyBank);
// get currency: $currency = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
$currency = app('amount')->getDefaultCurrency();
// TODO we can use getAccountCurrency() instead
$currencyId = (int)$this->accountRepos->getMetaValue($piggyBank->account, 'currency_id');
if ($currencyId > 0) {
$currency = $this->currencyRepos->findNull($currencyId);
}
return view('piggy-banks.remove-mobile', compact('piggyBank', 'repetition', 'currency')); return view('piggy-banks.remove-mobile', compact('piggyBank', 'repetition', 'currency'));
} }