2016-05-20 01:57:45 -05:00
|
|
|
<?php
|
2016-05-20 05:27:31 -05:00
|
|
|
/**
|
|
|
|
* CategoryController.php
|
2017-10-21 01:40:00 -05:00
|
|
|
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
2016-05-20 05:27:31 -05:00
|
|
|
*
|
2017-10-21 01:40:00 -05:00
|
|
|
* This file is part of Firefly III.
|
2016-10-04 23:52:15 -05:00
|
|
|
*
|
2017-10-21 01:40:00 -05:00
|
|
|
* Firefly III is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* Firefly III is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2017-12-17 07:41:58 -06:00
|
|
|
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
|
2016-05-20 05:27:31 -05:00
|
|
|
*/
|
2017-04-08 02:00:37 -05:00
|
|
|
declare(strict_types=1);
|
2016-05-20 01:57:45 -05:00
|
|
|
|
|
|
|
namespace FireflyIII\Http\Controllers;
|
2015-02-22 09:19:32 -06:00
|
|
|
|
2015-02-25 08:19:14 -06:00
|
|
|
use Carbon\Carbon;
|
2016-12-18 03:37:59 -06:00
|
|
|
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
|
2017-04-28 13:08:25 -05:00
|
|
|
use FireflyIII\Helpers\Filter\InternalTransferFilter;
|
2015-02-22 09:19:32 -06:00
|
|
|
use FireflyIII\Http\Requests\CategoryFormRequest;
|
2016-05-24 09:08:43 -05:00
|
|
|
use FireflyIII\Models\AccountType;
|
2015-02-22 09:19:32 -06:00
|
|
|
use FireflyIII\Models\Category;
|
2017-03-10 12:34:46 -06:00
|
|
|
use FireflyIII\Models\TransactionType;
|
2016-10-10 00:49:39 -05:00
|
|
|
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
2016-12-27 03:46:11 -06:00
|
|
|
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
|
2017-03-10 12:34:46 -06:00
|
|
|
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
|
2015-09-25 09:00:14 -05:00
|
|
|
use FireflyIII\Support\CacheProperties;
|
2016-12-28 06:02:56 -06:00
|
|
|
use Illuminate\Http\Request;
|
2017-12-28 02:53:21 -06:00
|
|
|
use Illuminate\Pagination\LengthAwarePaginator;
|
2015-09-25 09:00:14 -05:00
|
|
|
use Illuminate\Support\Collection;
|
2017-03-10 12:34:46 -06:00
|
|
|
use Log;
|
2015-06-02 10:44:50 -05:00
|
|
|
use Preferences;
|
2017-03-10 12:34:46 -06:00
|
|
|
use Steam;
|
2015-04-05 12:43:20 -05:00
|
|
|
use View;
|
2015-02-22 09:19:32 -06:00
|
|
|
|
|
|
|
/**
|
2017-11-15 05:25:49 -06:00
|
|
|
* Class CategoryController.
|
2015-02-22 09:19:32 -06:00
|
|
|
*/
|
|
|
|
class CategoryController extends Controller
|
|
|
|
{
|
2015-02-24 15:53:38 -06:00
|
|
|
/**
|
2016-02-04 00:27:03 -06:00
|
|
|
*
|
2015-02-24 15:53:38 -06:00
|
|
|
*/
|
2015-02-22 09:19:32 -06:00
|
|
|
public function __construct()
|
|
|
|
{
|
2015-04-28 08:26:30 -05:00
|
|
|
parent::__construct();
|
2016-10-29 00:44:46 -05:00
|
|
|
|
|
|
|
$this->middleware(
|
|
|
|
function ($request, $next) {
|
2017-12-16 12:46:36 -06:00
|
|
|
app('view')->share('title', trans('firefly.categories'));
|
|
|
|
app('view')->share('mainTitleIcon', 'fa-bar-chart');
|
2016-10-29 00:44:46 -05:00
|
|
|
|
|
|
|
return $next($request);
|
|
|
|
}
|
|
|
|
);
|
2015-02-22 09:19:32 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2017-02-17 13:14:22 -06:00
|
|
|
* @param Request $request
|
|
|
|
*
|
2016-08-26 02:30:52 -05:00
|
|
|
* @return View
|
2015-02-22 09:19:32 -06:00
|
|
|
*/
|
2017-02-17 13:14:22 -06:00
|
|
|
public function create(Request $request)
|
2015-02-22 09:19:32 -06:00
|
|
|
{
|
2017-11-15 05:25:49 -06:00
|
|
|
if (true !== session('categories.create.fromStore')) {
|
2017-02-05 01:26:54 -06:00
|
|
|
$this->rememberPreviousUri('categories.create.uri');
|
2015-04-01 02:43:19 -05:00
|
|
|
}
|
2017-02-17 13:14:22 -06:00
|
|
|
$request->session()->forget('categories.create.fromStore');
|
2015-06-09 10:56:08 -05:00
|
|
|
$subTitle = trans('firefly.create_new_category');
|
2015-04-01 02:43:19 -05:00
|
|
|
|
2015-05-05 03:23:01 -05:00
|
|
|
return view('categories.create', compact('subTitle'));
|
2015-02-22 09:19:32 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param Category $category
|
|
|
|
*
|
2016-08-26 02:30:52 -05:00
|
|
|
* @return View
|
2015-02-22 09:19:32 -06:00
|
|
|
*/
|
2017-12-29 02:05:35 -06:00
|
|
|
public function delete(Category $category)
|
2015-02-22 09:19:32 -06:00
|
|
|
{
|
2015-05-25 15:16:00 -05:00
|
|
|
$subTitle = trans('firefly.delete_category', ['name' => $category->name]);
|
2015-02-22 09:19:32 -06:00
|
|
|
|
2015-04-01 02:43:19 -05:00
|
|
|
// put previous url in session
|
2017-02-05 01:26:54 -06:00
|
|
|
$this->rememberPreviousUri('categories.delete.uri');
|
2015-04-01 02:43:19 -05:00
|
|
|
|
2015-02-22 09:19:32 -06:00
|
|
|
return view('categories.delete', compact('category', 'subTitle'));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2017-02-17 13:14:22 -06:00
|
|
|
* @param Request $request
|
2016-12-27 03:46:11 -06:00
|
|
|
* @param CategoryRepositoryInterface $repository
|
|
|
|
* @param Category $category
|
2015-02-22 09:19:32 -06:00
|
|
|
*
|
2016-12-27 03:46:11 -06:00
|
|
|
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
2015-02-22 09:19:32 -06:00
|
|
|
*/
|
2017-02-17 13:14:22 -06:00
|
|
|
public function destroy(Request $request, CategoryRepositoryInterface $repository, Category $category)
|
2015-02-22 09:19:32 -06:00
|
|
|
{
|
2017-02-05 01:26:54 -06:00
|
|
|
$name = $category->name;
|
2015-02-22 09:19:32 -06:00
|
|
|
$repository->destroy($category);
|
|
|
|
|
2017-10-19 11:08:50 -05:00
|
|
|
$request->session()->flash('success', strval(trans('firefly.deleted_category', ['name' => $name])));
|
2015-06-02 10:44:50 -05:00
|
|
|
Preferences::mark();
|
2015-02-22 09:19:32 -06:00
|
|
|
|
2017-02-05 01:26:54 -06:00
|
|
|
return redirect($this->getPreviousUri('categories.delete.uri'));
|
2015-02-22 09:19:32 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2017-02-17 13:14:22 -06:00
|
|
|
* @param Request $request
|
2015-02-22 09:19:32 -06:00
|
|
|
* @param Category $category
|
|
|
|
*
|
2016-08-26 02:30:52 -05:00
|
|
|
* @return View
|
2015-02-22 09:19:32 -06:00
|
|
|
*/
|
2017-02-17 13:14:22 -06:00
|
|
|
public function edit(Request $request, Category $category)
|
2015-02-22 09:19:32 -06:00
|
|
|
{
|
2015-06-09 10:56:08 -05:00
|
|
|
$subTitle = trans('firefly.edit_category', ['name' => $category->name]);
|
2015-02-22 09:19:32 -06:00
|
|
|
|
2015-04-01 02:43:19 -05:00
|
|
|
// put previous url in session if not redirect from store (not "return_to_edit").
|
2017-11-15 05:25:49 -06:00
|
|
|
if (true !== session('categories.edit.fromUpdate')) {
|
2017-02-05 01:26:54 -06:00
|
|
|
$this->rememberPreviousUri('categories.edit.uri');
|
2015-04-01 02:43:19 -05:00
|
|
|
}
|
2017-02-17 13:14:22 -06:00
|
|
|
$request->session()->forget('categories.edit.fromUpdate');
|
2015-04-01 02:43:19 -05:00
|
|
|
|
2015-02-22 09:19:32 -06:00
|
|
|
return view('categories.edit', compact('category', 'subTitle'));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2016-12-27 03:46:11 -06:00
|
|
|
* @param CategoryRepositoryInterface $repository
|
2015-04-05 12:43:20 -05:00
|
|
|
*
|
2016-08-26 02:30:52 -05:00
|
|
|
* @return View
|
2015-02-22 09:19:32 -06:00
|
|
|
*/
|
2017-12-28 02:53:21 -06:00
|
|
|
public function index(Request $request, CategoryRepositoryInterface $repository)
|
2015-02-22 09:19:32 -06:00
|
|
|
{
|
2017-12-28 02:53:21 -06:00
|
|
|
$page = 0 === intval($request->get('page')) ? 1 : intval($request->get('page'));
|
|
|
|
$pageSize = intval(Preferences::get('listPageSize', 50)->data);
|
|
|
|
$collection = $repository->getCategories();
|
|
|
|
$total = $collection->count();
|
|
|
|
$collection = $collection->slice(($page - 1) * $pageSize, $pageSize);
|
2015-03-04 02:42:47 -06:00
|
|
|
|
2017-12-28 02:53:21 -06:00
|
|
|
$collection->each(
|
2016-05-08 06:45:23 -05:00
|
|
|
function (Category $category) use ($repository) {
|
|
|
|
$category->lastActivity = $repository->lastUseDate($category, new Collection);
|
2015-03-04 02:42:47 -06:00
|
|
|
}
|
|
|
|
);
|
2015-02-22 09:19:32 -06:00
|
|
|
|
2017-12-28 02:53:21 -06:00
|
|
|
// paginate categories
|
|
|
|
$categories = new LengthAwarePaginator($collection, $total, $pageSize, $page);
|
|
|
|
$categories->setPath(route('categories.index'));
|
|
|
|
|
2015-02-22 09:19:32 -06:00
|
|
|
return view('categories.index', compact('categories'));
|
|
|
|
}
|
|
|
|
|
2015-03-04 02:42:47 -06:00
|
|
|
/**
|
2017-04-09 00:56:46 -05:00
|
|
|
* @param Request $request
|
|
|
|
* @param JournalRepositoryInterface $repository
|
|
|
|
* @param string $moment
|
|
|
|
*
|
2016-08-26 02:30:52 -05:00
|
|
|
* @return View
|
2015-03-04 02:42:47 -06:00
|
|
|
*/
|
2017-03-10 12:34:46 -06:00
|
|
|
public function noCategory(Request $request, JournalRepositoryInterface $repository, string $moment = '')
|
2015-03-04 02:42:47 -06:00
|
|
|
{
|
2017-03-10 12:34:46 -06:00
|
|
|
// default values:
|
2017-07-30 06:53:04 -05:00
|
|
|
$range = Preferences::get('viewRange', '1M')->data;
|
|
|
|
$start = null;
|
|
|
|
$end = null;
|
|
|
|
$periods = new Collection;
|
|
|
|
$page = intval($request->get('page'));
|
2017-12-21 14:18:30 -06:00
|
|
|
$pageSize = intval(Preferences::get('listPageSize', 50)->data);
|
2017-03-10 12:34:46 -06:00
|
|
|
|
|
|
|
// prep for "all" view.
|
2017-11-15 05:25:49 -06:00
|
|
|
if ('all' === $moment) {
|
2017-03-10 12:34:46 -06:00
|
|
|
$subTitle = trans('firefly.all_journals_without_category');
|
|
|
|
$first = $repository->first();
|
|
|
|
$start = $first->date ?? new Carbon;
|
|
|
|
$end = new Carbon;
|
|
|
|
}
|
2016-11-05 04:26:57 -05:00
|
|
|
|
2017-03-10 12:34:46 -06:00
|
|
|
// prep for "specific date" view.
|
2017-11-15 05:25:49 -06:00
|
|
|
if (strlen($moment) > 0 && 'all' !== $moment) {
|
2017-03-10 12:34:46 -06:00
|
|
|
$start = new Carbon($moment);
|
2017-12-17 07:06:14 -06:00
|
|
|
$end = app('navigation')->endOfPeriod($start, $range);
|
2017-03-10 12:34:46 -06:00
|
|
|
$subTitle = trans(
|
|
|
|
'firefly.without_category_between',
|
|
|
|
['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
|
|
|
|
);
|
2017-03-18 02:09:14 -05:00
|
|
|
$periods = $this->getNoCategoryPeriodOverview();
|
2017-03-10 12:34:46 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
// prep for current period
|
2017-11-15 05:25:49 -06:00
|
|
|
if (0 === strlen($moment)) {
|
2017-12-17 07:06:14 -06:00
|
|
|
$start = clone session('start', app('navigation')->startOfPeriod(new Carbon, $range));
|
|
|
|
$end = clone session('end', app('navigation')->endOfPeriod(new Carbon, $range));
|
2017-03-18 02:09:14 -05:00
|
|
|
$periods = $this->getNoCategoryPeriodOverview();
|
2017-03-10 12:34:46 -06:00
|
|
|
$subTitle = trans(
|
|
|
|
'firefly.without_category_between',
|
|
|
|
['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
|
|
|
|
);
|
|
|
|
}
|
2015-03-04 02:42:47 -06:00
|
|
|
|
2017-07-30 06:53:04 -05:00
|
|
|
/** @var JournalCollectorInterface $collector */
|
|
|
|
$collector = app(JournalCollectorInterface::class);
|
2017-09-14 03:39:24 -05:00
|
|
|
$collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutCategory()->withOpposingAccount()
|
2017-09-14 10:40:02 -05:00
|
|
|
->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]);
|
2017-07-30 06:53:04 -05:00
|
|
|
$collector->removeFilter(InternalTransferFilter::class);
|
2017-11-05 14:16:20 -06:00
|
|
|
$transactions = $collector->getPaginatedJournals();
|
|
|
|
$transactions->setPath(route('categories.no-category'));
|
2017-03-10 12:34:46 -06:00
|
|
|
|
2017-11-05 14:16:20 -06:00
|
|
|
return view('categories.no-category', compact('transactions', 'subTitle', 'moment', 'periods', 'start', 'end'));
|
2015-03-04 02:42:47 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2017-03-18 02:09:14 -05:00
|
|
|
* @param Request $request
|
|
|
|
* @param CategoryRepositoryInterface $repository
|
|
|
|
* @param Category $category
|
|
|
|
* @param string $moment
|
2015-03-04 02:42:47 -06:00
|
|
|
*
|
2016-05-24 09:08:43 -05:00
|
|
|
* @return View
|
2015-03-04 02:42:47 -06:00
|
|
|
*/
|
2017-03-18 02:09:14 -05:00
|
|
|
public function show(Request $request, CategoryRepositoryInterface $repository, Category $category, string $moment = '')
|
2015-03-04 02:42:47 -06:00
|
|
|
{
|
2017-03-18 01:46:42 -05:00
|
|
|
// default values:
|
2016-05-17 09:00:27 -05:00
|
|
|
$subTitle = $category->name;
|
|
|
|
$subTitleIcon = 'fa-bar-chart';
|
2017-07-30 06:42:30 -05:00
|
|
|
$page = intval($request->get('page'));
|
2017-12-21 14:18:30 -06:00
|
|
|
$pageSize = intval(Preferences::get('listPageSize', 50)->data);
|
2017-03-18 01:46:42 -05:00
|
|
|
$range = Preferences::get('viewRange', '1M')->data;
|
|
|
|
$start = null;
|
|
|
|
$end = null;
|
|
|
|
$periods = new Collection;
|
2017-12-16 12:48:31 -06:00
|
|
|
$path = route('categories.show', [$category->id]);
|
2015-03-04 02:42:47 -06:00
|
|
|
|
2017-03-18 01:46:42 -05:00
|
|
|
// prep for "all" view.
|
2017-11-15 05:25:49 -06:00
|
|
|
if ('all' === $moment) {
|
2017-03-18 01:46:42 -05:00
|
|
|
$subTitle = trans('firefly.all_journals_for_category', ['name' => $category->name]);
|
2017-09-15 10:35:44 -05:00
|
|
|
$first = $repository->firstUseDate($category);
|
2017-09-16 00:17:58 -05:00
|
|
|
/** @var Carbon $start */
|
2017-11-15 05:25:49 -06:00
|
|
|
$start = null === $first ? new Carbon : $first;
|
2017-10-05 04:49:06 -05:00
|
|
|
$end = new Carbon;
|
2017-12-16 12:48:31 -06:00
|
|
|
$path = route('categories.show', [$category->id, 'all']);
|
2017-03-18 01:46:42 -05:00
|
|
|
}
|
2016-12-27 03:46:11 -06:00
|
|
|
|
2017-03-18 01:46:42 -05:00
|
|
|
// prep for "specific date" view.
|
2017-11-15 05:25:49 -06:00
|
|
|
if (strlen($moment) > 0 && 'all' !== $moment) {
|
2017-03-18 01:46:42 -05:00
|
|
|
$start = new Carbon($moment);
|
2017-12-17 07:06:14 -06:00
|
|
|
$end = app('navigation')->endOfPeriod($start, $range);
|
2017-03-18 01:46:42 -05:00
|
|
|
$subTitle = trans(
|
|
|
|
'firefly.journals_in_period_for_category',
|
2017-03-18 14:53:44 -05:00
|
|
|
['name' => $category->name,
|
2017-11-15 05:25:49 -06:00
|
|
|
'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat),]
|
2017-03-18 01:46:42 -05:00
|
|
|
);
|
2017-03-18 02:09:14 -05:00
|
|
|
$periods = $this->getPeriodOverview($category);
|
2017-12-16 12:48:31 -06:00
|
|
|
$path = route('categories.show', [$category->id, $moment]);
|
2017-03-18 01:46:42 -05:00
|
|
|
}
|
2016-12-27 03:46:11 -06:00
|
|
|
|
2017-03-18 01:46:42 -05:00
|
|
|
// prep for current period
|
2017-11-15 05:25:49 -06:00
|
|
|
if (0 === strlen($moment)) {
|
2017-09-16 00:17:58 -05:00
|
|
|
/** @var Carbon $start */
|
2017-12-17 07:06:14 -06:00
|
|
|
$start = clone session('start', app('navigation')->startOfPeriod(new Carbon, $range));
|
2017-09-16 00:17:58 -05:00
|
|
|
/** @var Carbon $end */
|
2017-12-17 07:06:14 -06:00
|
|
|
$end = clone session('end', app('navigation')->endOfPeriod(new Carbon, $range));
|
2017-03-18 02:09:14 -05:00
|
|
|
$periods = $this->getPeriodOverview($category);
|
2017-03-18 01:46:42 -05:00
|
|
|
$subTitle = trans(
|
|
|
|
'firefly.journals_in_period_for_category',
|
2017-03-18 14:53:44 -05:00
|
|
|
['name' => $category->name, 'start' => $start->formatLocalized($this->monthAndDayFormat),
|
2017-11-15 05:25:49 -06:00
|
|
|
'end' => $end->formatLocalized($this->monthAndDayFormat),]
|
2017-03-18 01:46:42 -05:00
|
|
|
);
|
|
|
|
}
|
2015-09-25 09:00:14 -05:00
|
|
|
|
2017-07-30 06:53:04 -05:00
|
|
|
/** @var JournalCollectorInterface $collector */
|
|
|
|
$collector = app(JournalCollectorInterface::class);
|
|
|
|
$collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withOpposingAccount()
|
|
|
|
->setCategory($category)->withBudgetInformation()->withCategoryInformation();
|
|
|
|
$collector->removeFilter(InternalTransferFilter::class);
|
2017-11-05 14:16:20 -06:00
|
|
|
$transactions = $collector->getPaginatedJournals();
|
2017-12-09 12:14:31 -06:00
|
|
|
$transactions->setPath($path);
|
2017-07-30 06:53:04 -05:00
|
|
|
|
2017-11-05 14:16:20 -06:00
|
|
|
return view('categories.show', compact('category', 'moment', 'transactions', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
|
2015-03-04 02:42:47 -06:00
|
|
|
}
|
|
|
|
|
2015-02-22 09:19:32 -06:00
|
|
|
/**
|
2016-12-27 03:46:11 -06:00
|
|
|
* @param CategoryFormRequest $request
|
|
|
|
* @param CategoryRepositoryInterface $repository
|
2015-02-22 09:19:32 -06:00
|
|
|
*
|
2016-12-27 03:46:11 -06:00
|
|
|
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
2015-02-22 09:19:32 -06:00
|
|
|
*/
|
2016-12-27 03:46:11 -06:00
|
|
|
public function store(CategoryFormRequest $request, CategoryRepositoryInterface $repository)
|
2015-02-22 09:19:32 -06:00
|
|
|
{
|
2016-10-23 05:10:22 -05:00
|
|
|
$data = $request->getCategoryData();
|
|
|
|
$category = $repository->store($data);
|
2015-02-22 09:19:32 -06:00
|
|
|
|
2017-10-19 11:08:50 -05:00
|
|
|
$request->session()->flash('success', strval(trans('firefly.stored_category', ['name' => $category->name])));
|
2015-06-02 10:44:50 -05:00
|
|
|
Preferences::mark();
|
2015-03-29 14:27:51 -05:00
|
|
|
|
2017-11-15 05:25:49 -06:00
|
|
|
if (1 === intval($request->get('create_another'))) {
|
2017-03-18 14:53:44 -05:00
|
|
|
// @codeCoverageIgnoreStart
|
2017-02-17 13:14:22 -06:00
|
|
|
$request->session()->put('categories.create.fromStore', true);
|
2015-02-22 09:19:32 -06:00
|
|
|
|
2015-07-06 09:27:21 -05:00
|
|
|
return redirect(route('categories.create'))->withInput();
|
2017-03-18 14:53:44 -05:00
|
|
|
// @codeCoverageIgnoreEnd
|
2015-03-25 10:13:39 -05:00
|
|
|
}
|
|
|
|
|
2015-07-06 09:27:21 -05:00
|
|
|
return redirect(route('categories.index'));
|
2015-02-22 09:19:32 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2016-12-27 03:46:11 -06:00
|
|
|
* @param CategoryFormRequest $request
|
|
|
|
* @param CategoryRepositoryInterface $repository
|
|
|
|
* @param Category $category
|
2015-02-22 09:19:32 -06:00
|
|
|
*
|
2016-12-27 03:46:11 -06:00
|
|
|
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
2015-02-22 09:19:32 -06:00
|
|
|
*/
|
2016-12-27 03:46:11 -06:00
|
|
|
public function update(CategoryFormRequest $request, CategoryRepositoryInterface $repository, Category $category)
|
2015-02-22 09:19:32 -06:00
|
|
|
{
|
2016-10-23 05:10:22 -05:00
|
|
|
$data = $request->getCategoryData();
|
|
|
|
$repository->update($category, $data);
|
2015-02-22 09:19:32 -06:00
|
|
|
|
2017-10-19 11:08:50 -05:00
|
|
|
$request->session()->flash('success', strval(trans('firefly.updated_category', ['name' => $category->name])));
|
2015-06-02 10:44:50 -05:00
|
|
|
Preferences::mark();
|
2015-02-22 09:19:32 -06:00
|
|
|
|
2017-11-15 05:25:49 -06:00
|
|
|
if (1 === intval($request->get('return_to_edit'))) {
|
2017-03-18 14:53:44 -05:00
|
|
|
// @codeCoverageIgnoreStart
|
2017-02-17 13:14:22 -06:00
|
|
|
$request->session()->put('categories.edit.fromUpdate', true);
|
2015-04-05 12:43:20 -05:00
|
|
|
|
2015-07-06 09:27:21 -05:00
|
|
|
return redirect(route('categories.edit', [$category->id]));
|
2017-03-18 14:53:44 -05:00
|
|
|
// @codeCoverageIgnoreEnd
|
2015-03-26 11:45:03 -05:00
|
|
|
}
|
|
|
|
|
2017-02-05 01:26:54 -06:00
|
|
|
return redirect($this->getPreviousUri('categories.edit.uri'));
|
2015-02-22 09:19:32 -06:00
|
|
|
}
|
|
|
|
|
2017-03-10 12:34:46 -06:00
|
|
|
/**
|
|
|
|
* @return Collection
|
|
|
|
*/
|
2017-03-18 02:09:14 -05:00
|
|
|
private function getNoCategoryPeriodOverview(): Collection
|
2017-03-10 12:34:46 -06:00
|
|
|
{
|
|
|
|
$repository = app(JournalRepositoryInterface::class);
|
|
|
|
$first = $repository->first();
|
|
|
|
$start = $first->date ?? new Carbon;
|
|
|
|
$range = Preferences::get('viewRange', '1M')->data;
|
2017-12-17 07:06:14 -06:00
|
|
|
$start = app('navigation')->startOfPeriod($start, $range);
|
|
|
|
$end = app('navigation')->endOfX(new Carbon, $range, null);
|
2017-03-10 12:34:46 -06:00
|
|
|
$entries = new Collection;
|
|
|
|
|
|
|
|
// properties for cache
|
|
|
|
$cache = new CacheProperties;
|
|
|
|
$cache->addProperty($start);
|
|
|
|
$cache->addProperty($end);
|
|
|
|
$cache->addProperty('no-budget-period-entries');
|
|
|
|
|
|
|
|
if ($cache->has()) {
|
|
|
|
return $cache->get(); // @codeCoverageIgnore
|
|
|
|
}
|
|
|
|
|
2017-03-17 10:34:57 -05:00
|
|
|
Log::debug(sprintf('Going to get period expenses and incomes between %s and %s.', $start->format('Y-m-d'), $end->format('Y-m-d')));
|
2017-03-10 12:34:46 -06:00
|
|
|
while ($end >= $start) {
|
2017-03-17 10:34:57 -05:00
|
|
|
Log::debug('Loop!');
|
2017-12-17 07:06:14 -06:00
|
|
|
$end = app('navigation')->startOfPeriod($end, $range);
|
|
|
|
$currentEnd = app('navigation')->endOfPeriod($end, $range);
|
2017-03-10 12:34:46 -06:00
|
|
|
|
2017-09-14 03:39:24 -05:00
|
|
|
// count journals without category in this period:
|
2017-03-10 12:34:46 -06:00
|
|
|
/** @var JournalCollectorInterface $collector */
|
|
|
|
$collector = app(JournalCollectorInterface::class);
|
2017-04-28 13:08:25 -05:00
|
|
|
$collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutCategory()
|
2017-09-14 10:40:02 -05:00
|
|
|
->withOpposingAccount()->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]);
|
2017-04-28 13:08:25 -05:00
|
|
|
$collector->removeFilter(InternalTransferFilter::class);
|
2017-03-10 12:34:46 -06:00
|
|
|
$count = $collector->getJournals()->count();
|
|
|
|
|
|
|
|
// amount transferred
|
|
|
|
/** @var JournalCollectorInterface $collector */
|
|
|
|
$collector = app(JournalCollectorInterface::class);
|
|
|
|
$collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutCategory()
|
2017-04-28 13:08:25 -05:00
|
|
|
->withOpposingAccount()->setTypes([TransactionType::TRANSFER]);
|
|
|
|
$collector->removeFilter(InternalTransferFilter::class);
|
2017-03-10 12:34:46 -06:00
|
|
|
$transferred = Steam::positive($collector->getJournals()->sum('transaction_amount'));
|
|
|
|
|
|
|
|
// amount spent
|
|
|
|
/** @var JournalCollectorInterface $collector */
|
|
|
|
$collector = app(JournalCollectorInterface::class);
|
|
|
|
$collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutCategory()->withOpposingAccount()->setTypes([TransactionType::WITHDRAWAL]);
|
|
|
|
$spent = $collector->getJournals()->sum('transaction_amount');
|
|
|
|
|
|
|
|
// amount earned
|
|
|
|
/** @var JournalCollectorInterface $collector */
|
|
|
|
$collector = app(JournalCollectorInterface::class);
|
|
|
|
$collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutCategory()->withOpposingAccount()->setTypes([TransactionType::DEPOSIT]);
|
|
|
|
$earned = $collector->getJournals()->sum('transaction_amount');
|
|
|
|
|
|
|
|
$dateStr = $end->format('Y-m-d');
|
2017-12-17 07:06:14 -06:00
|
|
|
$dateName = app('navigation')->periodShow($end, $range);
|
2017-03-10 12:34:46 -06:00
|
|
|
$entries->push(
|
|
|
|
[
|
|
|
|
'string' => $dateStr,
|
|
|
|
'name' => $dateName,
|
|
|
|
'count' => $count,
|
|
|
|
'spent' => $spent,
|
|
|
|
'earned' => $earned,
|
|
|
|
'transferred' => $transferred,
|
|
|
|
'date' => clone $end,
|
|
|
|
]
|
|
|
|
);
|
2017-12-17 07:06:14 -06:00
|
|
|
$end = app('navigation')->subtractPeriod($end, $range, 1);
|
2017-03-10 12:34:46 -06:00
|
|
|
}
|
2017-03-17 10:34:57 -05:00
|
|
|
Log::debug('End of loops');
|
2017-03-10 12:34:46 -06:00
|
|
|
$cache->store($entries);
|
|
|
|
|
|
|
|
return $entries;
|
|
|
|
}
|
|
|
|
|
2017-03-18 01:46:42 -05:00
|
|
|
/**
|
|
|
|
* @param Category $category
|
|
|
|
*
|
|
|
|
* @return Collection
|
|
|
|
*/
|
2017-03-18 02:09:14 -05:00
|
|
|
private function getPeriodOverview(Category $category): Collection
|
2017-03-18 01:46:42 -05:00
|
|
|
{
|
|
|
|
/** @var CategoryRepositoryInterface $repository */
|
|
|
|
$repository = app(CategoryRepositoryInterface::class);
|
|
|
|
/** @var AccountRepositoryInterface $accountRepository */
|
|
|
|
$accountRepository = app(AccountRepositoryInterface::class);
|
|
|
|
$accounts = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
|
|
|
|
$first = $repository->firstUseDate($category);
|
2017-11-15 05:25:49 -06:00
|
|
|
if (null === $first) {
|
2017-12-17 07:06:14 -06:00
|
|
|
$first = new Carbon; // @codeCoverageIgnore
|
2017-03-18 01:46:42 -05:00
|
|
|
}
|
|
|
|
$range = Preferences::get('viewRange', '1M')->data;
|
2017-12-17 07:06:14 -06:00
|
|
|
$first = app('navigation')->startOfPeriod($first, $range);
|
|
|
|
$end = app('navigation')->endOfX(new Carbon, $range, null);
|
2017-03-18 01:46:42 -05:00
|
|
|
$entries = new Collection;
|
2017-09-14 10:40:02 -05:00
|
|
|
$count = 0;
|
2017-03-18 01:46:42 -05:00
|
|
|
|
|
|
|
// properties for entries with their amounts.
|
|
|
|
$cache = new CacheProperties();
|
|
|
|
$cache->addProperty($first);
|
|
|
|
$cache->addProperty($end);
|
|
|
|
$cache->addProperty('categories.entries');
|
|
|
|
$cache->addProperty($category->id);
|
|
|
|
|
|
|
|
if ($cache->has()) {
|
|
|
|
return $cache->get(); // @codeCoverageIgnore
|
|
|
|
}
|
2017-09-14 10:40:02 -05:00
|
|
|
while ($end >= $first && $count < 90) {
|
2017-12-17 07:06:14 -06:00
|
|
|
$end = app('navigation')->startOfPeriod($end, $range);
|
|
|
|
$currentEnd = app('navigation')->endOfPeriod($end, $range);
|
2017-03-18 01:46:42 -05:00
|
|
|
$spent = $repository->spentInPeriod(new Collection([$category]), $accounts, $end, $currentEnd);
|
|
|
|
$earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $end, $currentEnd);
|
|
|
|
$dateStr = $end->format('Y-m-d');
|
2017-12-17 07:06:14 -06:00
|
|
|
$dateName = app('navigation')->periodShow($end, $range);
|
2017-03-22 11:00:01 -05:00
|
|
|
|
|
|
|
// amount transferred
|
|
|
|
/** @var JournalCollectorInterface $collector */
|
|
|
|
$collector = app(JournalCollectorInterface::class);
|
|
|
|
$collector->setAllAssetAccounts()->setRange($end, $currentEnd)->setCategory($category)
|
2017-04-28 13:08:25 -05:00
|
|
|
->withOpposingAccount()->setTypes([TransactionType::TRANSFER]);
|
|
|
|
$collector->removeFilter(InternalTransferFilter::class);
|
2017-03-22 11:00:01 -05:00
|
|
|
$transferred = Steam::positive($collector->getJournals()->sum('transaction_amount'));
|
|
|
|
|
2017-03-18 01:46:42 -05:00
|
|
|
$entries->push(
|
|
|
|
[
|
2017-03-22 11:00:01 -05:00
|
|
|
'string' => $dateStr,
|
|
|
|
'name' => $dateName,
|
|
|
|
'spent' => $spent,
|
|
|
|
'earned' => $earned,
|
2017-04-08 02:00:37 -05:00
|
|
|
'sum' => bcadd($earned, $spent),
|
2017-03-22 11:00:01 -05:00
|
|
|
'transferred' => $transferred,
|
|
|
|
'date' => clone $end,
|
2017-03-18 01:46:42 -05:00
|
|
|
]
|
|
|
|
);
|
2017-12-17 07:06:14 -06:00
|
|
|
$end = app('navigation')->subtractPeriod($end, $range, 1);
|
2017-11-15 05:25:49 -06:00
|
|
|
++$count;
|
2017-03-18 01:46:42 -05:00
|
|
|
}
|
|
|
|
$cache->store($entries);
|
|
|
|
|
|
|
|
return $entries;
|
|
|
|
}
|
2015-02-22 09:19:32 -06:00
|
|
|
}
|