kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-06 12:45:30 +00:00
Code Issues Projects Releases Wiki Activity

Code clean up.

Browse Source
This commit is contained in:
James Cole
2017-11-15 12:25:49 +01:00
parent 57dcdfa0c4
commit ffca858b8d
476 changed files with 2055 additions and 4181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/TransactionController.php
View File

@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Http\Controllers;
@@ -42,9 +41,7 @@ use Response;
use View;
/**
* Class TransactionController
*
* @package FireflyIII\Http\Controllers
* Class TransactionController.
*/
class TransactionController extends Controller
{
@@ -55,7 +52,6 @@ class TransactionController extends Controller
{
parent::__construct();
$this->middleware(
function ($request, $next) {
View::share('title', trans('firefly.transactions'));
@@ -70,7 +66,6 @@ class TransactionController extends Controller
* @param Request $request
* @param JournalRepositoryInterface $repository
* @param string $what
*
* @param string $moment
*
* @return View
@@ -89,7 +84,7 @@ class TransactionController extends Controller
$path = route('transactions.index', [$what]);
// prep for "all" view.
if ($moment === 'all') {
if ('all' === $moment) {
$subTitle = trans('firefly.all_' . $what);
$first = $repository->first();
$start = $first->date ?? new Carbon;
@@ -98,7 +93,7 @@ class TransactionController extends Controller
}
// prep for "specific date" view.
if (strlen($moment) > 0 && $moment !== 'all') {
if (strlen($moment) > 0 && 'all' !== $moment) {
$start = new Carbon($moment);
$end = Navigation::endOfPeriod($start, $range);
$path = route('transactions.index', [$what, $moment]);
@@ -110,7 +105,7 @@ class TransactionController extends Controller
}
// prep for current period
if (strlen($moment) === 0) {
if (0 === strlen($moment)) {
$start = clone session('start', Navigation::startOfPeriod(new Carbon, $range));
$end = clone session('end', Navigation::endOfPeriod(new Carbon, $range));
$periods = $this->getPeriodOverview($what);
@@ -127,7 +122,6 @@ class TransactionController extends Controller
$transactions = $collector->getPaginatedJournals();
$transactions->setPath($path);
return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'transactions', 'periods', 'start', 'end', 'moment'));
}
@@ -163,7 +157,7 @@ class TransactionController extends Controller
$journal = $repository->find(intval($id));
if ($journal && $journal->date->isSameDay($date)) {
$repository->setOrder($journal, $order);
$order++;
++$order;
}
}
}
@@ -175,7 +169,6 @@ class TransactionController extends Controller
/**
* @param TransactionJournal $journal
* @param JournalTaskerInterface $tasker
*
* @param LinkTypeRepositoryInterface $linkTypeRepository
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
@@ -199,6 +192,7 @@ class TransactionController extends Controller
* @param string $what
*
* @return Collection
*
* @throws FireflyException
*/
private function getPeriodOverview(string $what): Collection
@@ -290,7 +284,7 @@ class TransactionController extends Controller
}
// save amount:
$return[$currencyId]['sum'] = bcadd($return[$currencyId]['sum'], $transaction->transaction_amount);
$return[$currencyId]['count']++;
++$return[$currencyId]['count'];
}
asort($return);