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

Some code for #1272

Browse Source
This commit is contained in:
James Cole
2018-04-24 19:26:16 +02:00
parent 798d9ee876
commit f78b8f9267
28 changed files with 172 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Account/ReconcileController.php
View File

@@ -41,7 +41,6 @@ use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Log;
use Preferences;
use Session;
/**
* Class ReconcileController.
@@ -217,6 +216,7 @@ class ReconcileController extends Controller
$transactionsUri = route('accounts.reconcile.transactions', [$account->id, '%start%', '%end%']);
$overviewUri = route('accounts.reconcile.overview', [$account->id, '%start%', '%end%']);
$indexUri = route('accounts.reconcile', [$account->id, '%start%', '%end%']);
return view(
'accounts.reconcile.index', compact(
'account', 'currency', 'subTitleIcon', 'start', 'end', 'subTitle', 'startBalance', 'endBalance', 'transactionsUri',
@@ -370,7 +370,9 @@ class ReconcileController extends Controller
$collector->setAccounts(new Collection([$account]))
->setRange($selectionStart, $selectionEnd)->withBudgetInformation()->withOpposingAccount()->withCategoryInformation();
$transactions = $collector->getJournals();
$html = view('accounts.reconcile.transactions', compact('account', 'transactions','currency', 'start', 'end', 'selectionStart', 'selectionEnd'))->render();
$html = view(
'accounts.reconcile.transactions', compact('account', 'transactions', 'currency', 'start', 'end', 'selectionStart', 'selectionEnd')
)->render();
return response()->json(['html' => $html, 'startBalance' => $startBalance, 'endBalance' => $endBalance]);
}
@@ -441,7 +443,6 @@ class ReconcileController extends Controller
$this->repository->update($journal, $data);
// @codeCoverageIgnoreStart
if (1 === (int)$request->get('return_to_edit')) {
session()->put('reconcile.edit.fromUpdate', true);

1
app/Http/Controllers/Admin/ConfigurationController.php
View File

@@ -29,7 +29,6 @@ use FireflyIII\Http\Requests\ConfigurationRequest;
use FireflyIII\Support\Facades\FireflyConfig;
use Preferences;
use Redirect;
use Session;
use View;
/**

1
app/Http/Controllers/Admin/HomeController.php
View File

@@ -28,7 +28,6 @@ use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Http\Middleware\IsSandStormUser;
use Illuminate\Http\Request;
use Log;
use Session;
/**
* Class HomeController.

1
app/Http/Controllers/Admin/UpdateController.php
View File

@@ -32,7 +32,6 @@ use FireflyIII\Services\Github\Object\Release;
use FireflyIII\Services\Github\Request\UpdateRequest;
use Illuminate\Http\Request;
use Log;
use Session;
/**
* Class HomeController.

1
app/Http/Controllers/Admin/UserController.php
View File

@@ -30,7 +30,6 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\User;
use Log;
use Preferences;
use Session;
use View;
/**

1
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -29,7 +29,6 @@ use Illuminate\Auth\Events\Registered;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
use Session;
/**
* @codeCoverageIgnore

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

@@ -127,8 +127,8 @@ class BudgetController extends Controller
$warnText = (string)trans(
'firefly.over_budget_warn',
[
'amount' => app('amount')->formatAnything($currency, $average, false),
'over_amount' => app('amount')->formatAnything($currency, $current, false),
'amount' => app('amount')->formatAnything($currency, $average, false),
'over_amount' => app('amount')->formatAnything($currency, $current, false),
]
);
}

3
app/Http/Controllers/Controller.php
View File

@@ -34,7 +34,6 @@ use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
use Log;
use Route;
use Session;
use URL;
use View;
@@ -99,7 +98,7 @@ class Controller extends BaseController
}
// share language
$language = Preferences::get('language', config('firefly.default_language', 'en_US'))->data;
$language = Preferences::get('language', config('firefly.default_language', 'en_US'))->data;
View::share('language', $language);
View::share('shownDemo', $shownDemo);

4
app/Http/Controllers/JsonController.php
View File

@@ -22,10 +22,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use Illuminate\Http\Request;
/**

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

@@ -28,7 +28,6 @@ use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use Preferences;
use Session;
use View;
/**

31
app/Http/Controllers/PiggyBankController.php
View File

@@ -35,7 +35,6 @@ use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use Log;
use Preferences;
use Session;
use Symfony\Component\HttpFoundation\ParameterBag;
use View;
@@ -158,7 +157,7 @@ class PiggyBankController extends Controller
}
/**
* @param PiggyBank $piggyBank
* @param PiggyBank $piggyBank
*
* @return \Illuminate\Http\RedirectResponse
*/
@@ -210,7 +209,7 @@ class PiggyBankController extends Controller
}
/**
* @param Request $request
* @param Request $request
*
* @return View
*/
@@ -263,7 +262,7 @@ class PiggyBankController extends Controller
}
/**
* @param Request $request
* @param Request $request
*
* @return \Illuminate\Http\JsonResponse
*/
@@ -284,15 +283,15 @@ class PiggyBankController extends Controller
}
/**
* @param Request $request
* @param PiggyBank $piggyBank
* @param Request $request
* @param PiggyBank $piggyBank
*
* @return \Illuminate\Http\RedirectResponse
*/
public function postAdd(Request $request, PiggyBank $piggyBank)
{
$amount = $request->get('amount') ?? '0';
$currency = app('amount')->getDefaultCurrency();
$amount = $request->get('amount') ?? '0';
$currency = app('amount')->getDefaultCurrency();
$currencyId = (int)$this->accountRepos->getMetaValue($piggyBank->account, 'currency_id');
if ($currencyId > 0) {
$currency = $this->currencyRepos->findNull($currencyId);
@@ -324,15 +323,15 @@ class PiggyBankController extends Controller
}
/**
* @param Request $request
* @param PiggyBank $piggyBank
* @param Request $request
* @param PiggyBank $piggyBank
*
* @return \Illuminate\Http\RedirectResponse
*/
public function postRemove(Request $request, PiggyBank $piggyBank)
{
$amount = $request->get('amount') ?? '0';
$currency = app('amount')->getDefaultCurrency();
$amount = $request->get('amount') ?? '0';
$currency = app('amount')->getDefaultCurrency();
$currencyId = (int)$this->accountRepos->getMetaValue($piggyBank->account, 'currency_id');
if ($currencyId > 0) {
$currency = $this->currencyRepos->findNull($currencyId);
@@ -404,7 +403,7 @@ class PiggyBankController extends Controller
}
/**
* @param PiggyBank $piggyBank
* @param PiggyBank $piggyBank
*
* @return View
*/
@@ -418,7 +417,7 @@ class PiggyBankController extends Controller
}
/**
* @param PiggyBankFormRequest $request
* @param PiggyBankFormRequest $request
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
@@ -445,8 +444,8 @@ class PiggyBankController extends Controller
}
/**
* @param PiggyBankFormRequest $request
* @param PiggyBank $piggyBank
* @param PiggyBankFormRequest $request
* @param PiggyBank $piggyBank
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/

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

@@ -27,7 +27,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use Illuminate\Http\Request;
use Preferences;
use Session;
use View;
/**

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

@@ -44,7 +44,6 @@ use Laravel\Passport\Passport;
use Log;
use phpseclib\Crypt\RSA;
use Preferences;
use Session;
use View;
/**

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

@@ -36,7 +36,6 @@ use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Collection;
use Log;
use Preferences;
use Session;
use View;
/**

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

@@ -45,7 +45,6 @@ use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Log;
use Preferences;
use Session;
use Throwable;
use View;

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

@@ -33,7 +33,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use Illuminate\Http\Request;
use Preferences;
use Session;
use View;
/**

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

@@ -32,7 +32,6 @@ use FireflyIII\Support\CacheProperties;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Preferences;
use Session;
use View;
/**

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

@@ -30,7 +30,6 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Http\Request;
use Session;
use View;
/**

1
app/Http/Controllers/Transaction/LinkController.php
View File

@@ -30,7 +30,6 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
use Log;
use Preferences;
use Session;
use URL;
/**

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

@@ -23,19 +23,22 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use Carbon\Carbon;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Helpers\Filter\NegativeAmountFilter;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\MassDeleteJournalRequest;
use FireflyIII\Http\Requests\MassEditBulkJournalRequest;
use FireflyIII\Http\Requests\MassEditJournalRequest;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Transformers\TransactionTransformer;
use Illuminate\Support\Collection;
use Preferences;
use Session;
use Symfony\Component\HttpFoundation\ParameterBag;
use View;
/**
@@ -69,7 +72,7 @@ class MassController extends Controller
*
* @return View
*/
public function delete(Collection $journals)
public function delete(Collection $journals): View
{
$subTitle = trans('firefly.mass_delete_journals');
@@ -88,12 +91,12 @@ class MassController extends Controller
{
$ids = $request->get('confirm_mass_delete');
$set = new Collection;
if (is_array($ids)) {
/** @var int $journalId */
if (\is_array($ids)) {
/** @var string $journalId */
foreach ($ids as $journalId) {
/** @var TransactionJournal $journal */
$journal = $this->repository->find((int)$journalId);
if (null !== $journal->id && (int)$journalId === $journal->id) {
$journal = $this->repository->findNull((int)$journalId);
if (null !== $journal && (int)$journalId === $journal->id) {
$set->push($journal);
}
}
@@ -132,75 +135,31 @@ class MassController extends Controller
$budgetRepository = app(BudgetRepositoryInterface::class);
$budgets = $budgetRepository->getBudgets();
// skip transactions that have multiple destinations, multiple sources or are an opening balance.
$filtered = new Collection;
$messages = [];
/** @var TransactionJournal $journal */
foreach ($journals as $journal) {
$sources = $this->repository->getJournalSourceAccounts($journal);
$destinations = $this->repository->getJournalDestinationAccounts($journal);
if ($sources->count() > 1) {
$messages[] = trans('firefly.cannot_edit_multiple_source', ['description' => $journal->description, 'id' => $journal->id]);
continue;
}
if ($destinations->count() > 1) {
$messages[] = trans('firefly.cannot_edit_multiple_dest', ['description' => $journal->description, 'id' => $journal->id]);
continue;
}
if (TransactionType::OPENING_BALANCE === $this->repository->getTransactionType($journal)) {
$messages[] = trans('firefly.cannot_edit_opening_balance');
continue;
}
// cannot edit reconciled transactions / journals:
if ($this->repository->isJournalReconciled($journal)) {
$messages[] = trans('firefly.cannot_edit_reconciled', ['description' => $journal->description, 'id' => $journal->id]);
continue;
}
$filtered->push($journal);
}
if (count($messages) > 0) {
session()->flash('info', $messages);
}
// put previous url in session
$this->rememberPreviousUri('transactions.mass-edit.uri');
// collect some useful meta data for the mass edit:
$filtered->each(
function (TransactionJournal $journal) {
$transaction = $this->repository->getFirstPosTransaction($journal);
$currency = $transaction->transactionCurrency;
$journal->amount = (float)$transaction->amount;
$sources = $this->repository->getJournalSourceAccounts($journal);
$destinations = $this->repository->getJournalDestinationAccounts($journal);
$journal->transaction_count = $journal->transactions()->count();
$journal->currency_symbol = $currency->symbol;
$journal->transaction_type_type = $journal->transactionType->type;
// use the collector to get them.
$transformer = new TransactionTransformer(new ParameterBag);
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
$collector->setJournals($journals);
$collector->addFilter(NegativeAmountFilter::class);
$transactions = $collector->getJournals();
$journal->foreign_amount = (float)$transaction->foreign_amount;
$journal->foreign_currency = $transaction->foreignCurrency;
// add some filters:
if (null !== $sources->first()) {
$journal->source_account_id = $sources->first()->id;
$journal->source_account_name = $sources->first()->editname;
}
if (null !== $destinations->first()) {
$journal->destination_account_id = $destinations->first()->id;
$journal->destination_account_name = $destinations->first()->editname;
}
// transform to array
$journals = $transactions->map(
function (Transaction $transaction) use ($transformer) {
$result = $transformer->transform($transaction);
return $result;
}
);
if (0 === $filtered->count()) {
session()->flash('error', trans('firefly.no_edit_multiple_left'));
}
$journals = $filtered;
return view('transactions.mass.edit', compact('journals', 'subTitle', 'accounts', 'budgets'));
}

1
app/Http/Controllers/Transaction/SingleController.php
View File

@@ -40,7 +40,6 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use Illuminate\Http\Request;
use Log;
use Preferences;
use Session;
use View;
/**

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

@@ -42,7 +42,6 @@ use FireflyIII\Transformers\TransactionTransformer;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Preferences;
use Session;
use Steam;
use Symfony\Component\HttpFoundation\ParameterBag;
use View;
@@ -143,7 +142,7 @@ class SplitController extends Controller
if ($this->isOpeningBalance($journal)) {
return $this->redirectToAccount($journal); // @codeCoverageIgnore
}
$data = $request->getAll();
$data = $request->getAll();
// keep current bill:
$data['bill_id'] = $journal->bill_id;
@@ -221,7 +220,7 @@ class SplitController extends Controller
$array['transactions'] = $this->updateWithPrevious($array['transactions'], $request->old());
// update journal amount and foreign amount:
$array['journal_amount'] = array_sum(array_column($array['transactions'], 'amount'));
$array['journal_amount'] = array_sum(array_column($array['transactions'], 'amount'));
$array['journal_foreign_amount'] = array_sum(array_column($array['transactions'], 'foreign_amount'));
return $array;