kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-06 04:34:00 +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 Illuminate\Support\Collection;
use Log; use Log;
use Preferences; use Preferences;
use Session;
/** /**
* Class ReconcileController. * Class ReconcileController.
@@ -217,6 +216,7 @@ class ReconcileController extends Controller
$transactionsUri = route('accounts.reconcile.transactions', [$account->id, '%start%', '%end%']); $transactionsUri = route('accounts.reconcile.transactions', [$account->id, '%start%', '%end%']);
$overviewUri = route('accounts.reconcile.overview', [$account->id, '%start%', '%end%']); $overviewUri = route('accounts.reconcile.overview', [$account->id, '%start%', '%end%']);
$indexUri = route('accounts.reconcile', [$account->id, '%start%', '%end%']); $indexUri = route('accounts.reconcile', [$account->id, '%start%', '%end%']);
return view( return view(
'accounts.reconcile.index', compact( 'accounts.reconcile.index', compact(
'account', 'currency', 'subTitleIcon', 'start', 'end', 'subTitle', 'startBalance', 'endBalance', 'transactionsUri', 'account', 'currency', 'subTitleIcon', 'start', 'end', 'subTitle', 'startBalance', 'endBalance', 'transactionsUri',
@@ -370,7 +370,9 @@ class ReconcileController extends Controller
$collector->setAccounts(new Collection([$account])) $collector->setAccounts(new Collection([$account]))
->setRange($selectionStart, $selectionEnd)->withBudgetInformation()->withOpposingAccount()->withCategoryInformation(); ->setRange($selectionStart, $selectionEnd)->withBudgetInformation()->withOpposingAccount()->withCategoryInformation();
$transactions = $collector->getJournals(); $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]); return response()->json(['html' => $html, 'startBalance' => $startBalance, 'endBalance' => $endBalance]);
} }
@@ -441,7 +443,6 @@ class ReconcileController extends Controller
$this->repository->update($journal, $data); $this->repository->update($journal, $data);
// @codeCoverageIgnoreStart // @codeCoverageIgnoreStart
if (1 === (int)$request->get('return_to_edit')) { if (1 === (int)$request->get('return_to_edit')) {
session()->put('reconcile.edit.fromUpdate', true); 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 FireflyIII\Support\Facades\FireflyConfig;
use Preferences; use Preferences;
use Redirect; use Redirect;
use Session;
use View; 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 FireflyIII\Http\Middleware\IsSandStormUser;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Log; use Log;
use Session;
/** /**
* Class HomeController. * 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 FireflyIII\Services\Github\Request\UpdateRequest;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Log; use Log;
use Session;
/** /**
* Class HomeController. * Class HomeController.

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

@@ -30,7 +30,6 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\User; use FireflyIII\User;
use Log; use Log;
use Preferences; use Preferences;
use Session;
use View; 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\Foundation\Auth\RegistersUsers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
use Session;
/** /**
* @codeCoverageIgnore * @codeCoverageIgnore

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

@@ -127,8 +127,8 @@ class BudgetController extends Controller
$warnText = (string)trans( $warnText = (string)trans(
'firefly.over_budget_warn', 'firefly.over_budget_warn',
[ [
'amount' => app('amount')->formatAnything($currency, $average, false), 'amount' => app('amount')->formatAnything($currency, $average, false),
'over_amount' => app('amount')->formatAnything($currency, $current, 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 Illuminate\Routing\Controller as BaseController;
use Log; use Log;
use Route; use Route;
use Session;
use URL; use URL;
use View; use View;
@@ -99,7 +98,7 @@ class Controller extends BaseController
} }
// share language // 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('language', $language);
View::share('shownDemo', $shownDemo); View::share('shownDemo', $shownDemo);

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

@@ -22,10 +22,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers; 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; 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\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use Preferences; use Preferences;
use Session;
use View; use View;
/** /**

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

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

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

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

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

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

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

@@ -45,7 +45,6 @@ use Illuminate\Http\Request;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
use Preferences; use Preferences;
use Session;
use Throwable; use Throwable;
use View; 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 FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Preferences; use Preferences;
use Session;
use View; use View;
/** /**

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

@@ -32,7 +32,6 @@ use FireflyIII\Support\CacheProperties;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Preferences; use Preferences;
use Session;
use View; 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\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Session;
use View; 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 FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
use Log; use Log;
use Preferences; use Preferences;
use Session;
use URL; use URL;
/** /**

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

@@ -23,19 +23,22 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction; namespace FireflyIII\Http\Controllers\Transaction;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Helpers\Filter\NegativeAmountFilter;
use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\MassDeleteJournalRequest; use FireflyIII\Http\Requests\MassDeleteJournalRequest;
use FireflyIII\Http\Requests\MassEditBulkJournalRequest; use FireflyIII\Http\Requests\MassEditBulkJournalRequest;
use FireflyIII\Http\Requests\MassEditJournalRequest; use FireflyIII\Http\Requests\MassEditJournalRequest;
use FireflyIII\Models\AccountType; use FireflyIII\Models\AccountType;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Transformers\TransactionTransformer;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Preferences; use Preferences;
use Session; use Symfony\Component\HttpFoundation\ParameterBag;
use View; use View;
/** /**
@@ -69,7 +72,7 @@ class MassController extends Controller
* *
* @return View * @return View
*/ */
public function delete(Collection $journals) public function delete(Collection $journals): View
{ {
$subTitle = trans('firefly.mass_delete_journals'); $subTitle = trans('firefly.mass_delete_journals');
@@ -88,12 +91,12 @@ class MassController extends Controller
{ {
$ids = $request->get('confirm_mass_delete'); $ids = $request->get('confirm_mass_delete');
$set = new Collection; $set = new Collection;
if (is_array($ids)) { if (\is_array($ids)) {
/** @var int $journalId */ /** @var string $journalId */
foreach ($ids as $journalId) { foreach ($ids as $journalId) {
/** @var TransactionJournal $journal */ /** @var TransactionJournal $journal */
$journal = $this->repository->find((int)$journalId); $journal = $this->repository->findNull((int)$journalId);
if (null !== $journal->id && (int)$journalId === $journal->id) { if (null !== $journal && (int)$journalId === $journal->id) {
$set->push($journal); $set->push($journal);
} }
} }
@@ -132,75 +135,31 @@ class MassController extends Controller
$budgetRepository = app(BudgetRepositoryInterface::class); $budgetRepository = app(BudgetRepositoryInterface::class);
$budgets = $budgetRepository->getBudgets(); $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 // put previous url in session
$this->rememberPreviousUri('transactions.mass-edit.uri'); $this->rememberPreviousUri('transactions.mass-edit.uri');
// collect some useful meta data for the mass edit: // use the collector to get them.
$filtered->each( $transformer = new TransactionTransformer(new ParameterBag);
function (TransactionJournal $journal) { /** @var JournalCollectorInterface $collector */
$transaction = $this->repository->getFirstPosTransaction($journal); $collector = app(JournalCollectorInterface::class);
$currency = $transaction->transactionCurrency; $collector->setUser(auth()->user());
$journal->amount = (float)$transaction->amount; $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
$sources = $this->repository->getJournalSourceAccounts($journal); $collector->setJournals($journals);
$destinations = $this->repository->getJournalDestinationAccounts($journal); $collector->addFilter(NegativeAmountFilter::class);
$journal->transaction_count = $journal->transactions()->count(); $transactions = $collector->getJournals();
$journal->currency_symbol = $currency->symbol;
$journal->transaction_type_type = $journal->transactionType->type;
$journal->foreign_amount = (float)$transaction->foreign_amount; // add some filters:
$journal->foreign_currency = $transaction->foreignCurrency;
if (null !== $sources->first()) {
$journal->source_account_id = $sources->first()->id; // transform to array
$journal->source_account_name = $sources->first()->editname; $journals = $transactions->map(
} function (Transaction $transaction) use ($transformer) {
if (null !== $destinations->first()) { $result = $transformer->transform($transaction);
$journal->destination_account_id = $destinations->first()->id;
$journal->destination_account_name = $destinations->first()->editname; 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')); 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 Illuminate\Http\Request;
use Log; use Log;
use Preferences; use Preferences;
use Session;
use View; 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\Http\Request;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Preferences; use Preferences;
use Session;
use Steam; use Steam;
use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\ParameterBag;
use View; use View;
@@ -143,7 +142,7 @@ class SplitController extends Controller
if ($this->isOpeningBalance($journal)) { if ($this->isOpeningBalance($journal)) {
return $this->redirectToAccount($journal); // @codeCoverageIgnore return $this->redirectToAccount($journal); // @codeCoverageIgnore
} }
$data = $request->getAll(); $data = $request->getAll();
// keep current bill: // keep current bill:
$data['bill_id'] = $journal->bill_id; $data['bill_id'] = $journal->bill_id;
@@ -221,7 +220,7 @@ class SplitController extends Controller
$array['transactions'] = $this->updateWithPrevious($array['transactions'], $request->old()); $array['transactions'] = $this->updateWithPrevious($array['transactions'], $request->old());
// update journal amount and foreign amount: // 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')); $array['journal_foreign_amount'] = array_sum(array_column($array['transactions'], 'foreign_amount'));
return $array; return $array;

14
app/Repositories/Journal/JournalRepository.php
View File

@@ -132,6 +132,20 @@ class JournalRepository implements JournalRepositoryInterface
return $journal; return $journal;
} }
/**
* Find a specific journal.
*
* @param int $journalId
*
* @deprecated
*
* @return TransactionJournal|null
*/
public function findNull(int $journalId): ?TransactionJournal
{
return $this->user->transactionJournals()->where('id', $journalId)->first();
}
/** /**
* @param Transaction $transaction * @param Transaction $transaction
* *

11
app/Repositories/Journal/JournalRepositoryInterface.php
View File

@@ -68,11 +68,22 @@ interface JournalRepositoryInterface
* Find a specific journal. * Find a specific journal.
* *
* @param int $journalId * @param int $journalId
* @deprecated
* *
* @return TransactionJournal * @return TransactionJournal
*/ */
public function find(int $journalId): TransactionJournal; public function find(int $journalId): TransactionJournal;
/**
* Find a specific journal.
*
* @param int $journalId
* @deprecated
*
* @return TransactionJournal|null
*/
public function findNull(int $journalId): ?TransactionJournal;
/** /**
* @param Transaction $transaction * @param Transaction $transaction
* *

14
app/Transformers/TransactionTransformer.php
View File

@@ -157,16 +157,12 @@ class TransactionTransformer extends TransformerAbstract
$categoryName = null; $categoryName = null;
$budgetId = null; $budgetId = null;
$budgetName = null; $budgetName = null;
$categoryId = null === $transaction->transaction_category_id ? $transaction->transaction_journal_category_id $categoryId = $transaction->transaction_category_id ?? $transaction->transaction_journal_category_id;
: $transaction->transaction_category_id; $categoryName = $transaction->transaction_category_name ?? $transaction->transaction_journal_category_name;
$categoryName = null === $transaction->transaction_category_name ? $transaction->transaction_journal_category_name
: $transaction->transaction_category_name;
if ($transaction->transaction_type_type === TransactionType::WITHDRAWAL) { if ($transaction->transaction_type_type === TransactionType::WITHDRAWAL) {
$budgetId = null === $transaction->transaction_budget_id ? $transaction->transaction_journal_budget_id $budgetId = $transaction->transaction_budget_id ?? $transaction->transaction_journal_budget_id;
: $transaction->transaction_budget_id; $budgetName = $transaction->transaction_budget_name ?? $transaction->transaction_journal_budget_name;
$budgetName = null === $transaction->transaction_budget_name ? $transaction->transaction_journal_budget_name
: $transaction->transaction_budget_name;
} }
/** @var Note $dbNote */ /** @var Note $dbNote */
$dbNote = $transaction->transactionJournal->notes()->first(); $dbNote = $transaction->transactionJournal->notes()->first();
@@ -250,7 +246,7 @@ class TransactionTransformer extends TransformerAbstract
} }
// expand description. // expand description.
if (strlen((string)$transaction->transaction_description) > 0) { if (\strlen((string)$transaction->transaction_description) > 0) {
$data['description'] = $transaction->transaction_description . ' (' . $transaction->description . ')'; $data['description'] = $transaction->transaction_description . ' (' . $transaction->description . ')';
} }

180
resources/views/transactions/mass/edit.twig
View File

@@ -30,105 +30,101 @@
<th class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.budget') }}</th> <th class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.budget') }}</th>
</tr> </tr>
{% for journal in journals %} {% for journal in journals %}
{% if journal.transaction_count == 2 %} <tr>
<tr> <td>
<td> {# LINK TO EDIT FORM #}
{# LINK TO EDIT FORM #} <a href="{{ route('transactions.edit', journal.journal_id) }}" class="btn btn-xs btn-default"><i
<a href="{{ route('transactions.edit', journal.id) }}" class="btn btn-xs btn-default"><i class="fa fa-fw fa-pencil"></i></a>
class="fa fa-fw fa-pencil"></i></a> <input type="hidden" name="journals[]" value="{{ journal.journal_id }}"/>
<input type="hidden" name="journals[]" value="{{ journal.id }}"/> </td>
</td> <td>
<td> {# DESCRIPTION #}
{# DESCRIPTION #} <input class="form-control input-sm" autocomplete="off"
<input class="form-control input-sm" autocomplete="off" placeholder="{{ journal.description }}" name="description[{{ journal.journal_id }}]"
placeholder="{{ journal.description }}" name="description[{{ journal.id }}]" type="text" value="{{ journal.description }}">
type="text" value="{{ journal.description }}"> </td>
</td> {# AMOUNT #}
<td> <td>
<div class="input-group input-group-sm">
<span class="input-group-addon">{{ journal.currency_symbol }}</span>
<input name="amount[{{ journal.journal_id }}]" class="form-control" autocomplete="off"
step="any" type="number" value="{{ journal.amount }}">
<input type="hidden" name="transaction_currency_id[{{ journal.journal_id }}]"
value="{{ journal.currency_id }}">
</div>
{% if journal.foreign_amount %}
{# insert foreign data #}
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
<span class="input-group-addon">{{ journal.currency_symbol }}</span> <span class="input-group-addon">{{ journal.foreign_currency.symbol }}</span>
<input name="amount[{{ journal.id }}]" class="form-control" autocomplete="off" <input name="foreign_amount[{{ journal.journal_id }}]" class="form-control" autocomplete="off"
step="any" type="number" value="{{ journal.amount }}"> step="any" type="number" value="{{ journal.foreign_amount }}">
<input type="hidden" name="transaction_currency_id[{{ journal.id }}]" <input type="hidden" name="foreign_currency_id[{{ journal.journal_id }}]" value="{{ journal.foreign_currency.id }}">
value="{{ journal.transaction_currency_id }}">
</div> </div>
{% if journal.foreign_amount %} {% endif %}
{# insert foreign data #} </td>
<div class="input-group input-group-sm"> <td>
<span class="input-group-addon">{{ journal.foreign_currency.symbol }}</span> {# DATE #}
<input name="foreign_amount[{{ journal.id }}]" class="form-control" autocomplete="off" <input class="form-control input-sm" autocomplete="off"
step="any" type="number" value="{{ journal.foreign_amount }}"> name="date[{{ journal.journal_id }}]" type="date" value="{{ journal.date.format('Y-m-d') }}">
<input type="hidden" name="foreign_currency_id[{{ journal.id }}]" value="{{ journal.foreign_currency.id }}"> </td>
</div> <td>
{% endif %} {# SOURCE ACCOUNT ID FOR TRANSFER OR WITHDRAWAL #}
</td> {% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Withdrawal' %}
<td> <select class="form-control input-sm" name="source_account_id[{{ journal.journal_id }}]">
{# DATE #} {% for account in accounts %}
<input class="form-control input-sm" autocomplete="off" <option value="{{ account.id }}"{% if account.id==journal.source_account_id %} selected="selected"{% endif %}
name="date[{{ journal.id }}]" type="date" value="{{ journal.date.format('Y-m-d') }}"> label="{{ account.name }}">{{ account.name }}</option>
</td> {% endfor %}
<td> </select>
{# SOURCE ACCOUNT ID FOR TRANSFER OR WITHDRAWAL #} {% else %}
{% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Withdrawal' %} {# SOURCE ACCOUNT NAME FOR DEPOSIT #}
<select class="form-control input-sm" name="source_account_id[{{ journal.id }}]"> <input class="form-control input-sm" placeholder="{{ journal.source_account_name }}" autocomplete="off"
{% for account in accounts %} name="source_account_name[{{ journal.journal_id }}]" type="text" value="{{ journal.source_account_name }}">
<option value="{{ account.id }}"{% if account.id==journal.source_account_id %} selected="selected"{% endif %} {% endif %}
label="{{ account.name }}">{{ account.name }}</option> </td>
{% endfor %} <td>
</select> {% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Deposit' %}
{% else %} {# DESTINATION ACCOUNT NAME FOR TRANSFER AND DEPOSIT #}
{# SOURCE ACCOUNT NAME FOR DEPOSIT #} <select class="form-control input-sm" name="destination_account_id[{{ journal.journal_id }}]">
<input class="form-control input-sm" placeholder="{{ journal.source_account_name }}" autocomplete="off" {% for account in accounts %}
name="source_account_name[{{ journal.id }}]" type="text" value="{{ journal.source_account_name }}"> <option value="{{ account.id }}"{% if account.id==journal.destination_account_id %} selected="selected"{% endif %}
{% endif %} label="{{ account.name }}">{{ account.name }}</option>
</td> {% endfor %}
<td> </select>
{% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Deposit' %} {% else %}
{# DESTINATION ACCOUNT NAME FOR TRANSFER AND DEPOSIT #} {# DESTINATION ACCOUNT NAME FOR EXPENSE #}
<select class="form-control input-sm" name="destination_account_id[{{ journal.id }}]"> <input class="form-control input-sm" placeholder="{{ journal.destination_account_name }}"
{% for account in accounts %} name="destination_account_name[{{ journal.journal_id }}]" type="text" autocomplete="off"
<option value="{{ account.id }}"{% if account.id==journal.destination_account_id %} selected="selected"{% endif %} value="{{ journal.destination_account_name }}">
label="{{ account.name }}">{{ account.name }}</option> {% endif %}
{% endfor %} </td>
</select> {# category #}
{% else %} <td>
{# DESTINATION ACCOUNT NAME FOR EXPENSE #} <input class="form-control input-sm" placeholder="{{ journal.categories[0].name }}" autocomplete="off"
<input class="form-control input-sm" placeholder="{{ journal.destination_account_name }}" name="category[{{ journal.journal_id }}]" type="text" value="{{ journal.categories[0].name }}">
name="destination_account_name[{{ journal.id }}]" type="text" autocomplete="off" </td>
value="{{ journal.destination_account_name }}"> {# budget #}
{% endif %} <td>
</td> {% if journal.transaction_type_type == 'Withdrawal' %}
{# category #} <select class="form-control input-sm" name="budget_id[{{ journal.journal_id }}]">
<td> <option value="0" label="({{ 'no_budget'|_ }})"
<input class="form-control input-sm" placeholder="{{ journal.categories[0].name }}" autocomplete="off" {% if journal.budgets.count == 0 %}selected="selected"{% endif %}
name="category[{{ journal.id }}]" type="text" value="{{ journal.categories[0].name }}"> >({{ 'no_budget'|_ }})
</td> </option>
{# budget #} {% for budget in budgets %}
<td> <option value="{{ budget.id }}"{% if budget.id==journal.budgets[0].id %} selected="selected"{% endif %}
{% if journal.transaction_type_type == 'Withdrawal' %} label="{{ budget.name }}">{{ budget.name }}</option>
<select class="form-control input-sm" name="budget_id[{{ journal.id }}]"> {% endfor %}
<option value="0" label="({{ 'no_budget'|_ }})" </select>
{% if journal.budgets.count == 0 %}selected="selected"{% endif %} {% endif %}
>({{ 'no_budget'|_ }}) </td>
</option> </tr>
{% for budget in budgets %}
<option value="{{ budget.id }}"{% if budget.id==journal.budgets[0].id %} selected="selected"{% endif %}
label="{{ budget.name }}">{{ budget.name }}</option>
{% endfor %}
</select>
{% endif %}
</td>
</tr>
{% endif %}
{% endfor %} {% endfor %}
</table> </table>
</div> </div>
<div class="box-footer"> <div class="box-footer">
{% if journals.count > 0 %} <input type="submit" name="submit" value="{{ trans('form.update_all_journals') }}" class="btn btn-success pull-right"/>
<input type="submit" name="submit" value="{{ trans('form.update_all_journals') }}" class="btn btn-success pull-right"/>
{% endif %}
<a href="{{ route('index') }}" class="btn-default btn">{{ trans('form.cancel') }}</a> <a href="{{ route('index') }}" class="btn-default btn">{{ trans('form.cancel') }}</a>
</div> </div>
</div> </div>
</div> </div>

7
routes/breadcrumbs.php
View File

@@ -973,18 +973,15 @@ Breadcrumbs::register(
Breadcrumbs::register( Breadcrumbs::register(
'transactions.mass.edit', 'transactions.mass.edit',
function (BreadCrumbsGenerator $breadcrumbs, Collection $journals): void { function (BreadCrumbsGenerator $breadcrumbs, Collection $journals): void {
if ($journals->count() > 0) { if (\count($journals) > 0) {
$journalIds = $journals->pluck('id')->toArray(); $journalIds = $journals->pluck('id')->toArray();
$what = strtolower($journals->first()->transactionType->type); $what = strtolower($journals->first()['type']);
$breadcrumbs->parent('transactions.index', $what); $breadcrumbs->parent('transactions.index', $what);
$breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.edit', $journalIds)); $breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.edit', $journalIds));
return; return;
} }
$breadcrumbs->parent('index'); $breadcrumbs->parent('index');
return;
} }
); );

2
routes/web.php
View File

@@ -822,7 +822,7 @@ Route::group(
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Transaction', 'prefix' => 'transactions/mass', 'as' => 'transactions.mass.'], ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Transaction', 'prefix' => 'transactions/mass', 'as' => 'transactions.mass.'],
function () { function () {
Route::get('edit/{journalList}', ['uses' => 'MassController@edit', 'as' => 'edit']); Route::get('edit/{simpleJournalList}', ['uses' => 'MassController@edit', 'as' => 'edit']);
Route::get('delete/{journalList}', ['uses' => 'MassController@delete', 'as' => 'delete']); Route::get('delete/{journalList}', ['uses' => 'MassController@delete', 'as' => 'delete']);
Route::post('update', ['uses' => 'MassController@update', 'as' => 'update']); Route::post('update', ['uses' => 'MassController@update', 'as' => 'update']);
Route::post('destroy', ['uses' => 'MassController@destroy', 'as' => 'destroy']); Route::post('destroy', ['uses' => 'MassController@destroy', 'as' => 'destroy']);