kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-03 20:55:05 +00:00
Code Issues Projects Releases Wiki Activity

Various code clean up.

Browse Source
This commit is contained in:
James Cole
2017-06-07 07:38:58 +02:00
parent 51ddcd9ee1
commit e5db5a7b5c
8 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/BudgetController.php
View File

@@ -183,6 +183,7 @@ class BudgetController extends Controller
$start = new Carbon($moment);
$end = Navigation::endOfPeriod($start, $range);
} catch (Exception $e) {
// start and end are already defined.
}
}

2
app/Http/Controllers/Chart/AccountController.php
View File

@@ -349,7 +349,7 @@ class AccountController extends Controller
$cache->addProperty('chart.account.period');
$cache->addProperty($account->id);
if ($cache->has()) {
//return Response::json($cache->get()); // @codeCoverageIgnore
return Response::json($cache->get()); // @codeCoverageIgnore
}
$format = (string)trans('config.month_and_day');

16
app/Http/Controllers/Transaction/ConvertController.php
View File

@@ -174,14 +174,17 @@ class ConvertController extends Controller
switch ($joined) {
default:
throw new FireflyException('Cannot handle ' . $joined); // @codeCoverageIgnore
case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT: // one
case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT:
// one
$destination = $sourceAccount;
break;
case TransactionType::WITHDRAWAL . '-' . TransactionType::TRANSFER: // two
case TransactionType::WITHDRAWAL . '-' . TransactionType::TRANSFER:
// two
$destination = $accountRepository->find(intval($data['destination_account_asset']));
break;
case TransactionType::DEPOSIT . '-' . TransactionType::WITHDRAWAL: // three
case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL: // five
case TransactionType::DEPOSIT . '-' . TransactionType::WITHDRAWAL:
case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL:
// three and five
if ($data['destination_account_expense'] === '') {
// destination is a cash account.
$destination = $accountRepository->getCashAccount();
@@ -197,8 +200,9 @@ class ConvertController extends Controller
];
$destination = $accountRepository->store($data);
break;
case TransactionType::DEPOSIT . '-' . TransactionType::TRANSFER: // four
case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT: // six
case TransactionType::DEPOSIT . '-' . TransactionType::TRANSFER:
case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT:
// four and six
$destination = $destinationAccount;
break;
}

2
app/Support/Search/Search.php
View File

@@ -53,7 +53,7 @@ class Search implements SearchInterface
public function __construct()
{
$this->modifiers = new Collection;
$this->validModifiers = config('firefly.search_modifiers');
$this->validModifiers = (array) config('firefly.search_modifiers');
}
/**

8
app/Support/Steam.php
View File

@@ -135,7 +135,7 @@ class Steam
$cache->addProperty($start);
$cache->addProperty($end);
if ($cache->has()) {
//return $cache->get(); // @codeCoverageIgnore
return $cache->get(); // @codeCoverageIgnore
}
$start->subDay();
@@ -167,10 +167,6 @@ class Steam
]
);
// echo '<pre>';
// var_dump($set->toArray());
// exit;
$currentBalance = $startBalance;
/** @var Transaction $entry */
foreach ($set as $entry) {
@@ -217,7 +213,7 @@ class Steam
$cache->addProperty('balances');
$cache->addProperty($date);
if ($cache->has()) {
//return $cache->get(); // @codeCoverageIgnore
return $cache->get(); // @codeCoverageIgnore
}
// need to do this per account.

2
public/js/ff/budgets/show.js
View File

@@ -8,7 +8,7 @@
* See the LICENSE file for details.
*/
/** global: budgetChartUri, expenseCategoryUri, expenseAssetUri, expenseExpenseUri */
/** global: budgetChartUri, expenseCategoryUri, expenseAssetUri, expenseExpenseUri, budgetLimitID */
$(function () {
"use strict";

2
public/js/ff/transactions/single/edit.js
View File

@@ -32,8 +32,6 @@ $(document).ready(function () {
*/
function updateInitialPage() {
console.log('Native currency is #' + journalData.native_currency.id + ' and (foreign) currency id is #' + journalData.currency.id);
if (journal.transaction_type.type === "Transfer") {
$('#native_amount_holder').hide();
$('#amount_holder').hide();

4
test.sh
View File

@@ -87,6 +87,10 @@ then
# call test data generation script
$(which php) /sites/FF3/test-data/artisan generate:data local sqlite
# also run upgrade routine:
$(which php) /sites/FF3/firefly-iii/artisan firefly:upgrade-database
# copy new database over backup (resets backup)
cp $DATABASE $DATABASECOPY
fi