kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-18 15:39:50 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup [skip ci]

Browse Source
This commit is contained in:
James Cole
2018-06-06 21:23:00 +02:00
parent 20044427b4
commit 4a12d4d156
75 changed files with 319 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Transaction/BulkController.php
View File

@@ -87,7 +87,7 @@ class BulkController extends Controller
/**
* @param BulkEditJournalRequest $request
* @param BulkEditJournalRequest $request
*
* @return mixed
*/

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

@@ -98,8 +98,9 @@ class ConvertController extends Controller
return view(
'transactions.convert', compact(
'sourceType', 'destinationType', 'journal', 'positiveAmount', 'sourceAccount', 'destinationAccount', 'sourceType', 'subTitle', 'subTitleIcon'
)
'sourceType', 'destinationType', 'journal', 'positiveAmount', 'sourceAccount', 'destinationAccount', 'sourceType',
'subTitle', 'subTitleIcon'
)
);
}

9
app/Http/Controllers/Transaction/MassController.php
View File

@@ -24,7 +24,6 @@ namespace FireflyIII\Http\Controllers\Transaction;
use Carbon\Carbon;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Helpers\Filter\NegativeAmountFilter;
use FireflyIII\Helpers\Filter\TransactionViewFilter;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\MassDeleteJournalRequest;
@@ -37,10 +36,9 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Transformers\TransactionTransformer;
use Illuminate\Support\Collection;
use Illuminate\View\View as IlluminateView;
use Preferences;
use Symfony\Component\HttpFoundation\ParameterBag;
use View;
use Illuminate\View\View as IlluminateView;
/**
* Class MassController.
@@ -155,10 +153,11 @@ class MassController extends Controller
// transform to array
$transactions = $collection->map(
function (Transaction $transaction) use ($transformer) {
$transaction= $transformer->transform($transaction);
$transaction = $transformer->transform($transaction);
// make sure amount is positive:
$transaction['amount'] = app('steam')->positive((string)$transaction['amount']);
$transaction['amount'] = app('steam')->positive((string)$transaction['amount']);
$transaction['foreign_amount'] = app('steam')->positive((string)$transaction['foreign_amount']);
return $transaction;
}
);