kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

First attempt at job to create transactions for recurring transactions.

Browse Source
This commit is contained in:
James Cole
2018-06-22 18:42:23 +02:00
parent 636cd84f4f
commit db1c27d833
16 changed files with 646 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Recurring/EditController.php
View File

@@ -76,6 +76,8 @@ class EditController extends Controller
*/
public function edit(Request $request, Recurrence $recurrence)
{
// use transformer:
$transformer = new RecurrenceTransformer(new ParameterBag);
$array = $transformer->transform($recurrence);
@@ -86,6 +88,7 @@ class EditController extends Controller
// todo handle old repetition type as well.
/** @var RecurrenceRepetition $repetition */
$repetition = $recurrence->recurrenceRepetitions()->first();
$currentRepetitionType = $repetition->repetition_type;
@@ -116,13 +119,12 @@ class EditController extends Controller
// code to handle active-checkboxes
$hasOldInput = null !== $request->old('_token');
// $hasOldInput = false;
$preFilled = [
'transaction_type' => strtolower($recurrence->transactionType->type),
'active' => $hasOldInput ? (bool)$request->old('active') : $recurrence->active,
'apply_rules' => $hasOldInput ? (bool)$request->old('apply_rules') : $recurrence->apply_rules,
];
$request->flash('preFilled', $preFilled);
return view('recurring.edit', compact('recurrence', 'array', 'budgets', 'preFilled', 'currentRepetitionType', 'repetitionEnd', 'repetitionEnds'));
}

2
app/Http/Controllers/Recurring/IndexController.php
View File

@@ -159,7 +159,7 @@ class IndexController extends Controller
{
$page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page');
$pageSize = (int)app('preferences')->get('listPageSize', 50)->data;
$collection = $this->recurring->getActive();
$collection = $this->recurring->get();
// TODO: split collection into pages