kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-21 09:00:07 +00:00
Code Issues Projects Releases Wiki Activity

Refactor installer.

Browse Source
This commit is contained in:
James Cole
2019-03-30 11:03:39 +01:00
parent 5b1fb5354e
commit c07ef3658b
18 changed files with 230 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Events\UpdatedTransactionJournal;
use FireflyIII\Events\UpdatedTransactionGroup;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\TransactionJournal;
@@ -128,6 +128,7 @@ class ConvertController extends Controller
*/
public function postIndex(Request $request, TransactionType $destinationType, TransactionJournal $journal)
{
throw new FireflyException('Needs refactor');
// @codeCoverageIgnoreStart
if ($this->isOpeningBalance($journal)) {
Log::debug('Journal is opening balance, return to account.');
@@ -166,7 +167,7 @@ class ConvertController extends Controller
}
// Success? Fire rules!
event(new UpdatedTransactionJournal($journal));
event(new UpdatedTransactionGroup($group));
session()->flash('success', (string)trans('firefly.converted_to_' . $destinationType->type));

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

@@ -23,7 +23,8 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use Carbon\Carbon;
use FireflyIII\Events\UpdatedTransactionJournal;
use FireflyIII\Events\UpdatedTransactionGroup;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Helpers\Filter\TransactionViewFilter;
use FireflyIII\Helpers\Filter\TransferFilter;
@@ -128,6 +129,7 @@ class MassController extends Controller
*/
public function edit(Collection $journals): IlluminateView
{
throw new FireflyException('Needs refactor');
/** @var User $user */
$user = auth()->user();
$subTitle = (string)trans('firefly.mass_edit_journals');
@@ -182,6 +184,7 @@ class MassController extends Controller
*/
public function update(MassEditJournalRequest $request, JournalRepositoryInterface $repository)
{
throw new FireflyException('Needs refactor');
$journalIds = $request->get('journals');
$count = 0;
if (\is_array($journalIds)) {
@@ -242,7 +245,7 @@ class MassController extends Controller
$repository->update($journal, $data);
// trigger rules
event(new UpdatedTransactionJournal($journal));
event(new UpdatedTransactionGroup($group));
++$count;
}

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

@@ -23,8 +23,9 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use Carbon\Carbon;
use FireflyIII\Events\StoredTransactionJournal;
use FireflyIII\Events\UpdatedTransactionJournal;
use FireflyIII\Events\StoredTransactionGroup;
use FireflyIII\Events\UpdatedTransactionGroup;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\JournalFormRequest;
@@ -373,9 +374,9 @@ class SingleController extends Controller
$doSplit = 1 === (int)$request->get('split_journal');
$createAnother = 1 === (int)$request->get('create_another');
$data = $request->getJournalData();
$journal = $repository->store($data);
$group = $repository->store($data);
throw new FireflyException('Needs refactor');
if (null === $journal->id) {
// error!
Log::error('Could not store transaction journal.');
@@ -398,7 +399,7 @@ class SingleController extends Controller
session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
event(new StoredTransactionJournal($journal));
event(new StoredTransactionGroup($group));
session()->flash('success_uri', route('transactions.show', [$journal->id]));
session()->flash('success', (string)trans('firefly.stored_journal', ['description' => $journal->description]));
@@ -449,7 +450,7 @@ class SingleController extends Controller
if (!$request->boolean('keep_bill_id')) {
$data['bill_id'] = null;
}
throw new FireflyException('Needs refactor');
$journal = $repository->update($journal, $data);
/** @var array $files */
@@ -465,7 +466,7 @@ class SingleController extends Controller
}
// @codeCoverageIgnoreEnd
event(new UpdatedTransactionJournal($journal));
event(new UpdatedTransactionGroup($group));
// update, get events by date and sort DESC
$type = strtolower($this->repository->getTransactionType($journal));

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

@@ -22,7 +22,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Events\UpdatedTransactionJournal;
use FireflyIII\Events\UpdatedTransactionGroup;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Http\Controllers\Controller;
@@ -89,6 +89,7 @@ class SplitController extends Controller
*/
public function edit(Request $request, TransactionJournal $journal)
{
throw new FireflyException('Needs refactoring');
if ($this->isOpeningBalance($journal)) {
return $this->redirectToAccount($journal); // @codeCoverageIgnore
}
@@ -132,6 +133,7 @@ class SplitController extends Controller
*/
public function update(SplitJournalFormRequest $request, TransactionJournal $journal)
{
throw new FireflyException('Needs refactoring.');
if ($this->isOpeningBalance($journal)) {
return $this->redirectToAccount($journal); // @codeCoverageIgnore
}
@@ -145,7 +147,7 @@ class SplitController extends Controller
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;
// save attachments:
$this->attachments->saveAttachmentsForModel($journal, $files);
event(new UpdatedTransactionJournal($journal));
event(new UpdatedTransactionGroup($group));
// flash messages
// @codeCoverageIgnoreStart