kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 20:16:22 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup.

Browse Source 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
This commit is contained in:
James Cole
2016-08-26 09:30:52 +02:00
parent d0c6afc3a9
commit a9444ac702
60 changed files with 165 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Support/Amount.php
View File

@@ -114,7 +114,7 @@ class Amount
{
$currency = $transaction->transactionJournal->transactionCurrency;
return $this->formatAnything($currency, $transaction->amount, $coloured);
return $this->formatAnything($currency, strval($transaction->amount), $coloured);
}
/**

3
app/Support/Migration/TestData.php
View File

@@ -98,8 +98,7 @@ class TestData
*/
private function createAttachments()
{
$insert = [];
$disk = Storage::disk('upload');
$disk = Storage::disk('upload');
foreach ($this->data['attachments'] as $attachment) {
$data = Crypt::encrypt($attachment['content']);
$attachmentId = DB::table('attachments')->insertGetId(

3
app/Support/Preferences.php
View File

@@ -57,10 +57,11 @@ class Preferences
}
/**
* @param User $user
* @param string $name
* @param string $default
*
* @return null|\FireflyIII\Models\Preference
* @return Preference|null
*/
public function getForUser(User $user, $name, $default = null)
{

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

@@ -111,7 +111,7 @@ class Search implements SearchInterface
public function searchTransactions(array $words): Collection
{
// decrypted transaction journals:
$decrypted = Auth::user()->transactionjournals()->expanded()->where('transaction_journals.encrypted', 0)->where(
$decrypted = Auth::user()->transactionJournals()->expanded()->where('transaction_journals.encrypted', 0)->where(
function (EloquentBuilder $q) use ($words) {
foreach ($words as $word) {
$q->orWhere('transaction_journals.description', 'LIKE', '%' . e($word) . '%');
@@ -120,7 +120,7 @@ class Search implements SearchInterface
)->get(TransactionJournal::queryFields());
// encrypted
$all = Auth::user()->transactionjournals()->expanded()->where('transaction_journals.encrypted', 1)->get(TransactionJournal::queryFields());
$all = Auth::user()->transactionJournals()->expanded()->where('transaction_journals.encrypted', 1)->get(TransactionJournal::queryFields());
$set = $all->filter(
function (TransactionJournal $journal) use ($words) {
foreach ($words as $word) {

2
app/Support/Twig/Budget.php
View File

@@ -39,7 +39,7 @@ class Budget extends Twig_Extension
return $cache->get();
}
$sum
= Auth::user()->transactionjournals()
= Auth::user()->transactionJournals()
->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budget_transaction_journal.budget_id')
->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')